From 5226cd8c99b8371003f64fc3bce48db84ddd0b0c Mon Sep 17 00:00:00 2001 From: Francesco Ariis Date: Fri, 7 Jun 2024 20:53:46 +0200 Subject: [PATCH 1/2] Bump a number of dependencies base and QuickCheck. --- cabal-install-solver/cabal-install-solver.cabal | 4 ++-- cabal-install/cabal-install.cabal | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 0e9bd6e9bff..6918f739b88 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -99,7 +99,7 @@ library build-depends: , array >=0.4 && <0.6 - , base >=4.11 && <4.20 + , base >=4.11 && <4.21 , bytestring >=0.10.6.0 && <0.13 , Cabal ^>=3.13 , Cabal-syntax ^>=3.13 @@ -131,7 +131,7 @@ Test-Suite unit-tests UnitTests.Distribution.Solver.Modular.MessageUtils build-depends: - , base >= 4.11 && <4.20 + , base >= 4.11 && <4.21 , Cabal-syntax , cabal-install-solver , tasty >= 1.2.3 && <1.6 diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 230e72c533b..ebe3339cb2f 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -52,7 +52,7 @@ common warnings ghc-options: -Wnoncanonical-monadfail-instances common base-dep - build-depends: base >=4.11 && <4.20 + build-depends: base >=4.11 && <4.21 common cabal-dep build-depends: Cabal ^>=3.13 @@ -354,7 +354,7 @@ test-suite unit-tests tasty-expected-failure, tasty-hunit >= 0.10, tree-diff, - QuickCheck >= 2.14.3 && <2.15 + QuickCheck >= 2.14.3 && <2.16 -- Tests to run with a limited stack and heap size @@ -439,5 +439,5 @@ test-suite long-tests tasty-expected-failure, tasty-hunit >= 0.10, tasty-quickcheck, - QuickCheck >= 2.14 && <2.15, + QuickCheck >= 2.14 && <2.16, pretty-show >= 1.6.15 From bb24ef555d99ff264a48d493b12f8d4846e319ae Mon Sep 17 00:00:00 2001 From: Francesco Ariis Date: Fri, 7 Jun 2024 21:10:24 +0200 Subject: [PATCH 2/2] Bump `cabal-version` For `Cabal` and `cabal-install`. --- Cabal/Cabal.cabal | 2 +- cabal-install/cabal-install.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 829a6397c9c..e6a978234c2 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.2 +cabal-version: 3.0 name: Cabal version: 3.13.0.0 copyright: 2003-2024, Cabal Development Team (see AUTHORS file) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index ebe3339cb2f..f00041aa9e3 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,4 +1,4 @@ -Cabal-Version: 2.2 +Cabal-Version: 3.0 Name: cabal-install Version: 3.13.0.0