[commit: ghc] ghc-8.6: Bump Cabal submodule to 2.4 (ff086cc)
git at git.haskell.org
git at git.haskell.org
Thu Aug 2 00:36:45 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.6
Link : http://ghc.haskell.org/trac/ghc/changeset/ff086cc10da176ca16a349969f0b8a049cc691ef/ghc
>---------------------------------------------------------------
commit ff086cc10da176ca16a349969f0b8a049cc691ef
Author: Ben Gamari <ben at smart-cactus.org>
Date: Wed Aug 1 19:42:53 2018 -0400
Bump Cabal submodule to 2.4
>---------------------------------------------------------------
ff086cc10da176ca16a349969f0b8a049cc691ef
libraries/Cabal | 2 +-
testsuite/tests/driver/T4437.hs | 4 +---
utils/check-api-annotations/check-api-annotations.cabal | 2 +-
utils/check-ppr/check-ppr.cabal | 2 +-
utils/ghc-cabal/ghc-cabal.cabal | 2 +-
utils/ghctags/ghctags.cabal | 2 +-
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/libraries/Cabal b/libraries/Cabal
index 8fbacca..8828258 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 8fbacca029f3ad764576aefb610a0408c4b6aaad
+Subproject commit 8828258813f726150cd748433a8ad0df3310c6bc
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index a75990e..2818851 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -41,9 +41,7 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRuleTransitional",
"DerivingVia",
"EmptyDataDeriving",
- "GeneralisedNewtypeDeriving",
- "StarIsType", -- FIXME: add StarIsType to cabal
- "QuantifiedConstraints"]
+ "GeneralisedNewtypeDeriving"]
expectedCabalOnlyExtensions :: [String]
expectedCabalOnlyExtensions = ["Generics",
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index 3a014a6..5007625 100644
--- a/utils/check-api-annotations/check-api-annotations.cabal
+++ b/utils/check-api-annotations/check-api-annotations.cabal
@@ -24,6 +24,6 @@ Executable check-api-annotations
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 2.3 && < 2.4,
+ Cabal >= 2.4 && < 2.5,
directory,
ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index e0d8b9d..2da21d7 100644
--- a/utils/check-ppr/check-ppr.cabal
+++ b/utils/check-ppr/check-ppr.cabal
@@ -25,7 +25,7 @@ Executable check-ppr
Build-Depends: base >= 4 && < 5,
bytestring,
containers,
- Cabal >= 2.3 && < 2.4,
+ Cabal >= 2.4 && < 2.5,
directory,
filepath,
ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index cc0d98d..baa7a17 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -21,7 +21,7 @@ Executable ghc-cabal
Build-Depends: base >= 3 && < 5,
bytestring >= 0.10 && < 0.11,
- Cabal >= 2.3 && < 2.4,
+ Cabal >= 2.4 && < 2.5,
directory >= 1.1 && < 1.4,
filepath >= 1.2 && < 1.5
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index 391eb7a..f74bc4f 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 2.3 && <2.4,
+ Cabal >= 2.4 && <2.5,
ghc
More information about the ghc-commits
mailing list