[commit: ghc] master: Bump Cabal submodule (653dc5f)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/653dc5f7eb85e86c959e5c7320022f935f82db1d/ghc

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

commit 653dc5f7eb85e86c959e5c7320022f935f82db1d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Aug 2 17:45:00 2018 -0400

    Bump Cabal submodule


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

653dc5f7eb85e86c959e5c7320022f935f82db1d
 libraries/Cabal                                         | 2 +-
 testsuite/tests/cabal/cabal05/cabal05.stderr            | 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, 5 insertions(+), 9 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 2a3175f..6671506 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 2a3175f886b86697194256f55c9487b7cfb4dc92
+Subproject commit 6671506b488a0fe2079f9059a23510b35514c031
diff --git a/testsuite/tests/cabal/cabal05/cabal05.stderr b/testsuite/tests/cabal/cabal05/cabal05.stderr
index 12a7334..eb51115 100644
--- a/testsuite/tests/cabal/cabal05/cabal05.stderr
+++ b/testsuite/tests/cabal/cabal05/cabal05.stderr
@@ -1,7 +1,3 @@
-the following packages have broken abi-depends fields:
-    p
-    q
-    r
 
 T.hs:3:1: error:
     Ambiguous module name ‘Conflict’:
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index 3a014a6..3d07608 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.0 && < 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