Skip to content

Commit d873282

Browse files
mergify[bot]ffaf1geekosaur
authored
Bump dependencies and cabal-version (backport #10082) (#10094)
* Bump a number of dependencies base and QuickCheck. (cherry picked from commit 5226cd8) # Conflicts: # cabal-install-solver/cabal-install-solver.cabal * Bump `cabal-version` For `Cabal` and `cabal-install`. (cherry picked from commit bb24ef5) * fixup! Bump a number of dependencies --------- Co-authored-by: Francesco Ariis <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]>
1 parent 8e3cfd3 commit d873282

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Cabal/Cabal.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cabal-version: 2.2
1+
cabal-version: 3.0
22
name: Cabal
33
version: 3.12.0.0
44
copyright: 2003-2024, Cabal Development Team (see AUTHORS file)

cabal-install-solver/cabal-install-solver.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ library
102102

103103
build-depends:
104104
, array >=0.4 && <0.6
105-
, base >=4.11 && <4.20
105+
, base >=4.11 && <4.21
106106
, bytestring >=0.10.6.0 && <0.13
107107
, Cabal ^>=3.12
108108
, Cabal-syntax ^>=3.12
@@ -134,7 +134,7 @@ Test-Suite unit-tests
134134
UnitTests.Distribution.Solver.Modular.MessageUtils
135135

136136
build-depends:
137-
, base >= 4.11 && <4.20
137+
, base >= 4.11 && <4.21
138138
, Cabal
139139
, Cabal-syntax
140140
, cabal-install-solver

cabal-install/cabal-install.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Cabal-Version: 2.2
1+
Cabal-Version: 3.0
22

33
Name: cabal-install
44
Version: 3.11.0.0
@@ -51,7 +51,7 @@ common warnings
5151
ghc-options: -Wunused-packages
5252

5353
common base-dep
54-
build-depends: base >=4.11 && <4.20
54+
build-depends: base >=4.11 && <4.21
5555

5656
common cabal-dep
5757
build-depends: Cabal ^>=3.12
@@ -353,7 +353,7 @@ test-suite unit-tests
353353
tasty-expected-failure,
354354
tasty-hunit >= 0.10,
355355
tree-diff,
356-
QuickCheck >= 2.14.3 && <2.15
356+
QuickCheck >= 2.14.3 && <2.16
357357

358358

359359
-- Tests to run with a limited stack and heap size
@@ -438,5 +438,5 @@ test-suite long-tests
438438
tasty-expected-failure,
439439
tasty-hunit >= 0.10,
440440
tasty-quickcheck,
441-
QuickCheck >= 2.14 && <2.15,
441+
QuickCheck >= 2.14 && <2.16,
442442
pretty-show >= 1.6.15

0 commit comments

Comments
 (0)