From f7b4dcbd7d76101e7e6eee728bde2b5a5c873c02 Mon Sep 17 00:00:00 2001 From: Douglas Wilson Date: Wed, 27 Jul 2022 18:18:08 +0100 Subject: Update submodule Cabal to tag Cabal-v3.8.1.0 closes #21931 --- compiler/ghc.cabal.in | 2 +- libraries/Cabal | 2 +- libraries/ghc-boot/ghc-boot.cabal.in | 2 +- libraries/ghc-prim/ghc-prim.cabal | 2 +- testsuite/tests/driver/T4437.hs | 6 +----- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 48a5fa11ed..0169c7ae9a 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -39,7 +39,7 @@ extra-source-files: custom-setup - setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.8, directory, process, filepath + setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.9, directory, process, filepath Flag internal-interpreter Description: Build with internal interpreter support. diff --git a/libraries/Cabal b/libraries/Cabal index 18d801832a..5d18b76335 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit 18d801832a3ad5f346eeaaf3f8f3df1abd5a6b9d +Subproject commit 5d18b763356dca719f5286a52328cb41b9fa4192 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 531d445b57..59ed7ae317 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -28,7 +28,7 @@ build-type: Custom extra-source-files: changelog.md custom-setup - setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.8, directory, filepath + setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.9, directory, filepath source-repository head type: git diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index e2918ccaf2..678ee8801b 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, process, filepath, directory, Cabal >= 1.23 && < 3.8 + setup-depends: base >= 4 && < 5, process, filepath, directory, Cabal >= 1.23 && < 3.9 Library default-language: Haskell2010 diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index a841a73218..c25c3b7f1c 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -37,11 +37,7 @@ check title expected got -- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs. expectedGhcOnlyExtensions :: [String] expectedGhcOnlyExtensions = - [ "RelaxedLayout" - , "AlternativeLayoutRule" - , "AlternativeLayoutRuleTransitional" - , "OverloadedRecordUpdate" - , "DeepSubsumption" + [ "DeepSubsumption" ] expectedCabalOnlyExtensions :: [String] -- cgit v1.2.1