[commit: ghc] master: Update Cabal to recognize DeriveLift (73921df)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/73921df27cac0615d2272b8729381aa0f229a0c8/ghc

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

commit 73921df27cac0615d2272b8729381aa0f229a0c8
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Sep 23 13:10:42 2015 -0500

    Update Cabal to recognize DeriveLift
    
    This should (1) fix the ./validate build, which I accidentally broke in D1168,
    and (2) update the Cabal submodule so that it recognizes `DeriveLift` as a GHC
    extension.
    
    Reviewed By: adamse, austin
    
    Differential Revision: https://phabricator.haskell.org/D1269
    
    GHC Trac Issues: #1830


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

73921df27cac0615d2272b8729381aa0f229a0c8
 libraries/Cabal                              | 2 +-
 testsuite/tests/cabal/cabal07/cabal07.stderr | 1 -
 testsuite/tests/driver/T1372/T1372.stderr    | 1 -
 testsuite/tests/driver/T4437.hs              | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index ad11363..e6304ff 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit ad1136358d10d68f3d94fa2fe0f11a25331bdf17
+Subproject commit e6304ff660ca629b1b664f0848a601959e31cb31
diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr
index 049d77c..23249b6 100644
--- a/testsuite/tests/cabal/cabal07/cabal07.stderr
+++ b/testsuite/tests/cabal/cabal07/cabal07.stderr
@@ -4,4 +4,3 @@ Q.hs:3:8: error:
     It is a member of the hidden package ‘containers-0.5.6.2 at 0tT640fErehCGZtZRn6YbE’.
     Perhaps you need to add ‘containers’ to the build-depends in your .cabal file.
     Use -v to see a list of the files searched for.
-ExitFailure 1
\ No newline at end of file
diff --git a/testsuite/tests/driver/T1372/T1372.stderr b/testsuite/tests/driver/T1372/T1372.stderr
index d48426c..f1024e6 100644
--- a/testsuite/tests/driver/T1372/T1372.stderr
+++ b/testsuite/tests/driver/T1372/T1372.stderr
@@ -1,3 +1,2 @@
 
 Main.hs:5:5: error: Data constructor not in scope: T
-ExitFailure 1
\ No newline at end of file
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 9d5202e..c197cbd 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -35,8 +35,7 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRuleTransitional",
                              "StaticPointers",
                              "StrictData",
-                             "ApplicativeDo",
-                             "DeriveLift"] -- TODO add this to Cabal
+                             "ApplicativeDo"] -- TODO add this to Cabal
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",