Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d9897d1fd46a75c43e9c33bbee2d06fa636e53d9 >--------------------------------------------------------------- commit d9897d1fd46a75c43e9c33bbee2d06fa636e53d9 Author: Judah Jacobson <[email protected]> Date: Tue Jun 19 22:52:42 2012 +0000 Bump dependencies to base-4.6. Also remove "import Prelude hiding (catch)" for ghc>=7.5, since Prelude.catch will be removed from base>=4.6. >--------------------------------------------------------------- System/Console/Haskeline/MonadException.hs | 2 ++ System/Console/Haskeline/Monads.hs | 2 ++ haskeline.cabal | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/System/Console/Haskeline/MonadException.hs b/System/Console/Haskeline/MonadException.hs index 6514d09..6f1afa7 100644 --- a/System/Console/Haskeline/MonadException.hs +++ b/System/Console/Haskeline/MonadException.hs @@ -26,7 +26,9 @@ module System.Console.Haskeline.MonadException( import qualified Control.Exception as E import Control.Exception (Exception,SomeException) +#if __GLASGOW_HASKELL__ < 705 import Prelude hiding (catch) +#endif import Control.Monad(liftM, join) import Control.Monad.IO.Class import Control.Monad.Trans.Reader diff --git a/System/Console/Haskeline/Monads.hs b/System/Console/Haskeline/Monads.hs index 265068d..a7bc3fb 100644 --- a/System/Console/Haskeline/Monads.hs +++ b/System/Console/Haskeline/Monads.hs @@ -25,7 +25,9 @@ import Control.Monad.Trans.Class (MonadTrans(..)) import Control.Monad.Trans.Maybe (MaybeT(..)) import Control.Monad.Trans.Reader hiding (ask,asks) import qualified Control.Monad.Trans.Reader as Reader +#if __GLASGOW_HASKELL__ < 705 import Prelude hiding (catch) +#endif import System.Console.Haskeline.MonadException diff --git a/haskeline.cabal b/haskeline.cabal index 3628ffe..b63bb2d 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -46,7 +46,7 @@ flag libiconv Library if impl(ghc>=6.11) { - Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2, + Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2, bytestring>=0.9 && < 0.11 } else { _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
