git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Update nixpkgs unstable. (#1196)

* Update nixpkgs unstable. Plutus needs NixOS/nixpkgs#127239. * Don't include stack tests that use ghc 8.6.5 when testing ghc 8.10.5 Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>

commit8aa77fdbd848fe043551e653d837248b4bb76afd authorShea Levy <shea@shealevy.com> dateTue 17 Aug 2021, 08:44 (5 years ago) parentee4b28b
15 files changed+41−30
compare with iko/ghcjs-patch-master
unifiedsplit
flake.lock+3−3 test/call-stack-to-nix/default.nix+2−1 test/coverage-no-libs/default.nix+1−1 test/coverage/default.nix+1−1 test/default.nix+10−10 test/ghc-options/stack.nix+2−2 test/project-flags/stack.nix+2−1 test/snapshots/default.nix+2−2 test/stack-local-resolver-subdir/default.nix+2−1 test/stack-local-resolver/default.nix+2−1 test/stack-remote-resolver/default.nix+2−1 test/stack-simple/default.nix+2−1 test/stack-source-repo/default.nix+2−1 test/tests.sh+6−3 test/with-packages/default.nix+2−1
flake.lock+3−3
@@ -212,11 +212,11 @@
212212 },
213213 "nixpkgs-unstable": {
214214 "locked": {
215− "lastModified": 1623862044,
216− "narHash": "sha256-mY7nldu9Wl/Yb0qMPihZrWw0bRWXNsk6iyYztw/6F6Y=",
215+ "lastModified": 1628785280,
216+ "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=",
217217 "owner": "NixOS",
218218 "repo": "nixpkgs",
219− "rev": "0747387223edf1aa5beaedf48983471315d95e16",
219+ "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb",
220220 "type": "github"
221221 },
222222 "original": {
test/call-stack-to-nix/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, mkStackPkgSet, callStackToNix, importAndFilterProject, recurseIntoAttrs, haskellLib, testSrc }:
1+{ stdenv, lib, mkStackPkgSet, callStackToNix, importAndFilterProject, recurseIntoAttrs, haskellLib, testSrc, compiler-nix-name }:
22
33with lib;
44
@@ -14,6 +14,7 @@ let
1414 packages = pkgSet.config.hsPkgs;
1515
1616in recurseIntoAttrs {
17+ meta.disabled = compiler-nix-name != "ghc865";
1718 ifdInputs = {
1819 stack-nix = callProjectResults.projectNix;
1920 };
test/coverage-no-libs/default.nix+1−1
@@ -88,7 +88,7 @@ in recurseIntoAttrs ({
8888 dirExistsEmpty "$pkga_basedir/mix/pkga-0.1.0.0"
8989 dirExistsEmpty "$pkga_basedir/tix/pkga-0.1.0.0"
9090 dirExistsEmpty "$project_basedir/tix/all"
91− '') [ stackProj ])}
91+ '') (optional (compiler-nix-name == "ghc865") stackProj))}
9292
9393 touch $out
9494 '';
test/coverage/default.nix+1−1
@@ -117,7 +117,7 @@ in recurseIntoAttrs ({
117117 fileExistsNonEmpty "$project_basedir/tix/pkgb-0.1.0.0/pkgb-0.1.0.0.tix"
118118 dirExists "$project_basedir/tix/pkgb-0.1.0.0/tests${exeExt}"
119119 fileExistsNonEmpty "$project_basedir/tix/pkgb-0.1.0.0/tests${exeExt}/tests${exeExt}.tix"
120− '') [ stackProj ])}
120+ '') (optional (compiler-nix-name == "ghc865") stackProj))}
121121
122122 touch $out
123123 '';
test/default.nix+10−10
@@ -165,25 +165,25 @@ let
165165 cabal-simple-debug = callTest ./cabal-simple-debug { inherit util compiler-nix-name; };
166166 cabal-simple-prof = callTest ./cabal-simple-prof { inherit util compiler-nix-name; };
167167 cabal-sublib = callTest ./cabal-sublib { inherit util compiler-nix-name; };
168− with-packages = callTest ./with-packages { inherit util; };
168+ with-packages = callTest ./with-packages { inherit util compiler-nix-name; };
169169 builder-haddock = callTest ./builder-haddock {};
170− stack-simple = callTest ./stack-simple {};
171− stack-local-resolver = callTest ./stack-local-resolver {};
172− stack-local-resolver-subdir = callTest ./stack-local-resolver-subdir {};
173− stack-remote-resolver = callTest ./stack-remote-resolver {};
170+ stack-simple = callTest ./stack-simple { inherit compiler-nix-name; };
171+ stack-local-resolver = callTest ./stack-local-resolver { inherit compiler-nix-name; };
172+ stack-local-resolver-subdir = callTest ./stack-local-resolver-subdir { inherit compiler-nix-name; };
173+ stack-remote-resolver = callTest ./stack-remote-resolver { inherit compiler-nix-name; };
174174 shell-for-setup-deps = callTest ./shell-for-setup-deps { inherit compiler-nix-name; };
175175 setup-deps = import ./setup-deps { inherit pkgs compiler-nix-name; };
176− callStackToNix = callTest ./call-stack-to-nix {};
176+ callStackToNix = callTest ./call-stack-to-nix { inherit compiler-nix-name; };
177177 callCabalProjectToNix = callTest ./call-cabal-project-to-nix { inherit compiler-nix-name; };
178178 cabal-source-repo = callTest ./cabal-source-repo { inherit compiler-nix-name; };
179179 cabal-source-repo-comments = callTest ./cabal-source-repo-comments { inherit compiler-nix-name; };
180180 buildable = callTest ./buildable { inherit compiler-nix-name; };
181181 project-flags-cabal = callTest ./project-flags/cabal.nix { inherit compiler-nix-name; };
182− project-flags-stack = callTest ./project-flags/stack.nix {};
182+ project-flags-stack = callTest ./project-flags/stack.nix { inherit compiler-nix-name; };
183183 ghc-options-cabal = callTest ./ghc-options/cabal.nix { inherit compiler-nix-name; };
184− ghc-options-stack = callTest ./ghc-options/stack.nix {};
184+ ghc-options-stack = callTest ./ghc-options/stack.nix { inherit compiler-nix-name; };
185185 exe-only = callTest ./exe-only { inherit util compiler-nix-name; };
186− stack-source-repo = callTest ./stack-source-repo {};
186+ stack-source-repo = callTest ./stack-source-repo { inherit compiler-nix-name; };
187187 cabal-doctests = callTest ./cabal-doctests { inherit util compiler-nix-name; };
188188 extra-hackage = callTest ./extra-hackage { inherit compiler-nix-name; };
189189 hls-cabal = callTest ./haskell-language-server/cabal.nix { inherit compiler-nix-name; };
@@ -197,7 +197,7 @@ let
197197 coverage = callTest ./coverage { inherit compiler-nix-name; };
198198 coverage-golden = callTest ./coverage-golden { inherit compiler-nix-name;};
199199 coverage-no-libs = callTest ./coverage-no-libs { inherit compiler-nix-name; };
200− snapshots = callTest ./snapshots {};
200+ snapshots = callTest ./snapshots { inherit compiler-nix-name; };
201201 sublib-docs = callTest ./sublib-docs { inherit util compiler-nix-name; };
202202 githash = haskell-nix.callPackage ./githash { inherit compiler-nix-name; testSrc = testSrcWithGitDir; };
203203
test/ghc-options/stack.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, stackProject', recurseIntoAttrs, haskellLib, testSrc }:
1+{ stdenv, lib, stackProject', recurseIntoAttrs, haskellLib, testSrc, compiler-nix-name }:
22
33with lib;
44
@@ -15,7 +15,7 @@ let
1515
1616in recurseIntoAttrs {
1717 # This test is somehow broken for ghcjs
18− meta.disabled = stdenv.hostPlatform.isGhcjs;
18+ meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != "ghc865";
1919
2020 ifdInputs = {
2121 inherit (project) stack-nix;
test/project-flags/stack.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, stackProject', recurseIntoAttrs, haskellLib, testSrc }:
1+{ stdenv, lib, stackProject', recurseIntoAttrs, haskellLib, testSrc, compiler-nix-name }:
22
33with lib;
44
@@ -9,6 +9,7 @@ let
99 packages = project.hsPkgs;
1010
1111in recurseIntoAttrs {
12+ meta.disabled = compiler-nix-name != "ghc865";
1213 ifdInputs = {
1314 inherit (project) stack-nix;
1415 };
test/snapshots/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, haskellPackages, snapshots, recurseIntoAttrs, runCommand, testSrc }:
1+{ stdenv, lib, haskellPackages, snapshots, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name }:
22
33with lib;
44
@@ -8,7 +8,7 @@ let
88
99in recurseIntoAttrs {
1010 # Does not work on ghcjs because it needs zlib.
11− meta.disabled = stdenv.hostPlatform.isGhcjs;
11+ meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != "ghc865";
1212 inherit env;
1313 run = stdenv.mkDerivation {
1414 name = "shell-for-test";
test/stack-local-resolver-subdir/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ project', recurseIntoAttrs, testSrc }:
1+{ project', recurseIntoAttrs, testSrc, compiler-nix-name }:
22
33let
44 project = project' {
@@ -7,6 +7,7 @@ let
77 packages = project.hsPkgs;
88
99in recurseIntoAttrs {
10+ meta.disabled = compiler-nix-name != "ghc865";
1011 ifdInputs = {
1112 inherit (project) stack-nix;
1213 };
test/stack-local-resolver/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ project', recurseIntoAttrs, testSrc }:
1+{ project', recurseIntoAttrs, testSrc, compiler-nix-name }:
22
33let
44 project = project' {
@@ -7,6 +7,7 @@ let
77 packages = project.hsPkgs;
88
99in recurseIntoAttrs {
10+ meta.disabled = compiler-nix-name != "ghc865";
1011 ifdInputs = {
1112 inherit (project) stack-nix;
1213 };
test/stack-remote-resolver/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ project', recurseIntoAttrs, testSrc }:
1+{ project', recurseIntoAttrs, testSrc, compiler-nix-name }:
22
33let
44 project = project' {
@@ -8,6 +8,7 @@ let
88 packages = project.hsPkgs;
99
1010in recurseIntoAttrs {
11+ meta.disabled = compiler-nix-name != "ghc865";
1112 ifdInputs = {
1213 inherit (project) stack-nix;
1314 };
test/stack-simple/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, pkgs, mkStackPkgSet, haskellLib, testSrc }:
1+{ stdenv, lib, pkgs, mkStackPkgSet, haskellLib, testSrc, compiler-nix-name }:
22
33with lib;
44
@@ -14,6 +14,7 @@ let
1414 packages = pkgSet.config.hsPkgs;
1515
1616in pkgs.recurseIntoAttrs {
17+ meta.disabled = compiler-nix-name != "ghc865";
1718 stack-simple-exe = (haskellLib.check packages.stack-simple.components.exes.stack-simple-exe) // {
1819 # Attributes used for debugging with nix repl
1920 inherit pkgSet packages;
test/stack-source-repo/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stackProject', recurseIntoAttrs, testSrc }:
1+{ stackProject', recurseIntoAttrs, testSrc, compiler-nix-name }:
22
33let
44 project = stackProject' {
@@ -7,6 +7,7 @@ let
77 packages = project.hsPkgs;
88
99in recurseIntoAttrs {
10+ meta.disabled = compiler-nix-name != "ghc865";
1011 ifdInputs = {
1112 inherit (project) stack-nix;
1213 };
test/tests.sh+6−3
@@ -39,25 +39,28 @@ else
3939fi
4040
4141printf "*** Checking that a nix-shell works for runghc...\n" >& 2
42+# This has to use ghc865 for now
4243nix-shell $NIX_BUILD_ARGS \
4344 --pure ./default.nix \
44− --argstr compiler-nix-name $GHC \
45+ --argstr compiler-nix-name ghc865 \
4546 -A with-packages.test-shell \
4647 --run 'runghc with-packages/Point.hs'
4748echo >& 2
4849
4950printf "*** Checking that a nix-shell works for cabal...\n" >& 2
51+# This has to use ghc865 for now
5052nix-shell $NIX_BUILD_ARGS \
5153 --pure ./default.nix \
52− --argstr compiler-nix-name $GHC \
54+ --argstr compiler-nix-name ghc865 \
5355 -A with-packages.test-shell \
5456 --run 'echo CABAL_CONFIG=$CABAL_CONFIG && type -p ghc && cd with-packages && cabal new-build'
5557echo >& 2
5658
5759printf "*** Checking that a nix-shell works for cabal (doExactConfig component)...\n" >& 2
60+# This has to use ghc865 for now
5861nix-shell $NIX_BUILD_ARGS \
5962 --pure ./default.nix \
60− --argstr compiler-nix-name $GHC \
63+ --argstr compiler-nix-name ghc865 \
6164 -A with-packages.test-shell-dec \
6265 --run 'echo CABAL_CONFIG=$CABAL_CONFIG && echo GHC_ENVIRONMENT=$GHC_ENVIRONMENT && cd with-packages && cabal new-build'
6366echo >& 2
test/with-packages/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, numactl, util, mkPkgSet, recurseIntoAttrs, testSrc }:
1+{ stdenv, lib, numactl, util, mkPkgSet, recurseIntoAttrs, testSrc, compiler-nix-name }:
22
33with lib;
44with util;
@@ -36,6 +36,7 @@ let
3636 extraFlags = if stdenv.isLinux then "-L${numactl}/lib" else "";
3737
3838in recurseIntoAttrs {
39+ meta.disabled = compiler-nix-name != "ghc865";
3940 # Used for testing externally with nix-shell (../tests.sh).
4041 # This just adds cabal-install to the existing shells.
4142 test-shell = addCabalInstall library;