Merge remote-tracking branch 'origin/master' into hkm/wasm

Author: hamishmack

builder/comp-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, stdenv, buildPackages, pkgsBuildBuild, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, windows, zlib, ncurses, nodejs, nonReinstallablePkgs }@defaults:
+{ pkgs, stdenv, buildPackages, pkgsBuildBuild, ghc, llvmPackages, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, windows, zlib, ncurses, nodejs, nonReinstallablePkgs }@defaults:
 lib.makeOverridable (
 let self =
 { componentId
@@ -430,7 +430,8 @@ let
     nativeBuildInputs =
       [ghc buildPackages.removeReferencesTo]
       ++ executableToolDepends
-      ++ (lib.optional stdenv.hostPlatform.isGhcjs buildPackages.nodejs);
+      ++ (lib.optional stdenv.hostPlatform.isGhcjs buildPackages.nodejs)
+      ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
     outputs = ["out"]
       ++ (lib.optional keepConfigFiles "configFiles")

builder/haddock-builder.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, lib, haskellLib, ghc, ghcForComponent, nonReinstallablePkgs, runCommand, writeText, writeScript, makeConfigFiles }:
+{ stdenv, buildPackages, lib, haskellLib, ghc, ghcForComponent, nonReinstallablePkgs, runCommand, writeText, writeScript, makeConfigFiles, llvmPackages }:
 
 { componentId
 , component
@@ -80,7 +80,8 @@ let
 
     nativeBuildInputs =
       [ ghc buildPackages.removeReferencesTo ]
-      ++ componentDrv.executableToolDepends;
+      ++ componentDrv.executableToolDepends
+      ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
     configurePhase = ''
       mkdir -p $configFiles

builder/setup-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeSetupConfigFiles }@defaults:
+{ pkgs, stdenv, lib, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeSetupConfigFiles, llvmPackages }@defaults:
 
 let self =
 { component, package, name, src, enableDWARF ? false, flags ? {}, revision ? null, patches ? [], defaultSetupSrc
@@ -67,7 +67,7 @@ let
         ++ builtins.concatLists component.pkgconfig
         ++ configFiles.libDeps
         ++ [ghc]; # Needs to be a build input so that the boot libraries are included
-      nativeBuildInputs = [ghc] ++ executableToolDepends;
+      nativeBuildInputs = [ghc] ++ executableToolDepends ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
       passthru = {
         inherit (package) identifier;

compiler/ghc/default.nix

@@ -76,7 +76,7 @@ let self =
       # don't use gold with with musl. Still seems to be
       # affected by 22266.
       && !stdenv.targetPlatform.isMusl)
-
+, useLdLld ? false
 , ghc-version ? src-spec.version
 , ghc-version-date ? null
 , ghc-commit-id ? null
@@ -95,6 +95,8 @@ assert !(enableIntegerSimple || enableNativeBignum) -> gmp != null;
 assert enableNativeBignum -> !enableIntegerSimple;
 assert enableIntegerSimple -> !enableNativeBignum;
 
+assert !(useLdGold && useLdLld);
+
 let
   src = src-spec.file or (fetchurl { inherit (src-spec) url sha256; });
 
@@ -244,6 +246,11 @@ let
         "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
         "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
         "CONF_LD_LINKER_OPTS_STAGE2=-fuse-ld=gold" # See: <https://gitlab.haskell.org/ghc/ghc/-/issues/22550#note_466656>
+    ] ++ lib.optionals useLdLld [
+        "LD=${llvmPackages.bintools}/bin/ld.lld"
+        "CFLAGS=-fuse-ld=lld"
+        "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=lld"
+        "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=lld"
     ] ++ lib.optionals enableDWARF [
         "--enable-dwarf-unwind"
         "--with-libdw-includes=${lib.getDev elfutils}/include"
@@ -504,7 +511,10 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
     ''
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
     + ''
-        export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
+        export LD="${if useLdLld then
+                        "${targetPackages.llvmPackages.bintools}/bin/${targetPackages.llvmPackages.bintools.targetPrefix}ld.lld"
+                     else
+                       "${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"}"
         export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
         export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
         export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -522,6 +532,8 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
     # set LD explicitly if we want gold even if we aren't cross compiling
     ''
         export LD="${targetCC.bintools}/bin/ld.gold"
+    '' + lib.optionalString (targetPlatform == hostPlatform && useLdLld) ''
+        export LD="${llvmPackages.bintools}/bin/ld.lld"
     '' + lib.optionalString (targetPlatform.isWindows) ''
         export DllWrap="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}dllwrap"
         export Windres="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}windres"
@@ -588,7 +600,8 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ] ++ lib.optional (patches != []) autoreconfHook;
+  ] ++ lib.optional (patches != []) autoreconfHook
+  ++ lib.optional useLdLld llvmPackages.bintools;
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
@@ -739,7 +752,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
     '';
 
   passthru = {
-    inherit bootPkgs targetPrefix libDir llvmPackages enableShared enableTerminfo useLLVM hadrian hadrianProject;
+    inherit bootPkgs targetPrefix libDir llvmPackages enableShared enableTerminfo useLLVM useLdLld hadrian hadrianProject;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-${version}";

docs/reference/library.md

@@ -273,8 +273,8 @@ needed for `importAndFilterProject`.
 |----------------------|------|---------------------|
 | `name`               | String | Optional name for better error messages. |
 | `src`                | Path   | Location of the cabal project files. |
-| `compiler-nix-name`  | String | The name of the ghc compiler to use eg. "ghc884" |
-| `index-state`        | Timestamp | Optional hackage index-state, eg. "2019-10-10T00:00:00Z". |
+| `compiler-nix-name`  | String | The name of the ghc compiler to use eg. "ghc9122" |
+| `index-state`        | Timestamp | Optional hackage index-state, eg. "2025-01-10T00:00:00Z". |
 | `index-sha256`       | Sha256 | Optional hash of the truncated hackage index-state. |
 | `plan-sha256`        | Sha256 | Optional hash of the plan-to-nix output (makes the plan-to-nix step a fixed output derivation). |
 | `cabalProject`       | String | Optional cabal project file contents (defaults to readFile "${src}/cabal.project"). |

flake.lock

@@ -31,6 +31,10 @@
       url = "github:input-output-hk/hackage.nix/for-stackage";
       flake = false;
     };
