Fix containers upper bound in lint-whitespace

input-output-hk · May 5, 2024 · 1015d65 · 1015d65
1 parent 90e0c2c
commit 1015d65
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -279,6 +279,7 @@ in {
                 ++ 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
                 ++ 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
                 ++ fromUntil "9.9" "9.12" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
+                ++ fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

diff --git a/overlays/patches/ghc/ghc-9.10-containers-upper-bound.patch b/overlays/patches/ghc/ghc-9.10-containers-upper-bound.patch
@@ -0,0 +1,14 @@
+diff --git a/linters/lint-whitespace/lint-whitespace.cabal b/linters/lint-whitespace/lint-whitespace.cabal
+index e4fab0631e..4d8e6dd1cf 100644
+--- a/linters/lint-whitespace/lint-whitespace.cabal
++++ b/linters/lint-whitespace/lint-whitespace.cabal
+@@ -24,7 +24,7 @@ executable lint-whitespace
+     process
+       ^>= 1.6,
+     containers
+-      ^>= 0.6,
++      >=0.6 && <0.8,
+     base
+        >= 4.14 && < 5,
+     text
+