Commit 0f4925b6 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Use transformers directly, rather than using mtl

This means we no longer need mtl in a GHC tree.
parent 293475bc
...@@ -309,7 +309,7 @@ endif ...@@ -309,7 +309,7 @@ endif
# They do not say "this package will be built"; see $(PACKAGES_xx) for that # They do not say "this package will be built"; see $(PACKAGES_xx) for that
# Packages that are built but not installed # 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 := \ PKGS_THAT_ARE_DPH := \
dph/dph-base \ dph/dph-base \
...@@ -420,7 +420,6 @@ $(eval $(call addPackage,binary)) ...@@ -420,7 +420,6 @@ $(eval $(call addPackage,binary))
$(eval $(call addPackage,bin-package-db)) $(eval $(call addPackage,bin-package-db))
$(eval $(call addPackage,hoopl)) $(eval $(call addPackage,hoopl))
$(eval $(call addPackage,transformers)) $(eval $(call addPackage,transformers))
$(eval $(call addPackage,mtl))
$(eval $(call addPackage,utf8-string)) $(eval $(call addPackage,utf8-string))
$(eval $(call addPackage,xhtml)) $(eval $(call addPackage,xhtml))
$(eval $(call addPackage,terminfo,($$(Windows),NO))) $(eval $(call addPackage,terminfo,($$(Windows),NO)))
......
...@@ -53,7 +53,8 @@ import GHC.Exts ...@@ -53,7 +53,8 @@ import GHC.Exts
import System.Console.Haskeline (CompletionFunc, InputT) import System.Console.Haskeline (CompletionFunc, InputT)
import qualified System.Console.Haskeline as Haskeline 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 -- GHCi monad
......
...@@ -58,7 +58,8 @@ import System.Console.Haskeline as Haskeline ...@@ -58,7 +58,8 @@ import System.Console.Haskeline as Haskeline
import Control.Applicative hiding (empty) import Control.Applicative hiding (empty)
import Control.Monad as Monad import Control.Monad as Monad
import Control.Monad.Trans import Control.Monad.Trans.Class
import Control.Monad.IO.Class
import Data.Array import Data.Array
import qualified Data.ByteString.Char8 as BS import qualified Data.ByteString.Char8 as BS
......
...@@ -44,7 +44,7 @@ Executable ghc ...@@ -44,7 +44,7 @@ Executable ghc
CPP-Options: -DGHCI CPP-Options: -DGHCI
GHC-Options: -fno-warn-name-shadowing GHC-Options: -fno-warn-name-shadowing
Other-Modules: InteractiveUI, GhciMonad, GhciTags Other-Modules: InteractiveUI, GhciMonad, GhciTags
Build-Depends: mtl, haskeline Build-Depends: transformers, haskeline
Extensions: ForeignFunctionInterface, Extensions: ForeignFunctionInterface,
UnboxedTuples, UnboxedTuples,
FlexibleInstances, FlexibleInstances,
......
...@@ -63,7 +63,6 @@ libraries/hoopl - packages/hoopl.git ...@@ -63,7 +63,6 @@ libraries/hoopl - packages/hoopl.git
libraries/hpc - packages/hpc.git git libraries/hpc - packages/hpc.git git
libraries/integer-gmp - packages/integer-gmp.git git libraries/integer-gmp - packages/integer-gmp.git git
libraries/integer-simple - packages/integer-simple.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-locale - packages/old-locale.git git
libraries/old-time - packages/old-time.git git libraries/old-time - packages/old-time.git git
libraries/pretty - packages/pretty.git git libraries/pretty - packages/pretty.git git
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment