Fix patches

hamishmack · hamishmack · commit bf96421e3be6 · 2024-09-27T16:49:23.000+12:00
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -234,7 +234,6 @@ in {
                        (final.stdenv.targetPlatform.isAndroid || final.stdenv.targetPlatform.isLinux)
                     && (final.stdenv.targetPlatform.isAarch64 || final.stdenv.targetPlatform.is32bit))
                   (fromUntil "9.6.1" "9.10" ./patches/ghc/iserv-syms.patch)
-                ++ onWindows (from "9.4" ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch)
                 ++ onAndroid (fromUntil "9.6.3" "9.10" ./patches/ghc/ghc-9.6-iog.patch)
                 ++ on32bit (fromUntil "9.6" "9.12" ./patches/ghc/ghc-9.6-genapply-cross-arch.patch)
                 ++ onAndroid (fromUntil "9.6" "9.9" ./patches/ghc/ghc-9.6-debug-secno.patch)
diff --git a/overlays/mingw_w64.nix b/overlays/mingw_w64.nix
@@ -39,8 +39,6 @@ let
         REMOTE_ISERV=$(mktemp -d)
         ln -s ${interpreter.override
           {
-            patches = [ ./patches/iserv-proxy-keep-cafs.patch ]
-                      ;
             enableDebugRTS = true;
             setupBuildFlags = ["--ghc-option=-optl-Wl,--disable-dynamicbase,--disable-high-entropy-va,--image-base=0x400000" ];
           }}/bin/* $REMOTE_ISERV

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ let`
`39`	`39`	`REMOTE_ISERV=$(mktemp -d)`
`40`	`40`	`ln -s ${interpreter.override`
`41`	`41`	`{`
`42`		`- patches = [ ./patches/iserv-proxy-keep-cafs.patch ]`
`43`		`- ;`
`44`	`42`	`enableDebugRTS = true;`
`45`	`43`	`setupBuildFlags = ["--ghc-option=-optl-Wl,--disable-dynamicbase,--disable-high-entropy-va,--image-base=0x400000" ];`
`46`	`44`	`}}/bin/* $REMOTE_ISERV`