|
168 | 168 | ++ onGhcjs (fromUntil "9.6.3" "9.8" ./patches/ghc/ghc-9.6.3-JS-implement-TH-support.patch) |
169 | 169 | ++ fromUntil "9.8.1" "9.8.2" ./patches/ghc/ghc-9.8-cabal-c-soures-fix.patch |
170 | 170 | ++ fromUntil "9.6.3" "9.6.5" ./patches/ghc/ghc-9.6.3-Cabal-9384.patch |
171 | | - ++ fromUntil "9.8.1" "9.9" ./patches/ghc/ghc-9.6.3-Cabal-9384.patch |
| 171 | + ++ fromUntil "9.8.1" "9.8.3" ./patches/ghc/ghc-9.6.3-Cabal-9384.patch |
172 | 172 |
|
173 | 173 | # the following is a partial reversal of https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4391, to address haskell.nix#1227 |
174 | 174 | ++ onAarch64 (until "9.0" ./patches/ghc/mmap-next.patch) |
@@ -245,10 +245,10 @@ in { |
245 | 245 | ++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch) |
246 | 246 | ++ onWindowsOrMusl (fromUntil "9.6" "9.7" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch) |
247 | 247 | ++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch) |
248 | | - ++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch |
249 | | - ++ fromUntil "9.8" "9.9" ./patches/ghc/ghc-9.8-text-upper-bound.patch |
250 | | - ++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch |
251 | | - ++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch |
| 248 | + ++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch |
| 249 | + ++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch |
| 250 | + ++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch |
| 251 | + ++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch |
252 | 252 |
|
253 | 253 | # This patch will make windows stop emitting absolute relocations. This is one way in which binutils 2.36+ (with ASLR enabled), will just choke on the |
254 | 254 | # assembly we generate because it's always absolute (32bit) addressing modes. |
|
0 commit comments