[commit: ghc] ghc-8.0: Bump Cabal and Haddock to fix #11308 (ff1ce4c)

git at git.haskell.org git at git.haskell.org
Fri Jan 8 11:24:45 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff1ce4c3f0728dc23e7949bd066ca80b3ab2914a/ghc

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

commit ff1ce4c3f0728dc23e7949bd066ca80b3ab2914a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 6 14:42:22 2016 +0100

    Bump Cabal and Haddock to fix #11308
    
    Bump Cabal and Haddock submodules such that they both support GCC-style
    response files on Windows.


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

ff1ce4c3f0728dc23e7949bd066ca80b3ab2914a
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 8 +-------
 utils/haddock                   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index bf4d05e..a8a121e 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit bf4d05efa79a41a819e3d9278d5e9e1e5a055ce7
+Subproject commit a8a121ea4d78783dd303dd2992d8e73ef337e7ed
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 4120e91..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,13 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "OverloadedLabels",
-                             "UndecidableSuperClasses",
-                             "TemplateHaskellQuotes",
-                             "MonadFailDesugaring",
-                             "TypeInType",
-                             "TypeApplications"]
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",
diff --git a/utils/haddock b/utils/haddock
index 80f2f98..13e1eaf 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 80f2f9805b61e8cea291bae8ce22db626dc11f21
+Subproject commit 13e1eaf3ca897ffcf1b37d96e2867bc80d4ca64a



More information about the ghc-commits mailing list