Merge remote-tracking branch 'origin/master' into static-nix-tools

Author: hamishmack

build.nix

@@ -28,7 +28,7 @@ in rec {
     pkgs.recurseIntoAttrs ({
       cabal-latest = tool compiler-nix-name "cabal" ({
         inherit evalPackages;
-      } // pkgs.lib.optionalAttrs (ghcFromTo "9.12" "9.13") {
+      } // pkgs.lib.optionalAttrs (ghcFromTo "9.13" "9.14") {
         cabalProjectLocal = builtins.readFile ./test/cabal.project.local;
       });
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0) {

ci.nix

@@ -73,6 +73,7 @@
         ghc98llvm = false;
         ghc910 = true;
         ghc910llvm = true;
+        ghc9121 = true;
         ghc912X = true;
         ghc913 = true;
       })));

flake.lock

@@ -34,6 +34,7 @@ in {
       inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
       inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
       inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
+      inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
       inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
       inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
     } // prev.haskell-nix.sources;

lazy-inputs/default.nix

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc9121 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.12.1-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}

lazy-inputs/ghc9121/flake.lock

@@ -1,4 +1,4 @@
-{ pkgs, runCommand, cacert, index-state-hashes, haskellLib }:
+{ pkgs, cacert, index-state-hashes, haskellLib }:
 { name          ? src.name or null # optional name for better error messages
 , src
 , materialized-dir ? ../materialized
@@ -14,7 +14,6 @@
 , cabalProjectFreeze   ? null
 , caller               ? "callCabalProjectToNix" # Name of the calling function for better warning messages
 , compilerSelection    ? p: p.haskell-nix.compiler
-, ghc           ? null # Deprecated in favour of `compiler-nix-name`
 , ghcOverride   ? null # Used when we need to set ghc explicitly during bootstrapping
 , configureArgs ? "" # Extra arguments to pass to `cabal v2-configure`.
                      # `--enable-tests --enable-benchmarks` are included by default.
@@ -74,29 +73,22 @@ let
   nix-tools = if args.nix-tools or null != null
     then args.nix-tools
     else evalPackages.haskell-nix.nix-tools-unchecked;
-  forName = pkgs.lib.optionalString (name != null) (" for " + name);
+
   nameAndSuffix = suffix: if name == null then suffix else name + "-" + suffix;
 
   ghc' =
     if ghcOverride != null
       then ghcOverride
       else
-        if ghc != null
-          then __trace ("WARNING: A `ghc` argument was passed" + forName
-            + " this has been deprecated in favour of `compiler-nix-name`. "
-            + "Using `ghc` will break cross compilation setups, as haskell.nix cannot "
-            + "pick the correct `ghc` package from the respective buildPackages. "
-            + "For example, use `compiler-nix-name = \"ghc865\";` for GHC 8.6.5.") ghc
-          else
-              # Do note that `pkgs = final.buildPackages` in the `overlays/haskell.nix`
-              # call to this file. And thus `pkgs` here is the proper `buildPackages`
-              # set and we do not need, nor should pick the compiler from another level
-              # of `buildPackages`, lest we want to get confusing errors about the Win32
-              # package.
-              #
-              # > The option `packages.Win32.package.identifier.name' is used but not defined.
-              #
-              (compilerSelection pkgs)."${compiler-nix-name}";
+      # Do note that `pkgs = final.buildPackages` in the `overlays/haskell.nix`
+      # call to this file. And thus `pkgs` here is the proper `buildPackages`
+      # set and we do not need, nor should pick the compiler from another level
+      # of `buildPackages`, lest we want to get confusing errors about the Win32
+      # package.
+      #
+      # > The option `packages.Win32.package.identifier.name' is used but not defined.
+      #
+      (compilerSelection pkgs)."${compiler-nix-name}";
 
 in let
   ghc = if ghc' ? latestVersion
@@ -519,18 +511,18 @@ let
                 json_cabal_file=$(mktemp)
                 cabal2json $fixed_cabal_file > $json_cabal_file
 
-                exposed_modules="$(jq -r '.library."exposed-modules"[]|select(type=="array")[]' $json_cabal_file)"
-                reexported_modules="$(jq -r '.library."reexported-modules"//[]|.[]|select(type=="array")[]' $json_cabal_file)"
+                exposed_modules="$(jq -r '.library."exposed-modules"//[]|.[]|select(type=="array")[]' $json_cabal_file)"
+                reexported_modules="$(jq -r '.library."reexported-modules"//[]|.[]|select(type=="array")[]' $json_cabal_file | sed 's/.* as //g')"
 
                 # FIXME This is a bandaid. Rather than doing this, conditionals should be interpreted.
                 ${pkgs.lib.optionalString pkgs.stdenv.targetPlatform.isGhcjs ''
-                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.arch == "javascript")|.then[]' $json_cabal_file)"
+                exposed_modules+=" $(jq -r '.library."exposed-modules"//[]|.[]|select(type=="object" and .if.arch == "javascript")|.then[]' $json_cabal_file)"
                 ''}
                 ${pkgs.lib.optionalString pkgs.stdenv.targetPlatform.isWindows ''
-                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.os == "windows")|.then[]' $json_cabal_file)"
+                exposed_modules+=" $(jq -r '.library."exposed-modules"//[]|.[]|select(type=="object" and .if.os == "windows")|.then[]' $json_cabal_file)"
                 ''}
                 ${pkgs.lib.optionalString (!pkgs.stdenv.targetPlatform.isWindows) ''
-                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.not.os == "windows")|.then[]' $json_cabal_file)"
+                exposed_modules+=" $(jq -r '.library."exposed-modules"//[]|.[]|select(type=="object" and .if.not.os == "windows")|.then[]' $json_cabal_file)"
                 ''}
 
                 EXPOSED_MODULES_${varname name}="$(tr '\n' ' ' <<< "$exposed_modules $reexported_modules")"