Bump Cabal submodule to 3.1
authorSebastian Graf <sgraf1337@gmail.com>
Mon, 9 Sep 2019 13:55:48 +0000 (13:55 +0000)
committerMarge Bot <ben+marge-bot@smart-cactus.org>
Thu, 12 Sep 2019 18:05:29 +0000 (14:05 -0400)
-------------------------
Metric Increase:
    haddock.Cabal
    T4029
-------------------------

hadrian/hadrian.cabal
libraries/Cabal
utils/check-api-annotations/check-api-annotations.cabal
utils/check-ppr/check-ppr.cabal
utils/ghc-cabal/ghc-cabal.cabal
utils/ghc-pkg/Main.hs

index 99ecbe8..6037a21 100644 (file)
@@ -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
index 5446430..63331c9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 54464304b707c57b233eb910210b79a9ba5154b3
+Subproject commit 63331c95ed15cc7e3d83850d308dc3a86a8c3c76
index 12d0884..b02ad92 100644 (file)
@@ -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
index 2438724..3636b73 100644 (file)
@@ -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
index 3176e5d..f4fefb5 100644 (file)
@@ -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
-
index bace735..3f6c5be 100644 (file)
@@ -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