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

# Conflicts:
#	ci.nix
#	compiler/ghc/default.nix
#	flake.lock
#	test/cabal.project.local
#	test/th-dlls/default.nix

Author: hamishmack

.github/workflows/pipeline.yml

@@ -223,14 +223,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.6.7"
-        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc967-native --show-trace --builders ''
+        run: |
+          sed -i 's/runningHydraEvalTest = true;/runningHydraEvalTest = false;/' flake.nix
+          nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc967-native --show-trace --builders ''
 
   hydra-without-remote-builders-ghc9102:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
       - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.2"
-        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9102-native --show-trace --builders ''
+        run: |
+          sed -i 's/runningHydraEvalTest = true;/runningHydraEvalTest = false;/' flake.nix
+          nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9102-native --show-trace --builders ''
 
   hix-cabal:
     runs-on: [self-hosted, linux]

builder/comp-builder.nix

@@ -1,6 +1,4 @@
 { 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
 , component
 , package
@@ -92,7 +90,76 @@ let self =
 # LLVM
 , useLLVM ? ghc.useLLVM or false
 , smallAddressSpace ? false
-
+}:
+# makeOverridable is called here after all the `? DEFAULT` arguments
+# will have been applied.  This makes sure that `c.override (oldAttrs: {...})`
+# includes these `DEFAULT` values in `oldAttrs`.  This is important
+# so that overrides can modify the existing values instead of replacing them.
+lib.makeOverridable (
+let self =
+{ componentId
+, component
+, package
+, name
+, setup
+, src
+, flags
+, cabalFile
+, cabal-generator
+, patches
+, preUnpack
+, configureFlags
+, prePatch
+, postPatch
+, preConfigure
+, postConfigure
+, setupBuildFlags
+, preBuild
+, postBuild
+, preCheck
+, postCheck
+, setupInstallFlags
+, preInstall
+, postInstall
+, preHaddock
+, postHaddock
+, shellHook
+, configureAllComponents
+, allComponent
+, build-tools
+, pkgconfig
+, platforms
+, frameworks
+, dontPatchELF
+, dontStrip
+, dontUpdateAutotoolsGnuConfigScripts
+, hardeningDisable
+, enableStatic
+, enableShared
+, enableExecutableDynamic
+, enableDeadCodeElimination
+, writeHieFiles
+, ghcOptions
+, contentAddressed
+, doHaddock
+, doHoogle
+, hyperlinkSource
+, quickjump
+, keepConfigFiles
+, keepGhc
+, keepSource
+, setupHaddockFlags
+, enableLibraryProfiling
+, enableProfiling
+, profilingDetail
+, doCoverage
+, enableSeparateDataOutput
+, enableLibraryForGhci
+, enableDebugRTS
+, enableDWARF
+, enableTSanRTS
+, useLLVM
+, smallAddressSpace
 }@drvArgs:
 
 let
@@ -341,7 +408,7 @@ let
     }
     // lib.optionalAttrs stdenv.hostPlatform.isMusl {
       # This fixes musl compilation of TH code that depends on C++ (for instance TH code that uses the double-conversion package)
-      LD_LIBRARY_PATH="${pkgs.buildPackages.gcc-unwrapped.lib}/x86_64-unknown-linux-musl/lib";
+      LD_LIBRARY_PATH="${pkgs.buildPackages.gcc-unwrapped.lib}/${stdenv.hostPlatform.config}/lib";
     }
     // lib.optionalAttrs dontUpdateAutotoolsGnuConfigScripts {
       inherit dontUpdateAutotoolsGnuConfigScripts;
@@ -655,6 +722,10 @@ let
         mkdir -p $out/share
         if [ -d dist/build/extra-compilation-artifacts ]; then
           cp -r dist/build/extra-compilation-artifacts/hpc $out/share
+        elif [ -d ${testExecutable}-tmp/extra-compilation-artifacts ]; then
+          cp -r ${testExecutable}-tmp/extra-compilation-artifacts/hpc $out/share
+        elif [ -d dist/build/${componentId.cname}/extra-compilation-artifacts ]; then
+          cp -r dist/build/${componentId.cname}/extra-compilation-artifacts/hpc $out/share
         else
           cp -r dist/hpc $out/share
         fi
@@ -718,4 +789,68 @@ let
   // lib.optionalAttrs (hardeningDisable != [] || stdenv.hostPlatform.isMusl) {
     hardeningDisable = hardeningDisable ++ lib.optional stdenv.hostPlatform.isMusl "pie";
   });
-in drv; in self)
+in drv; in self) {
+  inherit componentId
+          component
+          package
+          name
+          setup
+          src
+          flags
+          cabalFile
+          cabal-generator
+          patches
+          preUnpack
+          configureFlags
+          prePatch
+          postPatch
+          preConfigure
+          postConfigure
+          setupBuildFlags
+          preBuild
+          postBuild
+          preCheck
+          postCheck
+          setupInstallFlags
+          preInstall
+          postInstall
+          preHaddock
+          postHaddock
+          shellHook
+          configureAllComponents
+          allComponent
+          build-tools
+          pkgconfig
+          platforms
+          frameworks
+          dontPatchELF
+          dontStrip
+          dontUpdateAutotoolsGnuConfigScripts
+          hardeningDisable
+          enableStatic
+          enableShared
+          enableExecutableDynamic
+          enableDeadCodeElimination
+          writeHieFiles
+          ghcOptions
+          contentAddressed
+          doHaddock
+          doHoogle
+          hyperlinkSource
+          quickjump
+          keepConfigFiles
+          keepGhc
+          keepSource
+          setupHaddockFlags
+          enableLibraryProfiling
+          enableProfiling
+          profilingDetail
+          doCoverage
+          enableSeparateDataOutput
+          enableLibraryForGhci
+          enableDebugRTS
+          enableDWARF
+          enableTSanRTS
+          useLLVM
+          smallAddressSpace;
+}

