Skip to content

Support GHC 9.8 in cabal 3.10.2.0 #9225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Support GHC 9.8 in cabal 3.10.2.0 #9225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f34bb5
Support GHC 9.8
Kleidukos Sep 1, 2023
d896730
Update cabal-install/src/Distribution/Client/ProjectPlanning.hs
Kleidukos Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cabal/src/Distribution/Simple/GHC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ 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): "
++ "(Cabal " ++ prettyShow cabalVersion ++ " supports 'ghc' version < 9.10): "
++ programPath ghcProg ++ " is version " ++ prettyShow ghcVersion

-- This is slightly tricky, we have to configure ghc first, then we use the
Expand Down
1 change: 1 addition & 0 deletions cabal-install/src/Distribution/Client/ProjectPlanning.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
-- TODO: long-term, this compatibility matrix should be
-- stored as a field inside 'Distribution.Compiler.Compiler'
setupMinCabalVersionConstraint
| isGHC, compVer >= mkVersion [9,8] = mkVersion [3,10,2]
| isGHC, compVer >= mkVersion [9,6] = mkVersion [3,10]
| isGHC, compVer >= mkVersion [9,4] = mkVersion [3,8]
| isGHC, compVer >= mkVersion [9,2] = mkVersion [3,6]
Expand Down