diff options
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout | 10 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal03/cabal03.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/driver/recomp007/recomp007.stdout | 3 | ||||
| -rw-r--r-- | testsuite/tests/th/T10796b.stderr | 6 | ||||
| -rw-r--r-- | utils/check-api-annotations/check-api-annotations.cabal | 2 | ||||
| -rw-r--r-- | utils/check-ppr/check-ppr.cabal | 3 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 | ||||
| -rw-r--r-- | utils/ghctags/ghctags.cabal | 2 |
10 files changed, 18 insertions, 16 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 824d0bae1aee2a25cabdcef92e5e1dd470c7dac +Subproject e8aa54220a4bbe3fe6d14542f3a94222228efb2 diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index 2d219b0b68..2f17fdffcd 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 81b3e4b10b..42821bac89 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 6230acfb02..d8343152e0 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 1dd5110bbf..eff1f75f7c 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 da68dba985..880f4d6603 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 96863e58fa..584558b3ff 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 d65ffba0e6..2c20432b5f 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 4f896aab9c..b8f03a9da2 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 b871f8cc11..1bb658882c 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 |