builder/default.nix

@@ -26,7 +26,7 @@ let
   };
 
   setup-builder = haskellLib.weakCallPackage pkgs ./setup-builder.nix {
-    ghc = (ghc.passthru.buildGHC or ghc);
+    ghc = (ghc.buildGHC or ghc);
     hsPkgs = hsPkgs.buildPackages;
     # We need to use the buildPackages stdenv to build the setup-builder.
     # in the native case, it would be the same in the cross case however
@@ -41,7 +41,7 @@ let
   # component builder and for nix-shells.
   ghcForComponent = import ./ghc-for-component-wrapper.nix {
     inherit lib ghc haskellLib;
-    inherit (buildPackages) stdenv;
+    inherit (pkgs) stdenv;
     inherit (buildPackages.buildPackages) runCommand makeWrapper;
     inherit (buildPackages.buildPackages.xorg) lndir;
   };
@@ -54,7 +54,7 @@ let
   # When building setup depends we need to use the build systems GHC and Packages
   makeSetupConfigFiles = haskellLib.weakCallPackage buildPackages ./make-config-files.nix {
     inherit haskellLib nonReinstallablePkgs;
-    ghc = (ghc.passthru.buildGHC or ghc);
+    ghc = (ghc.buildGHC or ghc);
   };
 
 

builder/ghc-for-component-wrapper.nix

@@ -14,6 +14,7 @@
 , postInstall ? ""
 , enableDWARF
 , plugins
+, ghcOptions ? []
 }:
 
 let
@@ -23,8 +24,9 @@ let
   libDir         = "$wrappedGhc/${configFiles.libDir}";
   docDir         = "$wrappedGhc/share/doc/ghc/html";
   # For musl we can use haddock from the buildGHC
-  haddock        = if stdenv.targetPlatform.isMusl
-    then ghc.buildGHC
+  haddock        = if stdenv.hostPlatform.isMusl
+    then ghc.buildGHC or ghc # `or ghc` is here because nixpkgs GHC does not have `buildGHC`
+                             # TODO find a way to get suitable GHC and/or respect `ghc.hasHaddock`.
     else ghc;
 
   script = ''
@@ -107,7 +109,7 @@ let
           --set "NIX_${ghcCommandCaps}PKG"     "$wrappedGhc/bin/${ghcCommand}-pkg" \
           --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
           --set "GHC_PLUGINS"                  "$GHC_PLUGINS"               \
-          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"${lib.concatMapStrings (o: " --add-flags ${o}") ghcOptions}
       fi
     done
 
@@ -159,8 +161,7 @@ let
     inherit script targetPrefix;
     inherit (ghc) version meta;
   };
-  propagatedBuildInputs = configFiles.libDeps;
-  nativeBuildInputs = [ghc];
+  propagatedBuildInputs = configFiles.libDeps ++ lib.optional stdenv.hasCC stdenv.cc ++ [ghc];
 } (''
     mkdir -p $out/configFiles
     configFiles=$out/configFiles

builder/shell-for.nix

@@ -143,6 +143,7 @@ let
     '';
     inherit enableDWARF;
     plugins = [];
+    ghcOptions =  haskell-nix.templateHaskell.${compiler.nix-name}.ghcOptions or [];
   };
 
   hoogleIndex = let
@@ -192,11 +193,16 @@ in
                 ''} $(builtin type -P "${ghcEnv.targetPrefix}pkg-config" &> /dev/null && echo "--with-pkg-config=${ghcEnv.targetPrefix}pkg-config") \
                 "$@"
               '');
+    propagatedBuildInputs = mkDrvArgs.propagateBuildInputs or [] ++ ghcEnv.drv.propagatedBuildInputs;
     phases = ["installPhase"];
     installPhase = ''
       echo "${"Shell for " + toString (builtins.map (p : p.identifier.name) selectedPackages)}"
       echo $nativeBuildInputs $buildInputs > $out
     '';
+    shellHook = mkDrvArgs.shellHook or "" + lib.optionalString stdenv.hostPlatform.isWindows ''
+
+       export pkgsHostTargetAsString="''${pkgsHostTarget[@]}"
+    '';
 
     # This helps tools like `ghcide` (that use the ghc api) to find
     # the correct global package DB.

changelog.md

@@ -1,6 +1,42 @@
 This file contains a summary of changes to Haskell.nix and `nix-tools`
 that will impact users.
 
+## Jul 3, 2025
+
+Some time ago the behavior of `shellFor` changed so that the arguments
+are now checked against `modules/shell.nix`.  This was done as part of a fix
+for bugs in the way `shellFor` arguments and project `shell` arguments
+interacted (both are now `modules` and the normal module merge rules apply).
+
+This means it is no longer possible to pass arbitrarily named arguments
+to `shellFor` in order to set environment variables.
+
+Instead of:
+
+```
+p.shellFor {
+  FOO = "bar";
+}
+```
+
+Use:
+
+```
+p.shellFor {
+  shellHook = ''
+    export FOO="bar"
+  '';
+}
+```
+
+or
+
+```
+(p.shellFor {}).overrideAttrs {
+   FOO = "bar";
+}
+```
+
 ## Jan 29, 2025
 
 Removed GHC <9.6 from CI.