[commit: ghc] master: Update Cabal submodule (3431ad6)

git at git.haskell.org git at git.haskell.org
Sun Nov 1 13:06:08 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3431ad6faeb2b74e10c8ac4d42bdbc4521e07e33/ghc

>---------------------------------------------------------------

commit 3431ad6faeb2b74e10c8ac4d42bdbc4521e07e33
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 14:03:44 2015 +0100

    Update Cabal submodule
    
    This allows us to remove 4 newly added language pragmas from the T4437
    test-case as they were recently added to Cabal 1.23


>---------------------------------------------------------------

3431ad6faeb2b74e10c8ac4d42bdbc4521e07e33
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index b083151..fada4c8 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit b083151f2a01ad7245f21502fd20f21189ab7665
+Subproject commit fada4c87bf76254b85703671fbb1f05bb73f0869
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 48ad93c..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,11 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "DuplicateRecordFields",
-                             "StaticPointers",
-                             "StrictData",
-                             "ApplicativeDo"] -- TODO add this to Cabal
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",



More information about the ghc-commits mailing list