Bump nixpkgs pins (input-output-hk#1994)

* Bump nixpkgs pins

* ifdLevel 1

* Fix issue using nixpkgs GHC 9.6

* ifdLevel 0

* Update pins

* Fix for darwin failures

* ifdLevel 1

* Fix ghcjs 8.10

* Bump nixpkgs pins

* Update bootstrap GHC versions

* Fix for macOS

* Fix for macOS

* ifdLevel 1

* ifdLevel 2

* ifdLevel 3

* Fix for ghcjs

* Fix mfcgthreads issue

* Try removing LD_LIBRARY_PATH

* Keep LD_LIBRARY_PATH hack. Use musl git

* Add materialization of spdx-3.21

* ifdLevel 0

* Bump nixpkgs pins

* ifdLevel 1

* ifdLevel 2

* ifdLevel 3

* Add 'preInstall' hook for GHC on darwin

Problem: Since 9.2.3 'xattr' is used during GHC 'make install' on
darwin. This introduces the same issue that was previously fixed for
'buildPhase'.

Solution: Add optional 'preInstall' attribuite that sets 'XATTR' to a
non-existing path which will skip the 'xattr' invocations during 'make
install'. Also explicitly call 'preInstall' hook during 'installPhase'.

Fixes input-output-hk#2008.

* ifdLevel 0

* ifdLevel 1

* ifdLevel 2

* ifdLevel 3

---------

Co-authored-by: Roman Melnikov <[email protected]>

Author: hamishmack

builder/comp-builder.nix

@@ -417,8 +417,12 @@ let
 
     prePatch =
       # emcc is very slow if it cannot cache stuff in $HOME
+      # Newer nixpkgs default the cache dir to nix store path.
+      # This seems to cause problems as it is not writeable.
+      # Setting EM_CACHE explicitly avoids this problem.
       (lib.optionalString stdenv.hostPlatform.isGhcjs ''
       export HOME=$(mktemp -d)
+      export EM_CACHE=$(mktemp -d)
       '') +
       (lib.optionalString (!canCleanSource) ''
       echo "Cleaning component source not supported, leaving it un-cleaned"
@@ -603,7 +607,10 @@ let
         for p in ${lib.concatStringsSep " " ([ libffi gmp ] ++
               # Also include C++ and mcfgthreads DLLs for GHC 9.4.1 and newer
               lib.optionals (builtins.compareVersions defaults.ghc.version "9.4.1" >= 0)
-                [ buildPackages.gcc-unwrapped windows.mcfgthreads ])}; do
+                [ buildPackages.gcc-unwrapped
+                  # Find the versions of mfcgthreads used by stdenv.cc
+                  (pkgs.threadsCrossFor or (x: windows.mfcgthreads) stdenv.cc.version).package
+                ])}; do
           find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;
         done
         ''

builder/make-config-files.nix

@@ -48,7 +48,11 @@ let
   ghcCommand'    = if isGhcjs then "ghcjs" else "ghc";
   ghcCommand     = "${ghc.targetPrefix}${ghcCommand'}";
   ghcCommandCaps = lib.toUpper ghcCommand';
-  libDir         = ghc.libDir or "lib/${ghcCommand}-${ghc.version}";
+  libDir         = ghc.libDir or
+    # nixpkgs versions of `ghc` do not have a `.libDir`.  So this
+    # default is for them.
+    ("lib/${ghcCommand}-${ghc.version}"
+      + lib.optionalString (__compareVersions ghc.version "9.6.1" >= 0) "/lib");
   packageCfgDir  = "${libDir}/package.conf.d";
 
   libDeps = haskellLib.uniqueWithName (
@@ -81,9 +85,14 @@ let
         find $unwrappedGhc/${packageCfgDir} -name $p'*.conf' -exec cp -f {} $configFiles/${packageCfgDir} \;
       done
     ''}
