From 2ecdf13773d0b72fee082a80e2e79638f20fc14e Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Wed, 1 Aug 2018 09:43:26 +0200
Subject: [PATCH] Update custom-setup lower bounds for GHC 8.6 (c.f. #415)
---
cabal-install/Distribution/Client/ProjectPlanning.hs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cabal-install/Distribution/Client/ProjectPlanning.hs b/cabal-install/Distribution/Client/ProjectPlanning.hs
index 0e3de7dcbe..d92a428bbc 100644
--- a/cabal-install/Distribution/Client/ProjectPlanning.hs
+++ b/cabal-install/Distribution/Client/ProjectPlanning.hs
@@ -1065,6 +1065,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
-- respective major Cabal version bundled with the respective GHC
-- release).
--
+ -- GHC 8.4 needs Cabal >= 2.4
-- GHC 8.4 needs Cabal >= 2.2
-- GHC 8.2 needs Cabal >= 2.0
-- GHC 8.0 needs Cabal >= 1.24
@@ -1076,11 +1077,12 @@ 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 [8,4,1] = mkVersion [2,2]
- -- GHC 8.4.1-rc1 (GHC 8.4.0.20180224) still shipped with an
- -- devel snapshot of Cabal-2.1.0.0; the rule below can be
+ | isGHC, compVer >= mkVersion [8,6,1] = mkVersion [2,4]
+ -- GHC 8.6alpha2 (GHC 8.6.0.20180714) still shipped with a
+ -- devel snapshot of Cabal-2.3.0.0; the rule below can be
-- dropped at some point
- | isGHC, compVer >= mkVersion [8,4] = mkVersion [2,1]
+ | isGHC, compVer >= mkVersion [8,6] = mkVersion [2,3]
+ | isGHC, compVer >= mkVersion [8,4] = mkVersion [2,2]
| isGHC, compVer >= mkVersion [8,2] = mkVersion [2,0]
| isGHC, compVer >= mkVersion [8,0] = mkVersion [1,24]
| isGHC, compVer >= mkVersion [7,10] = mkVersion [1,22]
--
GitLab