Skip to content

Commit 2ecdf13

Browse files
committed
Update custom-setup lower bounds for GHC 8.6 (c.f. #415)
1 parent 05a726f commit 2ecdf13

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

cabal-install/Distribution/Client/ProjectPlanning.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
10651065
-- respective major Cabal version bundled with the respective GHC
10661066
-- release).
10671067
--
1068+
-- GHC 8.4 needs Cabal >= 2.4
10681069
-- GHC 8.4 needs Cabal >= 2.2
10691070
-- GHC 8.2 needs Cabal >= 2.0
10701071
-- GHC 8.0 needs Cabal >= 1.24
@@ -1076,11 +1077,12 @@ planPackages verbosity comp platform solver SolverSettings{..}
10761077
-- TODO: long-term, this compatibility matrix should be
10771078
-- stored as a field inside 'Distribution.Compiler.Compiler'
10781079
setupMinCabalVersionConstraint
1079-
| isGHC, compVer >= mkVersion [8,4,1] = mkVersion [2,2]
1080-
-- GHC 8.4.1-rc1 (GHC 8.4.0.20180224) still shipped with an
1081-
-- devel snapshot of Cabal-2.1.0.0; the rule below can be
1080+
| isGHC, compVer >= mkVersion [8,6,1] = mkVersion [2,4]
1081+
-- GHC 8.6alpha2 (GHC 8.6.0.20180714) still shipped with a
1082+
-- devel snapshot of Cabal-2.3.0.0; the rule below can be
10821083
-- dropped at some point
1083-
| isGHC, compVer >= mkVersion [8,4] = mkVersion [2,1]
1084+
| isGHC, compVer >= mkVersion [8,6] = mkVersion [2,3]
1085+
| isGHC, compVer >= mkVersion [8,4] = mkVersion [2,2]
10841086
| isGHC, compVer >= mkVersion [8,2] = mkVersion [2,0]
10851087
| isGHC, compVer >= mkVersion [8,0] = mkVersion [1,24]
10861088
| isGHC, compVer >= mkVersion [7,10] = mkVersion [1,22]

0 commit comments

Comments
 (0)