Skip to content

Commit b42d3f2

Browse files
committed
WIP: survey: Add/default to ghc8101. Still breaking
WIP because breaking builds should not be default; just for development convenience.
1 parent 0e1002a commit b42d3f2

File tree

1 file changed

+32
-21
lines changed

1 file changed

+32
-21
lines changed

survey/default.nix

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ in
3535
])."${approach}",
3636

3737
# When changing this, also change the default version of Cabal declared below
38-
compiler ? "ghc865",
38+
compiler ? "ghc8101",
3939

4040
defaultCabalPackageVersionComingWithGhc ?
4141
({
4242
ghc822 = "Cabal_2_2_0_1"; # TODO this is technically incorrect for ghc 8.2.2, should be 2.0.1.0, but nixpkgs doesn't have that
4343
ghc844 = "Cabal_2_2_0_1";
4444
ghc863 = throw "static-haskell-nix: ghc863 is no longer supported, please upgrade";
45-
ghc864 = throw "static-haskell-nix: ghc863 is no longer supported, please upgrade";
45+
ghc864 = throw "static-haskell-nix: ghc864 is no longer supported, please upgrade";
4646
ghc865 = "Cabal_2_4_1_0"; # TODO this is technically incorrect for ghc 8.6.5, should be 2.4.0.1, but nixpkgs doesn't have that
4747
ghc881 = "Cabal_3_0_0_0";
48+
ghc8101 = "Cabal_3_2_0_0";
4849
}."${compiler}"),
4950

5051
# Use `integer-simple` instead of `integer-gmp` to avoid linking in
@@ -1225,6 +1226,16 @@ let
12251226
dontCheck (overrideCabal super.hakyll (drv: {
12261227
testToolDepends = [];
12271228
}));
1229+
1230+
# Inspection tests fail on `disableOptimization`with
1231+
# examples/Fusion.hs:25:1: sumUpSort `hasNoType` GHC.Types.[] failed expectedly
1232+
algebraic-graphs =
1233+
(if disableOptimization then dontCheck else lib.id)
1234+
super.algebraic-graphs;
1235+
1236+
# Test suite tries to connect to the Internet
1237+
aur = dontCheck super.aur;
1238+
12281239
});
12291240

12301241
});
@@ -1291,6 +1302,7 @@ in
12911302
bench
12921303
dhall
12931304
hsyslog # Small example of handling https://github.com/NixOS/nixpkgs/issues/43849 correctly
1305+
aura
12941306
;
12951307
} // (if approach == "pkgsStatic" then {} else {
12961308
# Packages that work with `pkgsMusl` but fail with `pkgsStatic`:
@@ -1316,7 +1328,6 @@ in
13161328

13171329
notWorking = {
13181330
inherit (haskellPackages)
1319-
aura # Removed for now as it keeps having Cabal bounds issues (https://github.com/aurapm/aura/issues/526#issuecomment-493716675)
13201331
tttool # see #14 # TODO reenable after fixing Package `HPDF-1.4.10` being marked as broken and failing to evaluate
13211332
;
13221333
};
@@ -1332,26 +1343,26 @@ in
13321343
builtins.removeAttrs allStackageExecutables [
13331344
# List of executables that don't work for reasons not yet investigated.
13341345
# When changing this file, we should always check if this list grows or shrinks.
1335-
"Agda" # anonymous function at build-support/fetchurl/boot.nix:5:1 called with unexpected argument 'meta', at build-support/fetchpatch/default.nix:14:1
1336-
"Allure" # marked as broken
1337-
"csg" # marked as broken
1346+
"Agda" # error: missing bootstrap url for platform x86_64-unknown-linux-musl
1347+
"Allure"
1348+
"csg" # `base >=4.0 && <4.14` on `doctest-driver-gen`
13381349
"cuda" # needs `allowUnfree = true`; enabling it gives `unsupported platform for the pure Linux stdenv`
1339-
"debug" # marked as broken
1340-
"diagrams-builder" # marked as broken
1350+
"debug" # `regex-base <0.94` on `regex-tdfa-text`
1351+
"diagrams-builder"
13411352
"ersatz" # marked as broken
1342-
"gloss-examples" # needs opengl: `cannot find -lGLU` `-lGL`
1343-
"gtk3" # problem compiling `glib` dependency: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
1344-
"H" # `zgemm_: symbol not found` when compiling Main; not clear how that can be provided
1345-
"hamilton" # openmp linker error via openblas
1346-
"hquantlib" # marked as broken
1347-
"ihaskell" # marked as broken
1348-
"LambdaHack" # marked as broken
1349-
"language-puppet" # dependency `hruby` does not build
1350-
"learn-physics" # needs opengl: `cannot find -lGLU` `-lGL`
1351-
"odbc" # marked as broken
1352-
"qchas" # openmp linker error via openblas
1353-
"rhine-gloss" # needs opengl: `cannot find -lGLU` `-lGL`
1354-
"soxlib" # dependency `sox` fails with: `formats.c:425:4: error: #error FIX NEEDED HERE`
1353+
"gloss-examples"
1354+
"gtk3"
1355+
"H" # error: anonymous function at pkgs/applications/science/math/R/default.nix:1:1 called with unexpected argument 'javaSupport', at lib/customisation.nix:69:16
1356+
"hamilton" # `_gfortran_concat_string` linker error via openblas
1357+
"hquantlib" # `time >=1.4.0.0 && <1.9.0.0` on `hquantlib-time`
1358+
"ihaskell" # linker error
1359+
"LambdaHack" # fails `systemd` dependency erroring on `#include <printf.h>`
1360+
"language-puppet" # `base >=4.6 && <4.14, ghc-prim >=0.3 && <0.6` for dependency `protolude`
1361+
"learn-physics"
1362+
"odbc" # `odbcss.h: No such file or directory`
1363+
"qchas" # `_gfortran_concat_string` linker error via openblas
1364+
"rhine-gloss"
1365+
"soxlib" # fails `systemd` dependency erroring on `#include <printf.h>`
13551366
];
13561367

13571368
inherit normalPkgs;

0 commit comments

Comments
 (0)