From 1baed4acffa9dc7e8f038eb5a76a3e62c8bf1816 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Thu, 12 Oct 2023 21:25:59 -0400 Subject: [PATCH] GHC 9.8 compat: bump base, update Unknown GHC And bump Cabal's "supported version" of GHC --- Cabal/src/Distribution/Simple/GHC.hs | 6 +++--- cabal-dev-scripts/cabal-dev-scripts.cabal | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cabal/src/Distribution/Simple/GHC.hs b/Cabal/src/Distribution/Simple/GHC.hs index 92378380325..65aa733684f 100644 --- a/Cabal/src/Distribution/Simple/GHC.hs +++ b/Cabal/src/Distribution/Simple/GHC.hs @@ -161,14 +161,14 @@ configure verbosity hcPath hcPkgPath conf0 = do (userMaybeSpecifyPath "ghc" hcPath conf0) let implInfo = ghcVersionImplInfo ghcVersion - -- Cabal currently supports ghc >= 7.0.1 && < 9.8 + -- Cabal currently supports ghc >= 7.0.1 && < 9.10 -- ... and the following odd development version - unless (ghcVersion < mkVersion [9, 8]) $ + unless (ghcVersion < mkVersion [9, 10]) $ warn verbosity $ "Unknown/unsupported 'ghc' version detected " ++ "(Cabal " ++ prettyShow cabalVersion - ++ " supports 'ghc' version < 9.8): " + ++ " supports 'ghc' version < 9.10): " ++ programPath ghcProg ++ " is version " ++ prettyShow ghcVersion diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 24e160eaa92..345d052d62e 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -18,7 +18,7 @@ executable gen-spdx ghc-options: -Wall build-depends: , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0 - , base >=4.10 && <4.19 + , base >=4.10 && <4.20 , bytestring , containers , Diff ^>=0.4 @@ -35,7 +35,7 @@ executable gen-spdx-exc ghc-options: -Wall build-depends: , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0 - , base >=4.10 && <4.19 + , base >=4.10 && <4.20 , bytestring , containers , Diff ^>=0.4