diff options
| author | Sebastian Graf <sgraf1337@gmail.com> | 2019-09-09 13:55:48 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-12 14:05:29 -0400 |
| commit | 2b37a79d61e9b3787873dc9f7458ef2bde4809b0 (patch) | |
| tree | 6cc8b15464362f4aa95ba4b14481cb6945fe83ca | |
| parent | 09fa56540aca53c32b6f008a3af2d61c70e1b47d (diff) | |
| download | haskell-2b37a79d61e9b3787873dc9f7458ef2bde4809b0.tar.gz | |
Bump Cabal submodule to 3.1
-------------------------
Metric Increase:
haddock.Cabal
T4029
-------------------------
| -rw-r--r-- | hadrian/hadrian.cabal | 2 | ||||
| m--------- | libraries/Cabal | 0 | ||||
| -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 | 3 | ||||
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal index 99ecbe8421..6037a21849 100644 --- a/hadrian/hadrian.cabal +++ b/hadrian/hadrian.cabal @@ -121,7 +121,7 @@ executable hadrian other-extensions: MultiParamTypeClasses , TypeFamilies build-depends: base >= 4.8 && < 5 - , Cabal >= 3.0 && < 3.1 + , Cabal >= 3.0 && < 3.2 , containers >= 0.5 && < 0.7 , directory >= 1.3.1.0 && < 1.4 , extra >= 1.4.7 diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 54464304b707c57b233eb910210b79a9ba5154b +Subproject 63331c95ed15cc7e3d83850d308dc3a86a8c3c7 diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal index 12d088437b..b02ad9284d 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 >= 3.0 && < 3.1, + Cabal >= 3.0 && < 3.2, directory, ghc diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal index 2438724636..3636b73ed6 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 >= 3.0 && < 3.1, + Cabal >= 3.0 && < 3.2, directory, filepath, ghc diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 3176e5d3ab..f4fefb5ab2 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -21,7 +21,6 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, - Cabal >= 3.0 && < 3.1, + Cabal >= 3.0 && < 3.2, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 - diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index bace7356cd..3f6c5bea3f 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1186,7 +1186,7 @@ parsePackageInfo str = where ws = [ msg | msg <- warnings , not ("Unrecognized field pkgroot" `isPrefixOf` msg) ] - Left err -> die (unlines err) + Left err -> die (unlines (F.toList err)) mungePackageInfo :: InstalledPackageInfo -> InstalledPackageInfo mungePackageInfo ipi = ipi |