Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Patch lifted-base for ghc 7.5

  • Loading branch information...
commit 1969e5f958eb941cb393893b94ea41dbb5671c12 1 parent d630a84
@markwright markwright authored
View
42 dev-haskell/lifted-base/files/lifted-base-0.1.1-ghc-7.5.patch
@@ -0,0 +1,42 @@
+--- lifted-base-0.1.1-orig/test/test.hs 2012-04-28 23:47:19.000000000 +1000
++++ lifted-base-0.1.1/test/test.hs 2012-06-29 01:56:15.155311373 +1000
+@@ -1,7 +1,9 @@
+-{-# LANGUAGE DeriveDataTypeable, FlexibleContexts #-}
++{-# LANGUAGE CPP, DeriveDataTypeable, FlexibleContexts, ScopedTypeVariables #-}
+
+ -- from base:
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding (catch)
++#endif
+ import Data.IORef
+ import Data.Maybe
+ import Data.Typeable (Typeable)
+--- lifted-base-0.1.1-orig/lifted-base.cabal 2012-04-28 23:47:19.000000000 +1000
++++ lifted-base-0.1.1/lifted-base.cabal 2012-06-29 01:33:29.498444028 +1000
+@@ -43,7 +43,7 @@
+ Control.Concurrent.Lifted
+ System.Timeout.Lifted
+
+- Build-depends: base >= 3 && < 4.6
++ Build-depends: base >= 3 && < 4.7
+ , base-unicode-symbols >= 0.1.1 && < 0.3
+ , transformers-base >= 0.4 && < 0.5
+ , monad-control >= 0.3 && < 0.4
+@@ -61,7 +61,7 @@
+ hs-source-dirs: test
+
+ build-depends: lifted-base
+- , base >= 3 && < 4.6
++ , base >= 3 && < 4.7
+ , transformers >= 0.2 && < 0.4
+ , transformers-base >= 0.4 && < 0.5
+ , monad-control >= 0.3 && < 0.4
+@@ -84,7 +84,7 @@
+ ghc-options: -O2
+
+ build-depends: lifted-base
+- , base >= 3 && < 4.6
++ , base >= 3 && < 4.7
+ , transformers >= 0.2 && < 0.4
+ , criterion >= 0.5 && < 0.7
+ , monad-control >= 0.3 && < 0.4
View
12 dev-haskell/lifted-base/files/lifted-base-0.1.1-test-ghc-6.12.patch
@@ -1,12 +1,6 @@
---- lifted-base-0.1.1-orig/test/test.hs 2012-04-28 23:47:19.000000000 +1000
-+++ lifted-base-0.1.1/test/test.hs 2012-05-04 11:21:19.840997008 +1000
-@@ -1,4 +1,4 @@
--{-# LANGUAGE DeriveDataTypeable, FlexibleContexts #-}
-+{-# LANGUAGE DeriveDataTypeable, FlexibleContexts, CPP #-}
-
- -- from base:
- import Prelude hiding (catch)
-@@ -38,7 +38,9 @@
+--- lifted-base-0.1.1-orig/test/test.hs 2012-06-29 01:56:15.155311373 +1000
++++ lifted-base-0.1.1/test/test.hs 2012-06-29 01:55:02.172606627 +1000
+@@ -40,7 +40,9 @@
main :: IO ()
main = defaultMain
[ testSuite "IdentityT" runIdentityT
View
3  dev-haskell/lifted-base/lifted-base-0.1.1.ebuild
@@ -35,4 +35,5 @@ DEPEND="${RDEPEND}
)
>=dev-haskell/cabal-1.9.2"
-PATCHES=("${FILESDIR}/${PN}-0.1.1-test-ghc-6.12.patch")
+PATCHES=("${FILESDIR}/${PN}-0.1.1-ghc-7.5.patch"
+ "${FILESDIR}/${PN}-0.1.1-test-ghc-6.12.patch")
Please sign in to comment.
Something went wrong with that request. Please try again.