diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-08-02 17:45:00 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-08-03 16:22:42 -0400 |
| commit | 653dc5f7eb85e86c959e5c7320022f935f82db1d (patch) | |
| tree | 9a10d228613af94f93905cc9b9ae84ab402220a6 | |
| parent | c955a514f033a12f6d0ab0fbacec3e18a5757ab5 (diff) | |
| download | haskell-653dc5f7eb85e86c959e5c7320022f935f82db1d.tar.gz | |
Bump Cabal submodule
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/cabal05.stderr | 4 | ||||
| -rw-r--r-- | utils/check-api-annotations/check-api-annotations.cabal | 2 | ||||
| -rw-r--r-- | utils/check-ppr/check-ppr.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghctags/ghctags.cabal | 2 |
6 files changed, 4 insertions, 8 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 2a3175f886b86697194256f55c9487b7cfb4dc9 +Subproject 6671506b488a0fe2079f9059a23510b35514c03 diff --git a/testsuite/tests/cabal/cabal05/cabal05.stderr b/testsuite/tests/cabal/cabal05/cabal05.stderr index 12a73340bf..eb51115ab0 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 3a014a62d9..3d07608577 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 e0d8b9db4b..2da21d766b 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 cc0d98dbf3..baa7a1702a 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 391eb7ab36..f74bc4ff4a 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 |