[commit: ghc] master: Bump Cabal submodule (02b3dad)

git at git.haskell.org git at git.haskell.org
Mon Mar 12 17:02:19 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/02b3dad195488c9b0f7457e46319cb3f485570ca/ghc

>---------------------------------------------------------------

commit 02b3dad195488c9b0f7457e46319cb3f485570ca
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Mar 10 13:47:51 2018 -0500

    Bump Cabal submodule


>---------------------------------------------------------------

02b3dad195488c9b0f7457e46319cb3f485570ca
 libraries/Cabal                                         | 2 +-
 testsuite/tests/driver/T4437.hs                         | 2 --
 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, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 7ce486e..c219cd3 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 7ce486e6553d24877ae3b23868b95d20bf83760a
+Subproject commit c219cd3f31c8e4e4bc71f93bbcd4de87830a986d
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 9f892c9..5ae4230 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -40,8 +40,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
                              "AlternativeLayoutRuleTransitional",
                              "EmptyDataDeriving",
-                             "NumericUnderscores",
-                             "BlockArguments",
                              "GeneralisedNewtypeDeriving"]
 
 expectedCabalOnlyExtensions :: [String]
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index 3cdb378..3a014a6 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.2 && < 2.3,
+                   Cabal      >= 2.3 && < 2.4,
                    directory,
                    ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index d7429c8..e0d8b9d 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.2 && < 2.3,
+                   Cabal      >= 2.3 && < 2.4,
                    directory,
                    filepath,
                    ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 4b19116..cc0d98d 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.2 && < 2.3,
+                   Cabal      >= 2.3 && < 2.4,
                    directory  >= 1.1 && < 1.4,
                    filepath   >= 1.2 && < 1.5
 
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index c798a93..391eb7a 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.2 && <2.3,
+                   Cabal      >= 2.3 && <2.4,
                    ghc
 



More information about the ghc-commits mailing list