Merge remote-tracking branch 'origin/pr/1204'

haskell · Jan 9, 2025 · 03c2841 · 03c2841
2 parents 6d6cb02 + 0eef7c6
commit 03c2841
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/cabal.project.common b/cabal.project.common
@@ -10,6 +10,10 @@ constraints: http-io-streams -brotli,
              filepath == 1.4.101.0 || == 1.4.300.2 || >= 1.5.2.0,
              tar >= 0.6.2.0
 
+package ghcup
+  -- generic-arbitrary >= 1.0.0
+  ghc-options: -fconstraint-solver-iterations=0
+
 -- https://github.com/haskell/ghcup-hs/issues/1107
 -- https://github.com/haskell/unix/pull/318
 if arch(arm) || arch(i386)

diff --git a/ghcup.cabal b/ghcup.cabal
@@ -85,8 +85,8 @@ common app-common-depends
     , attoparsec             ^>= 0.14
     , base                   >=4.12     && <5
     , bytestring             >=0.10     && <0.13
-    , containers             ^>=0.6
-    , deepseq                ^>=1.4 || ^>=1.5
+    , containers             ^>=0.6 || ^>=0.7
+    , deepseq                ^>=1.4 || ^>=1.5 || ^>=1.6
     , directory              ^>=1.3.6.0
     , filepath               >=1.4.101.0
     , variant                ^>=1.0
@@ -102,10 +102,10 @@ common app-common-depends
     , safe-exceptions        ^>=0.1
     , tagsoup                ^>=0.14
     , transformers           ^>=0.5 || ^>=0.6
-    , template-haskell       >=2.7      && <2.23
+    , template-haskell       >=2.7      && <2.24
     , temporary              ^>=1.3
     , text                   ^>=2.0 || ^>=2.1
-    , time                   >=1.9.3    && <1.13
+    , time                   >=1.9.3    && <1.15
     , unordered-containers   ^>=0.2
     , uri-bytestring         ^>=0.3.2.2
     , utf8-string            ^>=1.0
@@ -196,7 +196,7 @@ library
     , attoparsec            ^>= 0.14
     , base                  >=4.12       && <5
     , base16-bytestring     >=0.1.1.6    && <1.1
-    , binary                ^>=0.8.6.0
+    , binary                ^>=0.8.6.0 || ^>=0.9 || ^>=0.10
     , bytestring            >=0.10       && <0.13
     , bz2                   ^>=1.0.1.1
     , Cabal                 ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0 || ^>=3.8.0.0 || ^>= 3.10.0.0
@@ -207,7 +207,7 @@ library
     , conduit               ^>=1.3
     , conduit-extra         ^>=1.3
     , cryptohash-sha256     ^>=0.11.101.0
-    , deepseq               ^>=1.4.4.0 || ^>=1.5
+    , deepseq               ^>=1.4 || ^>=1.5 || ^>=1.6
     , directory             ^>=1.3.6.0
     , disk-free-space       ^>=0.1.0.1
     , exceptions            ^>=0.10
@@ -229,11 +229,11 @@ library
     , safe-exceptions       ^>=0.1
     , split                 ^>=0.2.3.4
     , strict-base           ^>=0.4
-    , template-haskell       >=2.7      && <2.23
+    , template-haskell       >=2.7      && <2.24
     , temporary             ^>=1.3
     , terminal-size         ^>=0.3.3
     , text                  ^>=2.0 || ^>=2.1
-    , time                  >=1.9.3      && <1.13
+    , time                  >=1.9.3      && <1.15
     , transformers          ^>=0.5 || ^>=0.6
     , unliftio-core         ^>=0.2.0.1
     , unordered-containers  ^>=0.2.10.0
@@ -243,7 +243,7 @@ library
     , versions               >=6.0.5      && <6.1
     , word8                 ^>=0.1.3
     , yaml                  ^>=0.11.0
-    , zlib                  ^>=0.6.2.2
+    , zlib                  ^>=0.6.2.2 || ^>=0.7
 
   if flag(tar)
     cpp-options:   -DTAR
@@ -388,7 +388,7 @@ library ghcup-tui
 
   build-depends:
     , ghcup
-    , brick         ^>=2.1
+    , brick         >=2.1 && <2.8
     , vty           ^>=6.0 || ^>=6.1 || ^>=6.2
 
   if !flag(tui)
@@ -469,18 +469,18 @@ test-suite ghcup-test
   build-depends:
     , base                      >=4.12    && <5
     , bytestring                >=0.10    && <0.13
-    , containers                ^>=0.6
+    , containers                ^>=0.6 || ^>=0.7
     , conduit                   ^>=1.3
     , directory                 ^>=1.3.6.0
     , filepath                  >=1.4.101.0
-    , generic-arbitrary         ^>=0.1.0 || ^>=0.2.2
+    , generic-arbitrary         ^>=0.1.0 || ^>=0.2.2 || ^>=1.0.0
     , ghcup
     , hspec                     >=2.7.10  && <2.12
     , hspec-golden-aeson        ^>=0.9
-    , QuickCheck                ^>=2.14.1
+    , QuickCheck                ^>=2.14.1 || ^>=2.15
     , quickcheck-arbitrary-adt  ^>=0.3.1.0
     , text                      ^>=2.0 || ^>=2.1
-    , time                      >=1.9.3   && <1.13
+    , time                      >=1.9.3   && <1.15
     , uri-bytestring            ^>=0.3.2.2
     , versions                   >=6.0.5      && <6.1