ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-09-11 06:55:40 +03:00
Code Issues Projects Releases Wiki Activity

Fix check-hydra test (#1312)

Browse Source 
* Fix check-hydra test

* Fix for ghc 9.2.1
This commit is contained in:
Hamish Mackenzie 2021-12-13 03:16:35 +13:00 committed by GitHub
parent 4670be0966
commit 942fa5defb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/check-hydra.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, writeScript, coreutils, time, gnutar, gzip, hydra-migration, jq, gitMinimal }:
{ stdenv, lib, writeScript, coreutils, time, gnutar, gzip, hydra-unstable, jq, gitMinimal }:
with lib;
@ -7,7 +7,7 @@ writeScript "check-hydra.sh" ''
set -euo pipefail
export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-migration jq gitMinimal ]}"
export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-unstable jq gitMinimal ]}"
echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
command time --format '%e' -o eval-time.txt \

16
test/cabal-22/default.nix
View File

@ -6,6 +6,22 @@ let
project = cabalProject' {
inherit compiler-nix-name;
src = testSrc "cabal-22";
modules = [(lib.optionalAttrs (compiler-nix-name == "ghc921") {
nonReinstallablePkgs = [
"rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
"deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
# ghcjs custom packages
"ghcjs-prim" "ghcjs-th"
"ghc-bignum" "exceptions" "stm"
"ghc-boot"
"ghc" "Cabal" "Win32" "array" "binary" "bytestring" "containers"
"directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"
# "ghci" "haskeline"
"hpc"
"mtl" "parsec" "process" "text" "time" "transformers"
"unix" "xhtml" "terminfo"
];
})];
};
packages = project.hsPkgs;