diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-05-19 12:27:26 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-05-19 12:55:22 +0100 |
| commit | 0f4925b6dfa40010bbf19e2824224b5a568d4f57 (patch) | |
| tree | 55e68351d8e670d8ab37a6e2af4786f90bbf7c85 | |
| parent | 293475bc48bdb41c2629d752b2cbe2bd49b71571 (diff) | |
| download | haskell-0f4925b6dfa40010bbf19e2824224b5a568d4f57.tar.gz | |
Use transformers directly, rather than using mtl
This means we no longer need mtl in a GHC tree.
| -rw-r--r-- | ghc.mk | 3 | ||||
| -rw-r--r-- | ghc/GhciMonad.hs | 3 | ||||
| -rw-r--r-- | ghc/InteractiveUI.hs | 3 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
| -rw-r--r-- | packages | 1 |
5 files changed, 6 insertions, 6 deletions
@@ -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 11d23a6876..fff5ca15aa 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 efafd25d23..0688f2b6b7 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 1c898f256f..a7e7bbae66 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, @@ -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 |