diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-09-13 20:20:50 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-18 22:27:20 -0500 |
| commit | a8b4961b51693531019fb53644f6521a2f707f7d (patch) | |
| tree | d1ac2c8e8e05cf7029729737951b9aeb53681c3e | |
| parent | 78d4bca01c1efe481c6ce2356497593d3058fb95 (diff) | |
| download | haskell-a8b4961b51693531019fb53644f6521a2f707f7d.tar.gz | |
Bump Cabal submodule
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | libraries/ghc-prim/ghc-prim.cabal | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/T4437.hs | 3 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 3ef63c2982af1e06c0403d3a25c67ee1814394c +Subproject 6424beef3c40ae58318f348ec5c265db26ac42b diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index e207b3f24c..1a0abfe262 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -20,7 +20,7 @@ source-repository head subdir: libraries/ghc-prim custom-setup - setup-depends: base >= 4 && < 5, Cabal >= 1.23 + setup-depends: base >= 4 && < 5, Cabal >= 1.23 && < 3.8 Library default-language: Haskell2010 diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index d55dae5484..6b75ee2997 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -40,10 +40,7 @@ expectedGhcOnlyExtensions = [ "RelaxedLayout" , "AlternativeLayoutRule" , "AlternativeLayoutRuleTransitional" - , "FieldSelectors" - , "OverloadedRecordDot" , "OverloadedRecordUpdate" - , "UnliftedDatatypes" ] expectedCabalOnlyExtensions :: [String] diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 4ad88ead3c..bdf638ee47 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -21,6 +21,6 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.12, - Cabal >= 3.2 && < 3.6, + Cabal >= 3.2 && < 3.8, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 |