aboutsummaryrefslogtreecommitdiff
path: root/Common.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-24 14:43:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-24 14:43:32 -0400
commita5278189ff0da1acdd6d4dfcf720ec8e75e222c7 (patch)
treecbf233c8349e1207c61234cd23bac928043f409d /Common.hs
parenteb7190535a63c3a4f92b6968cea7f3b1df56cdbc (diff)
deal with mtl/monads-tf conflict
I had been using -ignore-package monads-tf to deal with this, but the XMPP library uses monads-tf, so that also ignores it. Instead, use PackageImports to force use of mtl in my own code.
Diffstat (limited to 'Common.hs')
-rw-r--r--Common.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Common.hs b/Common.hs
index 04ec1e044..5b53f3735 100644
--- a/Common.hs
+++ b/Common.hs
@@ -1,9 +1,11 @@
+{-# LANGUAGE PackageImports #-}
+
module Common (module X) where
import Control.Monad as X hiding (join)
import Control.Monad.IfElse as X
import Control.Applicative as X
-import Control.Monad.State.Strict as X (liftIO)
+import "mtl" Control.Monad.State.Strict as X (liftIO)
import Control.Exception.Extensible as X (IOException)
import Data.Maybe as X