summaryrefslogtreecommitdiff
path: root/src/Propellor/Types.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-06 14:29:12 -0400
committerJoey Hess2015-05-06 14:29:12 -0400
commit9ec4b33dbb62e42b8d284d1aeddf32a395fd7cc0 (patch)
treeb9067a945a430af4868be1a0fcf052db5c4cd5fc /src/Propellor/Types.hs
parentb4877efea5375cb83951d6dd1d3dbf9d70208cf8 (diff)
parent160eff0eb7ebbb2da2c3864dbe83bf7db76c8bb6 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Types.hs')
-rw-r--r--src/Propellor/Types.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index ba63cf9d..474385b7 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -40,7 +40,7 @@ module Propellor.Types
import Data.Monoid
import Control.Applicative
import "mtl" Control.Monad.RWS.Strict
-import "MonadCatchIO-transformers" Control.Monad.CatchIO
+import Control.Monad.Catch
import qualified Data.Set as S
import qualified Data.Map as M
@@ -73,7 +73,9 @@ newtype Propellor p = Propellor { runWithHost :: RWST Host [EndAction] () IO p }
, MonadReader Host
, MonadWriter [EndAction]
, MonadIO
- , MonadCatchIO
+ , MonadCatch
+ , MonadThrow
+ , MonadMask
)
instance Monoid (Propellor Result) where