Update stack tests

hamishmack · hamishmack · commit be9963de1147 · 2025-02-04T14:28:42.000+13:00
diff --git a/test/coverage-no-libs/default.nix b/test/coverage-no-libs/default.nix
@@ -82,7 +82,7 @@ in recurseIntoAttrs ({
         dirExistsEmpty "$pkga_basedir/mix"
         dirExists "$pkga_basedir/tix/pkga-0.1.0.0"
         dirExists "$project_basedir/tix/all"
-      '') ([cabalProj] ++ optional (compiler-nix-name == "ghc865") stackProj))}
+      '') ([cabalProj] ++ optional (compiler-nix-name == "ghc984") stackProj))}
 
       touch $out
     '';
diff --git a/test/coverage-no-libs/stack.yaml b/test/coverage-no-libs/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages:
-- pkga/
+- pkga/
diff --git a/test/coverage/default.nix b/test/coverage/default.nix
@@ -116,7 +116,7 @@ in recurseIntoAttrs ({
         fileExistsNonEmpty "$project_basedir/tix/pkgb-0.1.0.0-inplace/pkgb-0.1.0.0-inplace.tix"
         dirExists "$project_basedir/tix/pkgb-test-tests${crossSuffix}-0.1.0.0-check${crossSuffix}"
         fileExistsNonEmpty "$project_basedir/tix/pkgb-test-tests${crossSuffix}-0.1.0.0-check${crossSuffix}/tests${exeExt}.tix"
-      '') ([cabalProj] ++ optional (compiler-nix-name == "ghc865") stackProj))}
+      '') ([cabalProj] ++ optional (compiler-nix-name == "ghc984") stackProj))}
 
       touch $out
     '';
diff --git a/test/coverage/stack.yaml b/test/coverage/stack.yaml
@@ -1,5 +1,5 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages:
 - pkga/
-- pkgb/
+- pkgb/
diff --git a/test/fully-static/default.nix b/test/fully-static/default.nix
@@ -12,7 +12,7 @@ with lib;
 let
   # Grab the compiler name from stack-to-nix output.
   # compiler = (stack-pkgs.extras {}).compiler.nix-name;
-  compiler = "ghc865";  # fixme
+  compiler = "ghc984";  # fixme
 
   # IFD stack-to-nix
   project = { gpl ? true }: stackProject' {
@@ -31,7 +31,7 @@ let
   packagesIntegerSimple = (project { gpl = false; }).hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != "ghc865";
+  meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != compiler;
 
   ifdInputs = {
     stack-nix-gmp = (project { gpl = true; }).stack-nix;
diff --git a/test/fully-static/stack.yaml b/test/fully-static/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 extra-deps:
   - pandoc-2.7.3
diff --git a/test/ghc-options/stack.nix b/test/ghc-options/stack.nix
@@ -20,7 +20,7 @@ let
 
 in recurseIntoAttrs {
   # This test is somehow broken for ghcjs
-  meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != "ghc865";
+  meta.disabled = stdenv.hostPlatform.isGhcjs || compiler-nix-name != "ghc984";
 
   ifdInputs = {
     inherit (project) stack-nix;
diff --git a/test/ghc-options/stack.yaml b/test/ghc-options/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages:
 - .
diff --git a/test/project-flags/stack.nix b/test/project-flags/stack.nix
@@ -10,7 +10,7 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc865";
+  meta.disabled = compiler-nix-name != "ghc984";
   ifdInputs = {
     inherit (project) stack-nix;
   };
diff --git a/test/project-flags/stack.yaml b/test/project-flags/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages:
 - .
diff --git a/test/stack-compiler/default.nix b/test/stack-compiler/default.nix
@@ -8,7 +8,7 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc947";
+  meta.disabled = compiler-nix-name != "ghc9101";
   ifdInputs = {
     inherit (project) stack-nix;
   };
diff --git a/test/stack-compiler/stack.yaml b/test/stack-compiler/stack.yaml
@@ -1,5 +1,5 @@
-resolver: lts-21.9
-compiler: ghc-9.4.7
+resolver: lts-23.7
+compiler: ghc-9.10.1
 compiler-check: match-exact
 packages:
 - .
diff --git a/test/stack-local-resolver-subdir/default.nix b/test/stack-local-resolver-subdir/default.nix
@@ -8,7 +8,7 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc865";
+  meta.disabled = compiler-nix-name != "ghc984";
   ifdInputs = {
     inherit (project) stack-nix;
   };
diff --git a/test/stack-local-resolver/default.nix b/test/stack-local-resolver/default.nix
@@ -8,7 +8,7 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc865";
+  meta.disabled = compiler-nix-name != "ghc984";
   ifdInputs = {
     inherit (project) stack-nix;
   };
diff --git a/test/stack-local-resolver/snapshot.yaml b/test/stack-local-resolver/snapshot.yaml
@@ -1,4 +1,4 @@
 name: local-snapshot
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages: []
diff --git a/test/stack-simple/default.nix b/test/stack-simple/default.nix
@@ -3,18 +3,15 @@
 with lib;
 
 let
-  # ./pkgs.nix and ./stack-simple.nix are generated by running
-  # stack-to-nix -o .
-  pkgSet = mkStackPkgSet {
-    stack-pkgs = import ./pkgs.nix;
-    pkg-def-extras = [];
-    modules = [{inherit evalPackages;}];
+  project = pkgs.haskell-nix.stackProject' {
+    src = testSrc "stack-simple";
+    inherit evalPackages;
   };
 
-  packages = pkgSet.config.hsPkgs;
+  packages = project.hsPkgs;
 
 in pkgs.recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc865";
+  meta.disabled = compiler-nix-name != "ghc984";
   stack-simple-exe = (haskellLib.check packages.stack-simple.components.exes.stack-simple-exe) // {
       # Attributes used for debugging with nix repl
       inherit pkgSet packages;
diff --git a/test/stack-simple/stack.yaml b/test/stack-simple/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-14.13
+resolver: lts-23.7
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
diff --git a/test/stack-source-repo/default.nix b/test/stack-source-repo/default.nix
@@ -8,7 +8,7 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name != "ghc865";
+  meta.disabled = compiler-nix-name != "ghc984";
   ifdInputs = {
     inherit (project) stack-nix;
   };
diff --git a/test/stack-source-repo/stack.yaml b/test/stack-source-repo/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.13
+resolver: lts-23.7
 
 packages:
 - .

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-14.13`
	`1`	`+resolver: lts-23.7`
`2`	`2`
`3`	`3`	`extra-deps:`
`4`	`4`	`- pandoc-2.7.3`