[commit: ghc] master: Bump Cabal submodule (087dbbe)
git at git.haskell.org
git at git.haskell.org
Mon Feb 20 18:42:06 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/087dbbedc4caaf96cd92d88f3c334fbf912658c3/ghc
>---------------------------------------------------------------
commit 087dbbedc4caaf96cd92d88f3c334fbf912658c3
Author: Ben Gamari <ben at smart-cactus.org>
Date: Mon Feb 20 11:11:03 2017 -0500
Bump Cabal submodule
We are now tracking the 2.0 branch.
>---------------------------------------------------------------
087dbbedc4caaf96cd92d88f3c334fbf912658c3
libraries/Cabal | 2 +-
testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout | 10 ++++++----
testsuite/tests/cabal/cabal03/cabal03.stderr | 4 ++--
testsuite/tests/driver/recomp007/recomp007.stdout | 3 ++-
testsuite/tests/th/T10796b.stderr | 6 +++---
utils/check-api-annotations/check-api-annotations.cabal | 2 +-
utils/check-ppr/check-ppr.cabal | 3 +--
utils/ghc-cabal/ghc-cabal.cabal | 2 +-
utils/ghc-cabal/ghc.mk | 2 +-
utils/ghctags/ghctags.cabal | 2 +-
10 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/libraries/Cabal b/libraries/Cabal
index 824d0ba..e8aa542 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 824d0bae1aee2a25cabdcef92e5e1dd470c7dac0
+Subproject commit e8aa54220a4bbe3fe6d14542f3a94222228efb2f
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
index 2d219b0..2f17fdf 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
+++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
@@ -1,4 +1,6 @@
-Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-p' for
-bkpcabal01-0.1.0.0...
-Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-q' for
-bkpcabal01-0.1.0.0...
+Preprocessing library 'p' for bkpcabal01-0.1.0.0..
+Building library 'p' instantiated with H = <H>
+for bkpcabal01-0.1.0.0..
+Preprocessing library 'q' for bkpcabal01-0.1.0.0..
+Building library 'q' instantiated with H = <H>
+for bkpcabal01-0.1.0.0..
diff --git a/testsuite/tests/cabal/cabal03/cabal03.stderr b/testsuite/tests/cabal/cabal03/cabal03.stderr
index 81b3e4b..42821ba 100644
--- a/testsuite/tests/cabal/cabal03/cabal03.stderr
+++ b/testsuite/tests/cabal/cabal03/cabal03.stderr
@@ -1,3 +1,3 @@
-Setup: The following packages are broken because other packages they depend on
-are missing. These broken packages must be rebuilt before they can be used.
+Error:
+ The following packages are broken because other packages they depend on are missing. These broken packages must be rebuilt before they can be used.
installed package q-1.0 is broken due to missing package p-noopt
diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout
index 6230acf..d834315 100644
--- a/testsuite/tests/driver/recomp007/recomp007.stdout
+++ b/testsuite/tests/driver/recomp007/recomp007.stdout
@@ -1,4 +1,5 @@
-Preprocessing executable 'test' for b-1.0...
+Preprocessing executable 'test' for b-1.0..
+Building executable 'test' for b-1.0..
[1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A changed]
[2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) [B changed]
Linking dist/build/test/test ...
diff --git a/testsuite/tests/th/T10796b.stderr b/testsuite/tests/th/T10796b.stderr
index 1dd5110..eff1f75 100644
--- a/testsuite/tests/th/T10796b.stderr
+++ b/testsuite/tests/th/T10796b.stderr
@@ -1,5 +1,5 @@
T10796b.hs:8:17: error:
- Can't construct a pattern from name Data.Set.Base.fromList
- In the untyped splice:
- $(dataToPatQ (const Nothing) (fromList "test"))
+ • Can't construct a pattern from name Data.Set.Base.fromList
+ • In the untyped splice:
+ $(dataToPatQ (const Nothing) (fromList "test"))
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index da68dba..880f4d6 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 >= 1.25 && <1.27,
+ Cabal >= 2.0 && < 2.1,
directory,
ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index 96863e5..584558b 100644
--- a/utils/check-ppr/check-ppr.cabal
+++ b/utils/check-ppr/check-ppr.cabal
@@ -25,8 +25,7 @@ Executable check-ppr
Build-Depends: base >= 4 && < 5,
bytestring,
containers,
- -- Cabal >= 1.25 && <1.27,
- Cabal >= 1.24 && <1.27,
+ Cabal >= 2.0 && < 2.1,
directory,
filepath,
ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index d65ffba..2c20432 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 >= 1.25 && < 1.27,
+ Cabal >= 2.0 && < 2.1,
directory >= 1.1 && < 1.4,
filepath >= 1.2 && < 1.5
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index 4f896aa..b8f03a9 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -54,7 +54,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b
-no-user-$(GHC_PACKAGE_DB_FLAG) \
-Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
-DCABAL_VERSION=$(CABAL_VERSION) \
- -DMIN_VERSION_binary_0_8_0 \
+ -DHAVE_containers_050 \
-DBOOTSTRAPPING \
-optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \
-odir bootstrapping \
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index b871f8c..1bb6588 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 1.25 && <1.27,
+ Cabal >= 2.0 && <2.1,
ghc
More information about the ghc-commits
mailing list