+    ${ # From GHC 9.6 the nixpkgs ghc derviations now use ${pkgroot} in their `.conf` files.
+    ''
+      sed -i 's|''${pkgroot}/../../../../|/nix/store/|' $configFiles/${packageCfgDir}/*.conf
+      sed -i 's|''${pkgroot}|${ghc}/${packageCfgDir}/..|' $configFiles/${packageCfgDir}/*.conf
+    ''}
 
     for l in "''${pkgsHostTarget[@]}"; do
-      if [ -d "$l/${packageCfgDir}" ]; then
+      if [ -d "$l/${packageCfgDir}" ] && [[ "$l" != "${ghc}" ]]; then
         files=("$l/${packageCfgDir}/"*.conf)
         if (( ''${#files[@]} )); then
           cp -f "''${files[@]}" $configFiles/${packageCfgDir}

compiler/ghc/default.nix

@@ -202,6 +202,13 @@ let
         "--enable-dwarf-unwind"
         "--with-libdw-includes=${lib.getDev elfutils}/include"
         "--with-libdw-libraries=${lib.getLib elfutils}/lib"
+    ] ++ lib.optionals (targetPlatform.isDarwin && builtins.compareVersions ghc-version "9.6" >= 0) [
+        # From https://github.com/NixOS/nixpkgs/commit/6454fb1bc0b5884d0c11c98a8a99735ef5a0cae8
+        # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar`
+        # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See:
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
+        # https://github.com/haskell/cabal/issues/8882
+        "fp_cv_prog_ar_supports_dash_l=no"
     ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs"; # TODO use configurePlatforms once tripple is updated in nixpkgs
 
   # Splicer will pull out correct variations
@@ -722,6 +729,10 @@ stdenv.mkDerivation (rec {
       substituteInPlace rts/win32/ThrIOManager.c --replace rts\\OSThreads.h rts/OSThreads.h
     fi
   '';
+  # Same hack as 'preBuild'
+  preInstall = lib.optionalString stdenv.buildPlatform.isDarwin ''
+    export XATTR=$(mktemp -d)/nothing
+  '';
 } // lib.optionalAttrs useHadrian {
   postConfigure = lib.optionalString stdenv.isDarwin ''
     substituteInPlace mk/system-cxx-std-lib-1.0.conf \
@@ -774,6 +785,7 @@ stdenv.mkDerivation (rec {
           --replace ',("windres command", "/bin/false")' ',("windres command", "${targetCC.bintools.targetPrefix}windres")'
       ''
       else ''
+        runHook preInstall
         ${hadrian}/bin/hadrian ${hadrianArgs} binary-dist-dir
         cd _build/bindist/ghc-*
         ./configure --prefix=$out ${lib.concatStringsSep " " configureFlags}

compiler/ghcjs/ghcjs.nix

@@ -64,6 +64,7 @@ let
       dontInstall = true;
       buildPhase = ''
         export HOME=$TMP
+        export EM_CACHE=$(mktemp -d)
         mkdir $HOME/.cabal
         touch $HOME/.cabal/config
         cd lib/boot

flake.lock

@@ -1405,7 +1405,7 @@ pkgs:
     "libbeidpkcs11" = [ "eid-mw" ];
     "eigen3" = [ "eigen" ];
     "eigen2" = [ "eigen2" ];
-    "plannercore" = [ "elementary-planner" ];
+#    "plannercore" = [ "elementary-planner" ];
 #    "libbitcoinconsensus" = [ "elements" ];
 #    "libbitcoinconsensus" = [ "elementsd" ];
     "libdw" = [ "elfutils" ];
@@ -2927,7 +2927,7 @@ pkgs:
     "modsecurity" = [ "libmodsecurity" ];
     "libmodule" = [ "libmodule" ];
     "modulemd-2.0" = [ "libmodulemd" ];
-    "libmongo-client" = [ "libmongo-client" ];
+#    "libmongo-client" = [ "libmongo-client" ];
     "libmowgli-2" = [ "libmowgli" ];
     "libmp3splt" = [ "libmp3splt" ];
     "mpack" = [ "libmpack" ];
@@ -4466,7 +4466,7 @@ pkgs:
     "r_util" = [ "radare2" ];
     "raft" = [ "raft-canonical" ];
     "RapidJSON" = [ "rapidjson" ];
-    "rarian" = [ "rarian" ];
+#    "rarian" = [ "rarian" ];
     "raul-1" = [ "raul" ];
     "rav1e" = [ "rav1e" ];
     "raylib" = [ "raylib" ];

lib/pkgconf-nixpkgs-map.nix

@@ -9,7 +9,8 @@ with pkgs;
 let
   # On windows systems we need these to be propagatedBuildInputs so that the DLLs will be found.
   gcclibs = if pkgs.stdenv.hostPlatform.isWindows then [
-    pkgs.windows.mcfgthreads
+    # Find the versions of mfcgthreads used by stdenv.cc
+    (pkgs.threadsCrossFor or (x: pkgs.windows.mfcgthreads) pkgs.stdenv.cc.version).package
     # If we just use `pkgs.buildPackages.gcc.cc` here it breaks the `th-dlls` test. TODO figure out why exactly.
     (pkgs.buildPackages.runCommand "gcc-only" { nativeBuildInputs = [ pkgs.buildPackages.xorg.lndir ]; } ''
       mkdir $out