Use different patch

fixup path

Revert "fixup path"

This reverts commit af61537.

Revert "Use different patch"

This reverts commit 988d00a.

Revert "Patch wine to fix addDllDirectory"

This reverts commit a0ab8fa.

Patch wine to fix addDllDirectory

Fixes errors like this when trying to load DLLs into template haskell code with GHC 9.4 and above:

```
iserv-proxy-interpreter.exe: addLibrarySearchPath: \\?\Z:\nix\store\gjsf5jazfbfv21hvvgf1amd5rdx3ycf3-x86_64-w64-mingw32-ghc-9.4.3\lib\x86_64-windows-ghc-9.4.3\ghc-bignum-1.3 (Win32 error 87): Invalid parameter.
```

These errors arise with GHC 9.4 and above because it uses UNC paths to avoid limits on path length.  The `RtlDetermineDosPathNameType_U` function classifies these as a `DEVICE_PATH` and `LdrAddDllDirectory` gives up at that point.

Add 9220 patch

:sigh:

Fixup

Author: angerman

modules/configuration-nix.nix

@@ -44,6 +44,7 @@ in {
     (fromUntil "3.2.0.0" "3.5" ../overlays/patches/Cabal/Cabal-3.0.0.0-no-final-checks.diff)
     (fromUntil "3.6.0.0" "3.11" ../overlays/patches/Cabal/Cabal-3.6.0.0-drop-pkg-db-check.diff)
     (fromUntil "3.6.0.0" "3.11" ../overlays/patches/Cabal/Cabal-3.6.0.0-no-final-checks.diff)
+    (fromUntil "3.6.0.0" "3.11" ../overlays/patches/Cabal/9220.patch)
   ];
 
   # These two patches are:

overlays/bootstrap.nix

@@ -187,7 +187,16 @@ in {
                 # support R_X86_64_PC64 (ELF constant 24) - IMAGE_REL_AMD64_SREL32 (PE constant 14), which seems to appear with 9.6 more frequently, and
                 # results in "unhandled PEi386 relocation type 14".
                 ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.10"   ./patches/ghc/win-reloc-x86_64-pc64.patch)
-                ++ fromUntil "9.4.5"  "9.4.6"  ./patches/ghc/ghc-9.4.5-include-order-fix.patch
+                # ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.10"   ./patches/ghc/Win32-depends-on-mingwex.patch)
+                # if the host system provides ucrt (e.g. wine with ucrtbase.dll), we may end up linking against symbols from ucrtbase, instead of msvcrt,
+                # thus leading to broken code.  E.g. the handles we create and hand to wine will all be busted, because they come from one and are processed
+                # by another crt.
+                ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "8.10"   "9.10"   ./patches/ghc/win-linker-no-ucrt.patch)
+                # Nixos/nixpkgs is mscvrt for now, thus we must disable ucrt in ghc, otherwise we end up with broken linking.
+                ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.10"   ./patches/ghc/no-ucrt.patch)
+                # the following is needed for cardano-prelude as it uses closure_sizeW :-/
+                ++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1"  "9.10"   ./patches/ghc/win-add-closure_sizeW-to-rtssyms.patch)
+                ++ fromUntil "9.4.5"  "9.4.8"  ./patches/ghc/ghc-9.4.5-include-order-fix.patch
                 ++ fromUntil "9.6.2"  "9.8"    ./patches/ghc/ghc-9.4.5-include-order-fix.patch
                 ++ fromUntil "9.6.1"  "9.10"   ./patches/ghc/MR10116.patch
                 ++ final.lib.optionals (final.stdenv.buildPlatform == final.stdenv.targetPlatform) (fromUntil "9.4.1" "9.6" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode-ghc94.patch)
