diff options
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | testsuite/tests/driver/T4437.hs | 2 | ||||
| -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, 6 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 7ce486e6553d24877ae3b23868b95d20bf83760 +Subproject c219cd3f31c8e4e4bc71f93bbcd4de87830a986 diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 9f892c99a5..5ae423086a 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -40,8 +40,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout", "AlternativeLayoutRule", "AlternativeLayoutRuleTransitional", "EmptyDataDeriving", - "NumericUnderscores", - "BlockArguments", "GeneralisedNewtypeDeriving"] expectedCabalOnlyExtensions :: [String] diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal index 3cdb378294..3a014a62d9 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.2 && < 2.3, + Cabal >= 2.3 && < 2.4, directory, ghc diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal index d7429c82df..e0d8b9db4b 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.2 && < 2.3, + Cabal >= 2.3 && < 2.4, directory, filepath, ghc diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 4b19116a4e..cc0d98dbf3 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.2 && < 2.3, + Cabal >= 2.3 && < 2.4, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal index c798a9336b..391eb7ab36 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.2 && <2.3, + Cabal >= 2.3 && <2.4, ghc |