Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0f4925b6dfa40010bbf19e2824224b5a568d4f57 >--------------------------------------------------------------- commit 0f4925b6dfa40010bbf19e2824224b5a568d4f57 Author: Ian Lynagh <[email protected]> Date: Sat May 19 12:27:26 2012 +0100 Use transformers directly, rather than using mtl This means we no longer need mtl in a GHC tree. >--------------------------------------------------------------- ghc.mk | 3 +-- ghc/GhciMonad.hs | 3 ++- ghc/InteractiveUI.hs | 3 ++- ghc/ghc-bin.cabal.in | 2 +- packages | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ghc.mk b/ghc.mk index a23171c..41371d0 100644 --- a/ghc.mk +++ b/ghc.mk @@ -309,7 +309,7 @@ endif # They do not say "this package will be built"; see $(PACKAGES_xx) for that # Packages that are built but not installed -PKGS_THAT_ARE_INTREE_ONLY := haskeline mtl terminfo utf8-string xhtml +PKGS_THAT_ARE_INTREE_ONLY := haskeline transformers terminfo utf8-string xhtml PKGS_THAT_ARE_DPH := \ dph/dph-base \ @@ -420,7 +420,6 @@ $(eval $(call addPackage,binary)) $(eval $(call addPackage,bin-package-db)) $(eval $(call addPackage,hoopl)) $(eval $(call addPackage,transformers)) -$(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) $(eval $(call addPackage,xhtml)) $(eval $(call addPackage,terminfo,($$(Windows),NO))) diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index 11d23a6..fff5ca1 100644 --- a/ghc/GhciMonad.hs +++ b/ghc/GhciMonad.hs @@ -53,7 +53,8 @@ import GHC.Exts import System.Console.Haskeline (CompletionFunc, InputT) import qualified System.Console.Haskeline as Haskeline -import Control.Monad.Trans as Trans +import Control.Monad.Trans.Class as Trans +import Control.Monad.IO.Class as Trans ----------------------------------------------------------------------------- -- GHCi monad diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index efafd25..0688f2b 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -58,7 +58,8 @@ import System.Console.Haskeline as Haskeline import Control.Applicative hiding (empty) import Control.Monad as Monad -import Control.Monad.Trans +import Control.Monad.Trans.Class +import Control.Monad.IO.Class import Data.Array import qualified Data.ByteString.Char8 as BS diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 1c898f2..a7e7bba 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -44,7 +44,7 @@ Executable ghc CPP-Options: -DGHCI GHC-Options: -fno-warn-name-shadowing Other-Modules: InteractiveUI, GhciMonad, GhciTags - Build-Depends: mtl, haskeline + Build-Depends: transformers, haskeline Extensions: ForeignFunctionInterface, UnboxedTuples, FlexibleInstances, diff --git a/packages b/packages index e565bb4..162d5ca 100644 --- a/packages +++ b/packages @@ -63,7 +63,6 @@ libraries/hoopl - packages/hoopl.git libraries/hpc - packages/hpc.git git libraries/integer-gmp - packages/integer-gmp.git git libraries/integer-simple - packages/integer-simple.git git -libraries/mtl - packages/mtl.git git libraries/old-locale - packages/old-locale.git git libraries/old-time - packages/old-time.git git libraries/pretty - packages/pretty.git git _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
