Skip to content

Commit ab1d914

Browse files
committed
Skip windows patch now in 9.6 branch
1 parent 7521ca8 commit ab1d914

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

overlays/bootstrap.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ in {
137137
++ onWindows (fromUntil "9.6.3" "9.11" ./patches/ghc/ghc-9.8-hadrian-win-cross.patch)
138138
# 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
139139
# results in "unhandled PEi386 relocation type 14".
140-
++ onWindows (fromUntil "9.4.1" "9.8.3" ./patches/ghc/win-reloc-x86_64-pc64.patch)
140+
++ onWindows (fromUntil "9.4.1" "9.6.7" ./patches/ghc/win-reloc-x86_64-pc64.patch)
141+
++ onWindows (fromUntil "9.8.1" "9.8.3" ./patches/ghc/win-reloc-x86_64-pc64.patch)
141142
++ onWindows (fromUntil "9.10" "9.11" ./patches/ghc/win-reloc-x86_64-pc64.patch)
142143
# ++ onWindows (fromUntil "9.4.1" "9.10" ./patches/ghc/Win32-depends-on-mingwex.patch)
143144
# if the host system provides ucrt (e.g. wine with ucrtbase.dll), we may end up linking against symbols from ucrtbase, instead of msvcrt,

0 commit comments

Comments
 (0)