From 9c802e93a1e7eecc818f5f78250109f83acad9be Mon Sep 17 00:00:00 2001 From: Zubin Duggal <zubin.duggal@gmail.com> Date: Fri, 11 Oct 2024 16:34:24 +0530 Subject: [PATCH] Bump base bound to 4.21 for GHC 9.12 (cherry picked from commit a8d1a5a40d6df2f935c2e02c15590836aed763f3) --- .../buildinfo-reference-generator.cabal | 2 +- cabal-install-solver/cabal-install-solver.cabal | 4 ++-- cabal-install/cabal-install.cabal | 2 +- cabal-testsuite/cabal-testsuite.cabal | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildinfo-reference-generator/buildinfo-reference-generator.cabal b/buildinfo-reference-generator/buildinfo-reference-generator.cabal index 47068ee33b..a09fc4dc62 100644 --- a/buildinfo-reference-generator/buildinfo-reference-generator.cabal +++ b/buildinfo-reference-generator/buildinfo-reference-generator.cabal @@ -8,7 +8,7 @@ executable buildinfo-reference-generator ghc-options: -Wall main-is: Main.hs build-depends: - , base >=4.11 && <4.21 + , base >=4.11 && <4.22 , Cabal , Cabal-described , containers diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 8a71e7c788..cf8d2fdedb 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.13 && <4.21 + , base >=4.13 && <4.22 , bytestring >=0.10.6.0 && <0.13 , Cabal ^>=3.14 , Cabal-syntax ^>=3.14 @@ -131,7 +131,7 @@ Test-Suite unit-tests UnitTests.Distribution.Solver.Modular.MessageUtils build-depends: - , base >= 4.13 && <4.21 + , base >= 4.13 && <4.22 , 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 300a8d8d8a..4efd0d8f24 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.13 && <4.21 + build-depends: base >=4.13 && <4.22 common cabal-dep build-depends: Cabal ^>=3.14 diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index 8cbd1e7657..731cd37482 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -26,7 +26,7 @@ common shared default-language: Haskell2010 build-depends: - , base >= 4.11 && < 4.21 + , base >= 4.11 && < 4.22 -- this needs to match the in-tree lib:Cabal version , Cabal ^>= 3.14.0.0 -- GitLab