Bump nixpkgs pins

builder/ghc-for-component-wrapper.nix

@@ -37,11 +37,11 @@ let
     ${lndir}/bin/lndir -silent $unwrappedGhc $wrappedGhc
     rm -rf ${libDir}/*/
   ''
-  # ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
+  # ... but retain the lib/ghc/bin directory. This may contain `unlit' and friends.
   + ''
     if [ -d $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ]; then
       ln -s $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
-    else
+    elif [ -d $unwrappedGhc/lib/bin ]; then
       ln -s $unwrappedGhc/lib/bin ${libDir}
     fi
   ''

compiler/ghc/default.nix

@@ -297,6 +297,18 @@ let
         subDir = "hadrian";
         includeSiblings = true;
       };
+      # When building the plan we do not need a patched version
+      # of the source and `buildPackages.srcOnly` requires introduces
+      # a dependency on a build machine.
+      evalSrc = haskell-nix.haskellLib.cleanSourceWith {
+        src = {
+          name = "hadrian";
+          outPath = src;
+          filterPath = { path, ... }: path;
+        };
+        subDir = "hadrian";
+        includeSiblings = true;
+      };
     };
 
   hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian;

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

@@ -1,6 +1,7 @@
 { pkgs, cacert, index-state-hashes, haskellLib }:
 { name          ? src.name or null # optional name for better error messages
 , src
+, evalSrc ? src
 , materialized-dir ? ../materialized
 , compiler-nix-name    # The name of the ghc compiler to use eg. "ghc884"
 , index-state   ? null # Hackage index-state, eg. "2019-10-10T00:00:00Z"
@@ -94,13 +95,13 @@ in let
   ghc = if ghc' ? latestVersion
     then __trace "WARNING: ${ghc'.version} is out of date, consider using upgrading to ${ghc'.latestVersion}." ghc'
     else ghc';
-  subDir' = src.origSubDir or "";
+  subDir' = evalSrc.origSubDir or "";
   subDir = pkgs.lib.strings.removePrefix "/" subDir';
 
   cleanedSource = haskellLib.cleanSourceWith {
     name = if name != null then "${name}-root-cabal-files" else "source-root-cabal-files";
-    src = src.origSrc or src;
-    filter = path: type: (!(src ? filter) || src.filter path type) && (
+    src = evalSrc.origSrc or evalSrc;
+    filter = path: type: (!(evalSrc ? filter) || evalSrc.filter path type) && (
       type == "directory" ||
       pkgs.lib.any (i: (pkgs.lib.hasSuffix i path)) [ ".cabal" "package.yaml" ]); };
 

lib/check.nix

@@ -39,7 +39,7 @@ in stdenv.mkDerivation ((
 
   nativeBuildInputs = drv.nativeBuildInputs
     ++ [buildPackages.xorg.lndir]
-    ++ lib.optional (stdenv.hostPlatform.isGhcjs) buildPackages.nodejs-18_x;
+    ++ lib.optional (stdenv.hostPlatform.isGhcjs) buildPackages.nodejs;
 
   inherit (component) doCheck doCrossCheck;
 

lib/pkgconf-nixpkgs-map.nix

@@ -2750,12 +2750,12 @@ pkgs:
     "gaminggear-0" = [ "libgaminggear" ];
     "libgbinder" = [ "libgbinder" ];
     "libgcrypt" = [ "libgcrypt" ];
-    "libgda-5.0" = [ "libgda" ];
-    "libgda-report-5.0" = [ "libgda" ];
-    "libgda-sqlcipher-5.0" = [ "libgda" ];
-    "libgda-sqlite-5.0" = [ "libgda" ];
-    "libgda-ui-5.0" = [ "libgda" ];
-    "libgda-xslt-5.0" = [ "libgda" ];
+    "libgda-5.0" = [ "libgda5" ];
+    "libgda-report-5.0" = [ "libgda5" ];
+    "libgda-sqlcipher-5.0" = [ "libgda5" ];
+    "libgda-sqlite-5.0" = [ "libgda5" ];
+    "libgda-ui-5.0" = [ "libgda5" ];
+    "libgda-xslt-5.0" = [ "libgda5" ];
     "libgda-6.0" = [ "libgda6" ];
     "libgda-sqlite-6.0" = [ "libgda6" ];
     "libgdamm-5.0" = [ "libgdamm" ];
@@ -5087,7 +5087,7 @@ pkgs:
     "riscv-disasm" = [ "spike" ];
     "riscv-fesvr" = [ "spike" ];
     "SPIRV-Headers" = [ "spirv-headers" ];
-    "LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
+#    "LLVMSPIRVLib" = [ "spirv-llvm-translator" ];
     "SPIRV-Tools-shared" = [ "spirv-tools" ];
     "SPIRV-Tools" = [ "spirv-tools" ];
     "sqlcipher" = [ "sqlcipher" ];
@@ -5733,7 +5733,7 @@ pkgs:
         then [ pkgs.gdk_pixbuf ]
       else [];
     # rocm-thunk was replaced by rocmPackages.rocm-thunk in 23.11
-    "libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
+    # "libhsakmt" = [ pkgs.rocmPackages.rocm-thunk or pkgs.rocm-thunk ];
 } // lib.optionalAttrs (pkgs ? libsigcxx12) {
     # libsigcxx12 was removed in 23.11
     "sigc++-1.2" = [ "libsigcxx12" ];

lib/system-nixpkgs-map.nix

@@ -147,6 +147,3 @@ in
 # -- mingw32
 // { mingwex = null;
 }
-# -- os x
-# NB: these map almost 1:1 to the framework names
-// darwin.apple_sdk.frameworks