diff options
| author | RyanGlScott <ryan.gl.scott@gmail.com> | 2015-09-23 13:10:42 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-09-23 13:11:37 -0500 |
| commit | 73921df27cac0615d2272b8729381aa0f229a0c8 (patch) | |
| tree | b8fdcab8412ee80131400add79ab870de6468541 | |
| parent | cf90a1e14efb900f94a3824b242be1c38b16a563 (diff) | |
| download | haskell-73921df27cac0615d2272b8729381aa0f229a0c8.tar.gz | |
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
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal07/cabal07.stderr | 1 | ||||
| -rw-r--r-- | testsuite/tests/driver/T1372/T1372.stderr | 1 | ||||
| -rw-r--r-- | testsuite/tests/driver/T4437.hs | 3 |
4 files changed, 1 insertions, 4 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject ad1136358d10d68f3d94fa2fe0f11a25331bdf1 +Subproject e6304ff660ca629b1b664f0848a601959e31cb3 diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr index 049d77c9bf..23249b68ff 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@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 d48426cc9d..f1024e665e 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 9d5202e357..c197cbd5dc 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", |