diff --git a/buildinfo-reference-generator/buildinfo-reference-generator.cabal b/buildinfo-reference-generator/buildinfo-reference-generator.cabal index 667e8346b635ca267b5d59c8ccb3fb2f5a1b4b27..47068ee33b1aaeb3d973e8c1fc9219cc0f236854 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.20 + , base >=4.11 && <4.21 , Cabal , Cabal-described , containers diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index bc890efb7e30b09ca9fdf66d09f6ccaa53c76ec9..92becccd8dc3d47784f3800e7186d54ecb6956a3 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.20 + , base >= 4.11 && < 4.21 -- this needs to match the in-tree lib:Cabal version , Cabal ^>= 3.13.0.0 diff --git a/project-cabal/ghc-latest.config b/project-cabal/ghc-latest.config index 5f8d40290dbd927f23b0a75b1b2e181ad7aa07a5..e4608ea26ab7b29c7aaf609889b0526dcb32b77e 100644 --- a/project-cabal/ghc-latest.config +++ b/project-cabal/ghc-latest.config @@ -6,9 +6,11 @@ -- - cabal.validate.project (Cabal CI), -- Commented out below are the usual suspects. Feel free to add more. --- NOTE: don't forget to update the compiler version in the conditional +-- NOTE: don't forget to update the compiler version in the conditionals -- when upgrading to a newer GHC if impl(ghc >= 9.10.0) + allow-newer: rere:base +if impl(ghc >= 9.12.0) allow-newer: --windns:*, rere:*, tree-diff:*, uuid-types:*, these:*, hashable:*, assoc:*, semialign:*, indexed-traversable-instances:*, indexed-traversable:*, OneTuple:*, scientific:*, time-compat:*, text-short:*, integer-conversion:*, generically:*, data-fix:*, binary:* -- Artem, 2024-04-21: I started and then gave up...