Skip to content

Commit ef2e2f8

Browse files
committed
Patch upper bounds
1 parent 72a3838 commit ef2e2f8

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

overlays/bootstrap.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,11 @@ in {
255255
++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch)
256256
++ onWindowsOrMusl (fromUntil "9.6" "9.7" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch)
257257
++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch)
258-
++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
259-
++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch
260-
++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
261-
++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch
258+
++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
259+
++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch
260+
++ fromUntil "9.8.3" "9.10" ./patches/ghc/ghc-9.8.3-text-upper-bound.patch
261+
++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
262+
++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch
262263

263264
# 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
264265
# assembly we generate because it's always absolute (32bit) addressing modes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/linters/lint-commit-msg/lint-commit-msg.cabal b/linters/lint-commit-msg/lint-commit-msg.cabal
2+
index 7d1dbd0fcb..861ad6f03d 100644
3+
--- a/linters/lint-commit-msg/lint-commit-msg.cabal
4+
+++ b/linters/lint-commit-msg/lint-commit-msg.cabal
5+
@@ -26,4 +26,4 @@ executable lint-commit-msg
6+
base
7+
>= 4.14 && < 5,
8+
text
9+
- >= 1.2 && < 2.1
10+
+ >= 1.2 && < 2.2
11+
diff --git a/linters/lint-submodule-refs/lint-submodule-refs.cabal b/linters/lint-submodule-refs/lint-submodule-refs.cabal
12+
index ce4012adfc..9ff85d2731 100644
13+
--- a/linters/lint-submodule-refs/lint-submodule-refs.cabal
14+
+++ b/linters/lint-submodule-refs/lint-submodule-refs.cabal
15+
@@ -15,7 +15,7 @@ executable lint-submodule-refs
16+
base
17+
>= 4.14 && < 5,
18+
text
19+
- >= 1.2 && < 2.1,
20+
+ >= 1.2 && < 2.2,
21+
linters-common
22+
23+
ghc-options:
24+

0 commit comments

Comments
 (0)