Merge remote-tracking branch 'origin/master' into hkm/embed-file

Author: hamishmack

ci.nix

@@ -56,11 +56,7 @@
       # cabal-install and nix-tools plans.  When removing a ghc version
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
-      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
-        ghc810 = false;
-        ghc90 = false;
-        ghc92 = false;
-      } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
+      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
         ghc94 = false;
         ghc96 = false;
         ghc98 = false;
@@ -88,8 +84,8 @@
        || (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        )) {
     inherit (lib.systems.examples) ghcjs;
-  } // lib.optionalAttrs (nixpkgsName != "unstable"
-      && (__match ".*llvm" compiler-nix-name == null)
+  } // lib.optionalAttrs (
+         (__match ".*llvm" compiler-nix-name == null)
       && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884"])
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;

flake.lock

@@ -63,7 +63,6 @@ let
   # The packages in GHC source and the locations of them
   ghc-extra-pkgs = ghcVersion: {
       base         = "libraries/base";
-      bytestring   = "libraries/bytestring";
       ghci         = "libraries/ghci";
       ghc-heap     = "libraries/ghc-heap";
       ghc-prim     = "libraries/ghc-prim";
@@ -79,9 +78,6 @@ let
     } // (
       if builtins.compareVersions ghcVersion "9.4" < 0
         then {
-          # The version of `Win32` that comes with ghc 9.4 (2.12.0.0) is older
-          # than the one in hackage.  Including it causes `cabal configure` to fail.
-          Win32        = "libraries/Win32";
           # As of GHC 9.4 this has been split out of the GHC repo and
           # is now in the iserv-proxy flake input
           iserv-proxy  = "utils/iserv-proxy";
@@ -95,11 +91,6 @@ let
       remote-iserv = "utils/remote-iserv";
     } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.0.1" >= 0) {
       ghc-bignum   = "libraries/ghc-bignum";
-    } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.2.1" >= 0) {
-      deepseq      = "libraries/deepseq";
-      pretty       = "libraries/pretty";
-    } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.8" >= 0) {
-      parsec       = "libraries/parsec";
     } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.9" >= 0) {
       ghc-platform = "libraries/ghc-platform";
       ghc-internal = "libraries/ghc-internal";

overlays/ghc-packages.nix

@@ -20,6 +20,7 @@ let
         if enableProfiling
           then iserv-proxy-interpreter.override { inherit enableProfiling; }
           else iserv-proxy-interpreter;
+      no-load-call = lib.optionalString (interpreter.exeName != "remote-iserv.exe") "--no-load-call";
     in
       writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
         set -euo pipefail
@@ -53,10 +54,10 @@ let
         # Not sure why this `unset` helps.  It might avoids some kind of overflow issue.  We see `wine` fail to start when building `cardano-wallet-cli` test `unit`.
         unset pkgsHostTargetAsString
         unset LINK_DLL_FOLDERS
-        WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 $REMOTE_ISERV/${interpreter.exeName} tmp $PORT --no-load-call $ISERV_ARGS &
+        WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 $REMOTE_ISERV/${interpreter.exeName} tmp $PORT ${no-load-call} $ISERV_ARGS &
         (>&2 echo "---| ${interpreter.exeName} should have started on $PORT")
         RISERV_PID="$!"
-        ISERV_TARGET=WINE ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" --no-load-call $PROXY_ARGS
+        ISERV_TARGET=WINE ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" ${no-load-call} $PROXY_ARGS
         (>&2 echo "---> killing ${interpreter.exeName}...")
         kill $RISERV_PID
       '';