@@ -212,6 +221,7 @@ in {
                 ++ final.lib.optional (versionAtLeast "8.10"   && versionLessThan "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-8.10-aarch64-handle-none-rela.patch
                 ++ final.lib.optional (versionAtLeast "9.0"                             && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.0-better-symbol-addr-debug.patch
                 ++ final.lib.optional (versionAtLeast "9.0"                             && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.0-aarch64-handle-none-rela.patch
+
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

overlays/patches/Cabal/9220.patch

@@ -0,0 +1,70 @@
+diff --git a/src/Distribution/Simple/Configure.hs b/src/Distribution/Simple/Configure.hs
+index ac7bd852f..803475283 100644
+--- a/src/Distribution/Simple/Configure.hs
++++ b/src/Distribution/Simple/Configure.hs
+@@ -637,22 +637,6 @@ configure (pkg_descr0, pbi) cfg = do
+                                       "--enable-split-objs; ignoring")
+                                 return False
+
+-    let compilerSupportsGhciLibs :: Bool
+-        compilerSupportsGhciLibs =
+-          case compilerId comp of
+-            CompilerId GHC version
+-              | version > mkVersion [9,3] && windows ->
+-                False
+-            CompilerId GHC _ ->
+-                True
+-            CompilerId GHCJS _ ->
+-                True
+-            _ -> False
+-          where
+-            windows = case compPlatform of
+-              Platform _ Windows -> True
+-              Platform _ _ -> False
+-
+     let ghciLibByDefault =
+           case compilerId comp of
+             CompilerId GHC _ ->
+@@ -669,15 +653,6 @@ configure (pkg_descr0, pbi) cfg = do
+               not (GHCJS.isDynamic comp)
+             _ -> False
+
+-    withGHCiLib_ <-
+-      case fromFlagOrDefault ghciLibByDefault (configGHCiLib cfg) of
+-        True | not compilerSupportsGhciLibs -> do
+-          warn verbosity $
+-                "--enable-library-for-ghci is no longer supported on Windows with"
+-              ++ " GHC 9.4 and later; ignoring..."
+-          return False
+-        v -> return v
+-
+     let sharedLibsByDefault
+           | fromFlag (configDynExe cfg) =
+               -- build a shared library if dynamically-linked
+@@ -774,7 +749,7 @@ configure (pkg_descr0, pbi) cfg = do
+                 withProfExeDetail   = ProfDetailNone,
+                 withOptimization    = fromFlag $ configOptimization cfg,
+                 withDebugInfo       = fromFlag $ configDebugInfo cfg,
+-                withGHCiLib         = withGHCiLib_,
++                withGHCiLib         = fromFlagOrDefault ghciLibByDefault (configGHCiLib cfg),
+                 splitSections       = split_sections,
+                 splitObjs           = split_objs,
+                 stripExes           = strip_exe,
+diff --git a/src/Distribution/Simple/Setup.hs b/src/Distribution/Simple/Setup.hs
+index 36f6aa22f..aa60b73b8 100644
+--- a/src/Distribution/Simple/Setup.hs
++++ b/src/Distribution/Simple/Setup.hs
+@@ -384,12 +384,7 @@ defaultConfigFlags progDb = emptyConfigFlags {
+     configCabalFilePath = NoFlag,
+     configVerbosity    = Flag normal,
+     configUserInstall  = Flag False,           --TODO: reverse this
+-#if defined(mingw32_HOST_OS)
+-    -- See #8062 and GHC #21019.
+-    configGHCiLib      = Flag False,
+-#else
+-    configGHCiLib      = NoFlag,
+-#endif
++    configGHCiLib      = Flag True,
+     configSplitSections = Flag False,
+     configSplitObjs    = Flag False, -- takes longer, so turn off by default
+     configStripExes    = NoFlag,

overlays/patches/ghc/Win32-depends-on-mingwex.patch

@@ -0,0 +1,13 @@
+diff --git a/libraries/Win32/Win32.cabal b/libraries/Win32/Win32.cabal
+index e986b7e..603354f 100644
+--- a/libraries/Win32/Win32.cabal
++++ b/libraries/Win32/Win32.cabal
+@@ -138,7 +138,7 @@ Library
+         System.Win32.Time.Internal
+
+     extra-libraries:
+-        "user32", "gdi32", "winmm", "advapi32", "shell32", "shfolder", "shlwapi", "msimg32", "imm32"
++        "user32", "gdi32", "winmm", "advapi32", "shell32", "shfolder", "shlwapi", "msimg32", "imm32", "mingwex"
+     ghc-options:      -Wall
+     include-dirs:     include
+     includes:         "alphablend.h", "diatemp.h", "dumpBMP.h", "ellipse.h", "errors.h", "HsGDI.h", "HsWin32.h", "Win32Aux.h", "win32debug.h", "windows_cconv.h", "WndProc.h", "alignment.h"

overlays/patches/ghc/no-ucrt.patch

@@ -0,0 +1,26 @@
+diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
+index 5393363..4f5db98 100644
+--- a/libraries/ghc-prim/ghc-prim.cabal
++++ b/libraries/ghc-prim/ghc-prim.cabal
+@@ -73,7 +73,7 @@ Library
+         --          mingw32 which is required by mingwex.
+         -- user32: provides access to apis to modify user components (UI etc)
+         --         on Windows. Required because of mingw32.
+-        extra-libraries: user32, mingw32, ucrt
++        extra-libraries: user32, mingw32, msvcrt, mingwex
+
+     if os(linux)
+         -- we need libm, but for musl and other's we might need libc, as libm
+diff --git a/m4/fp_setup_windows_toolchain.m4 b/m4/fp_setup_windows_toolchain.m4
+index 1f44a38..122a205 100644
+--- a/m4/fp_setup_windows_toolchain.m4
++++ b/m4/fp_setup_windows_toolchain.m4
+@@ -86,7 +86,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
+     # Signal that we are linking against UCRT with the _UCRT macro. This is
+     # necessary to ensure correct behavior when MinGW-w64 headers are in the
+     # header include path (#22159).
+-    cflags="--rtlib=compiler-rt -D_UCRT"
++    cflags=""
+     CFLAGS="$cflags"
+     CONF_CC_OPTS_STAGE1="$cflags"
+     CONF_CC_OPTS_STAGE2="$cflags"

overlays/patches/ghc/win-add-closure_sizeW-to-rtssyms.patch

@@ -0,0 +1,15 @@
+diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
+index 10efb2a..d8ea070 100644
+--- a/rts/RtsSymbols.c
++++ b/rts/RtsSymbols.c
+@@ -160,7 +160,9 @@ extern char **environ;
+       SymI_HasProto(__mingw_vsnwprintf)                  \
+       /* ^^ Need to figure out why this is needed.  */   \
+       SymI_HasProto(__mingw_vfprintf)                    \
+-      /* ^^ Need to figure out why this is needed.  */
++      /* ^^ Need to figure out why this is needed.  */   \
++      SymI_HasProto(closure_sizeW_)                      \
++      /* ^^ This one needed for cardano-prelude m(  */
+ #else
+ #define RTS_MINGW_ONLY_SYMBOLS /**/
+ #endif

overlays/patches/ghc/win-linker-no-ucrt.patch

@@ -0,0 +1,16 @@
+diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
+index c404992..fd060e4 100644
+--- a/rts/linker/PEi386.c
++++ b/rts/linker/PEi386.c
+@@ -1132,6 +1132,11 @@ lookupSymbolInDLLs ( const SymbolName* lbl, ObjectCode *dependent )
+     for (o_dll = opened_dlls; o_dll != NULL; o_dll = o_dll->next) {
+         /* debugBelch("look in %ls for %s\n", o_dll->name, lbl); */
+
++        if (wcsncmp(o_dll->name,WSTR("ucrtbase.dll"),wcslen(WSTR("ucrtbase.dll"))) == 0) {
++            IF_DEBUG(linker, debugBelch("warning: ignoring %s\n", o_dll->name));
++            continue;
++        }
++
+         sym = GetProcAddress(o_dll->instance, lbl+STRIP_LEADING_UNDERSCORE);
+         if (sym != NULL) {
+             /*debugBelch("found %s in %s\n", lbl+1,o_dll->name);*/

overlays/wine.nix

@@ -2,21 +2,10 @@
 # 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:
-prev.lib.optionalAttrs (!prev.stdenv.hostPlatform.isDarwin) {
-    winePackages = prev.winePackages // {
-        minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
-            name = "wine-5.4";
-            version = "5.4";
-            src = prev.fetchurl {
-              url = "https://dl.winehq.org/wine/source/5.x/wine-5.4.tar.xz";
-              sha256 = "sha256-Sz4rD/pUFfGZVA5gUcKMOXb86R6lv7LPSgmcJXMXBSw=";
-            };
-            patches = [] ++ [ ./patches/wine-add-dll-directory.patch ];
-            # Turning off the tests as there is a problem with the `schedsvc` test.
-            # With recent nixpkgs both the IDL files generate `_c.c` files with
-            # `handle_t rpc_handle` and that results in a linker error (duplicate symbols).
-            configureFlags = oldAttrs.configureFlags or [] ++ ["--disable-tests"];
-        });
-    };
-}
+final: prev: {
+  winePackages = prev.winePackages // {
+    minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
+      patches = oldAttrs.patches or [] ++ [ ./patches/wine-add-dll-directory.patch ];
+    });
+  };
+}