git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix check-hydra test (#1312)
942fa5dHamish Mackenzie
scripts/check-hydra.nix+2−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -1,4 +1,4 @@
1−{ stdenv, lib, writeScript, coreutils, time, gnutar, gzip, hydra-migration, jq, gitMinimal }:
1+{ stdenv, lib, writeScript, coreutils, time, gnutar, gzip, hydra-unstable, jq, gitMinimal }:
2
2
3with lib;
3with lib;
4
4
@@ -7,7 +7,7 @@ writeScript "check-hydra.sh" ''
7
7
8 set -euo pipefail
8 set -euo pipefail
9
9
10− export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-migration jq gitMinimal ]}"
10+ export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-unstable jq gitMinimal ]}"
11
11
12 echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
12 echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
13 command time --format '%e' -o eval-time.txt \
13 command time --format '%e' -o eval-time.txt \
test/cabal-22/default.nix+16
@@ -6,6 +6,22 @@ let
6 project = cabalProject' {
6 project = cabalProject' {
7 inherit compiler-nix-name;
7 inherit compiler-nix-name;
8 src = testSrc "cabal-22";
8 src = testSrc "cabal-22";
9+ modules = [(lib.optionalAttrs (compiler-nix-name == "ghc921") {
10+ nonReinstallablePkgs = [
11+ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
12+ "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
13+ # ghcjs custom packages
14+ "ghcjs-prim" "ghcjs-th"
15+ "ghc-bignum" "exceptions" "stm"
16+ "ghc-boot"
17+ "ghc" "Cabal" "Win32" "array" "binary" "bytestring" "containers"
18+ "directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"
19+ # "ghci" "haskeline"
20+ "hpc"
21+ "mtl" "parsec" "process" "text" "time" "transformers"
22+ "unix" "xhtml" "terminfo"
23+ ];
24+ })];
9 };
25 };
10
26
11 packages = project.hsPkgs;
27 packages = project.hsPkgs;