Skip to content

Commit b9e54c2

Browse files
committed
Fix text upper bound in ghc 9.8 linters
1 parent 9ff0d78 commit b9e54c2

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ in {
279279
++ final.lib.optional (versionAtLeast "9.6" && versionLessThan "9.8" && (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl)) ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch
280280
++ final.lib.optional (versionAtLeast "9.6" && versionLessThan "9.8" && (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl)) ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch
281281
++ fromUntil "9.9" "9.12" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
282+
++ fromUntil "9.8" "9.9" ./patches/ghc/ghc-9.10-text-upper-bound.patch
282283
++ fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
283284
++ fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-merge-objects.patch
284285
;
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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+
diff --git a/linters/lint-whitespace/lint-whitespace.cabal b/linters/lint-whitespace/lint-whitespace.cabal
25+
index 61e376d1f9..ab49690435 100644
26+
--- a/linters/lint-whitespace/lint-whitespace.cabal
27+
+++ b/linters/lint-whitespace/lint-whitespace.cabal
28+
@@ -28,4 +28,4 @@ executable lint-whitespace
29+
base
30+
>= 4.14 && < 5,
31+
text
32+
- >= 1.2 && < 2.1,
33+
+ >= 1.2 && < 2.2,
34+
diff --git a/linters/linters-common/linters-common.cabal b/linters/linters-common/linters-common.cabal
35+
index 02245750dd..0bdd04a761 100644
36+
--- a/linters/linters-common/linters-common.cabal
37+
+++ b/linters/linters-common/linters-common.cabal
38+
@@ -16,7 +16,7 @@ library
39+
base
40+
>= 4.14 && < 5,
41+
text
42+
- >= 1.2 && < 2.1,
43+
+ >= 1.2 && < 2.2,
44+
deepseq
45+
>= 1.1,
46+

0 commit comments

Comments
 (0)