Merge branch 'hkm/nixpkgs-update' into hkm/wasm

Author: hamishmack

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
   ''

flake.lock

@@ -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/check.nix

@@ -18,7 +18,7 @@ let
         else existing.${(builtins.head available).id}.components.${collectionName}.${name};
       componentsWithPrefix = collectionName: prefix:
         lib.listToAttrs (lib.concatLists (lib.mapAttrsToList (n: available:
-          lib.optional (lib.hasPrefix "${prefix}:" n && (builtins.length available != 1 || !builtins.elem (builtins.head available) ["TargetNotBuildable" "TargetNotLocal"])) (
+          lib.optional (lib.hasPrefix "${prefix}:" n && (builtins.length available != 1 || !builtins.elem (builtins.head available) ["TargetNotLocal"])) (
             let
               name = lib.removePrefix "${prefix}:" n;
               value = lookupComponent collectionName name available;
@@ -45,6 +45,9 @@ let
             (_: d: pkgs.haskell-nix.haskellLib.check d)
               (lib.filterAttrs (_: d: d.config.doCheck) components.tests)));
     };
+  buildableTargets = lib.filter (x: x.available != []) (
+    lib.map (x: x // { available = lib.filter (n: n != "TargetNotBuildable") x.available; })
+      config.plan-json.targets);
 in {
   options.hsPkgs = lib.mkOption {
     type = lib.types.unspecified;
@@ -63,10 +66,10 @@ in {
               components = err;
               checks = err;
             }
-          else redirect existing packageName packageTargets) (builtins.groupBy (x: x.pkg-name) config.plan-json.targets)) config.preExistingPkgs
+          else redirect existing packageName packageTargets) (builtins.groupBy (x: x.pkg-name) buildableTargets)) config.preExistingPkgs
 
       # Redirect for `${name}-${version}`
       // builtins.mapAttrs (packageNameAndVersion: packageTargets: redirect existing packageNameAndVersion packageTargets)
-            (builtins.groupBy (x: "${x.pkg-name}-${x.pkg-version}") config.plan-json.targets);
+            (builtins.groupBy (x: "${x.pkg-name}-${x.pkg-version}") buildableTargets);
   };
 }

modules/install-plan/redirect.nix

@@ -0,0 +1,13 @@
+diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
+index 85eb2976807..36d92b32d1c 100644
+--- a/dlls/ntdll/loader.c
++++ b/dlls/ntdll/loader.c
+@@ -4620,7 +4620,7 @@ NTSTATUS WINAPI LdrAddDllDirectory( const UNICODE_STRING *dir, void **cookie )
+     struct dll_dir_entry *ptr;
+     DOS_PATHNAME_TYPE type = RtlDetermineDosPathNameType_U( dir->Buffer );
+ 
+-    if (type != ABSOLUTE_PATH && type != ABSOLUTE_DRIVE_PATH && type != UNC_PATH)
++    if (type != ABSOLUTE_PATH && type != ABSOLUTE_DRIVE_PATH && type != UNC_PATH && type != DEVICE_PATH)
+         return STATUS_INVALID_PARAMETER;
+ 
+     status = RtlDosPathNameToNtPathName_U_WithStatus( dir->Buffer, &nt_name, NULL, NULL );

overlays/patches/wine-add-dll-directory-10.patch

@@ -1,11 +1,12 @@
-# fix wine at 5.4; later versions build with ucrt and this can break TH code (for instance accessing
-# files from TH code) for GHC built with msvcrt (ghc<9.6).
-# This will inevitably replace *any* wine version. Thus this might not really be what we ultimately want.
-# Wine 5.4 does not build on macOS so that is not pinned and TH code will probably break.
 _final: prev: {
   winePackages = prev.winePackages // {
     minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
-      patches = oldAttrs.patches or [] ++ [ ./patches/wine-add-dll-directory.patch ];
+      # Fix issue with UNC device file paths
+      patches = oldAttrs.patches or []
+        ++ [(if builtins.compareVersions prev.winePackages.minimal.version "10.0" < 0
+          then ./patches/wine-add-dll-directory.patch
+          else ./patches/wine-add-dll-directory-10.patch)];
+      # Avoid dependency on X11
       configureFlags = oldAttrs.configureFlags or [] ++ [ "--without-x" ];
     });
   };