+    hackage-internal = {
+      url = "github:input-output-hk/hackage.nix";
+      flake = false;
+    };
     stackage = {
       url = "github:input-output-hk/stackage.nix";
       flake = false;

flake.nix

@@ -682,7 +682,9 @@ let
           # Setting the desired `index-state` here in case it is not
           # in the cabal.project file. This will further restrict the
           # packages used by the solver (cached-index-state >= index-state-max).
-          pkgs.lib.optionalString (index-state != null) "--index-state=${index-state}"
+          # Cabal treats `--index-state` > the last known package as an error,
+          # so we only include this if it is < cached-index-state.
+          pkgs.lib.optionalString (index-state != null && index-state < cached-index-state) "--index-state=${index-state}"
         } \
         -w ${
           # We are using `-w` rather than `--with-ghc` here to override

lib/call-cabal-project-to-nix.nix

@@ -17,7 +17,7 @@
 pkgs:
 { name, index }:
 
-pkgs.buildPackages.runCommand "hackage-repo-${name}" { preferLocalBuild = true; } ''
+pkgs.pkgsBuildBuild.runCommand "hackage-repo-${name}" { preferLocalBuild = true; } ''
 mkdir -p $out
 export expires="4000-01-01T00:00:00Z"
 
@@ -29,7 +29,7 @@ ${
   # of the index derivation (when the `extra-hackages` feature is used the index
   # may not have an outputHash).
   pkgs.lib.optionalString (index ? outputHash) ''
-    if [[ "${index.outputHash}" != "$index_sha256" ]]; then
+    if [[ "$(${pkgs.pkgsBuildBuild.nix}/bin/nix-hash --type sha256 --to-base16 ${index.outputHash})" != "$index_sha256" ]]; then
       echo "ERROR See https://github.com/input-output-hk/haskell.nix/issues/884"
       exit 1
     fi

mk-local-hackage-repo/default.nix

@@ -437,8 +437,8 @@ final: prev: {
         # If you want to update this value it important to check the
         # materializations.  Turn `checkMaterialization` on below and
         # check the CI results before turning it off again.
-        internalHackageIndexState = "2024-10-17T00:00:00Z"; # Remember to also update ../nix-tools/cabal.project and ../nix-tools/flake.lock
-
+        internalHackageIndexState = builtins.head (builtins.attrNames (
+          import (sources.hackage-internal + "/index-state.nix")));
         checkMaterialization = false; # This is the default. Use an overlay to set it to true and test all the materialized files
 
         # Helps materialize the output of derivations
@@ -601,7 +601,13 @@ final: prev: {
         # Takes a haskell src directory runs cabal new-configure and plan-to-nix.
         # Resulting nix files are added to nix-plan subdirectory.
         callCabalProjectToNix = import ../lib/call-cabal-project-to-nix.nix {
-            index-state-hashes = import indexStateHashesPath;
+            index-state-hashes =
+              (
+                if builtins.pathExists (hackageSrc + "/index-state.nix")
+                  then import (hackageSrc + "/index-state.nix")
+                  else import (hackageSrc + "/index-state-hashes.nix")
+              )
+              // import (sources.hackage-internal + "/index-state.nix");
             inherit (final.buildPackages.haskell-nix) haskellLib;
             pkgs = final.buildPackages.pkgs;
             inherit (final.buildPackages.pkgs) cacert;
@@ -832,18 +838,13 @@ final: prev: {
             shellFor' = crossPlatforms:
               let
                 shellArgs = builtins.removeAttrs rawProject.args.shell [ "crossPlatforms" ];
-                # These are the args we will pass to the shells for the corss compiler
-                argsCross =
-                  # These things should match main shell
-                  final.lib.filterAttrs (n: _: builtins.elem n [
-                    "packages" "components" "additional" "exactDeps" "packageSetupDeps"
-                  ]) shellArgs // {
-                    # The main shell's hoogle will probably be faster to build.
-                    withHoogle = false;
-                  };
                 # Shells for cross compilation
-                crossShells = builtins.map (project: project.shellFor' (_p: []) argsCross)
-                  (crossPlatforms projectCross);
+                crossShells = builtins.map (project: project.shellFor {
+                    # Prevent recursion
+                    crossPlatforms = final.lib.mkForce (_p: []);
+                    # The main shell's hoogle will probably be faster to build.
+                    withHoogle = final.lib.mkForce false;
+                  }) (crossPlatforms projectCross);
               in rawProject.hsPkgs.shellFor (shellArgs // {
                   # Add inputs from the cross compilation shells
                   inputsFrom = shellArgs.inputsFrom or [] ++ crossShells;
@@ -1152,7 +1153,7 @@ final: prev: {
           let
             ghc = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { hadrianEvalPackages = evalPackages; };
           in
-          	final.recurseIntoAttrs ({
+            final.recurseIntoAttrs ({
             # Things that require no IFD to build
             source-pin-hackage = hackageSrc;
             source-pin-stackage = stackageSrc;