Try #1585:

input-output-hk · Aug 12, 2022 · e95e841 · e95e841
2 parents 7480986 + bdbf89f
commit e95e841
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/builder/make-config-files.nix b/builder/make-config-files.nix
@@ -11,7 +11,9 @@ let
 
   flagsAndConfig = field: xs: lib.optionalString (xs != []) ''
     echo ${lib.concatStringsSep " " (map (x: "--${field}=${x}") xs)} >> $out/configure-flags
-    echo "${field}: ${lib.concatStringsSep " " xs}" >> $out/cabal.config
+    ${lib.concatStrings (map (x: ''
+      echo "${field}: ${x}" >> $out/cabal.config
+    '') xs)}
   '';
 
   target-pkg = "${ghc.targetPrefix}ghc-pkg";

diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix
@@ -30,7 +30,7 @@ in recurseIntoAttrs {
   };
 
   # Used for testing externally with nix-shell (../tests.sh).
-  test-shell = project.shellFor { tools = { cabal = "3.6.2.0"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };
+  test-shell = project.shellFor { tools = { cabal = "latest"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };
 
   run = stdenv.mkDerivation {
     name = "cabal-simple-test";

diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix
@@ -23,7 +23,7 @@ let
     packages = ps: with ps; [ pkga pkgb ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     exactDeps = true;
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
@@ -34,7 +34,7 @@ let
     packages = ps: with ps; [ pkga ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     exactDeps = true;
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
@@ -46,7 +46,7 @@ let
     #   packages = ps: with ps; [ pkga pkgb ];
     # This adds cabal-install to the shell, which helps tests because
     # they use a nix-shell --pure. Normally you would BYO cabal-install.
-    tools = { cabal = "3.2.0.0"; };
+    tools = { cabal = "latest"; };
     # Avoid duplicate package issues when runghc looks for packages
     packageSetupDeps = false;
   };