From 37ab6737eeb7d45676f7cefdb120436adab52ba8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 5 Dec 2011 11:18:14 +0200 Subject: [PATCH] monad-control 0.3 for yesod package --- yesod-core/yesod-core.cabal | 2 +- yesod/Yesod.hs | 8 ++++++++ yesod/scaffold/project.cabal.cg | 5 ++++- yesod/scaffold/tiny/project.cabal.cg | 1 + yesod/yesod.cabal | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index d42b5a9a..7a0ae43b 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 0.9.3.4 +version: 0.9.3.5 license: BSD3 license-file: LICENSE author: Michael Snoyman diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs index 7724a345..bdee5aeb 100644 --- a/yesod/Yesod.hs +++ b/yesod/Yesod.hs @@ -15,7 +15,11 @@ module Yesod , Application , lift , liftIO +#if MIN_VERSION_monad_control(0, 3, 0) + , MonadBaseControl +#else , MonadControlIO +#endif -- * Utilities , showIntegral , readIntegral @@ -50,7 +54,11 @@ import Network.Wai (Application) import Network.Wai.Middleware.Debug import Control.Monad.Trans.Class (lift) import Control.Monad.IO.Class (liftIO) +#if MIN_VERSION_monad_control(0, 3, 0) +import Control.Monad.Trans.Control (MonadBaseControl) +#else import Control.Monad.IO.Control (MonadControlIO) +#endif import Network.Wai.Handler.Warp (run) import System.IO (stderr, hPutStrLn) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 63e25d8a..0963ab21 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -46,6 +46,7 @@ library TypeFamilies GADTs GeneralizedNewtypeDeriving + FlexibleContexts executable ~project~ if flag(devel) @@ -69,9 +70,10 @@ executable ~project~ TypeFamilies GADTs GeneralizedNewtypeDeriving + FlexibleContexts build-depends: base >= 4 && < 5 - , yesod >= 0.9 && < 0.10 + , yesod >= 0.9.3.4 && < 0.10 , yesod-core >= 0.9.3 && < 0.10 , yesod-auth >= 0.7.3 && < 0.8 , yesod-static >= 0.3.1 && < 0.4 @@ -89,3 +91,4 @@ executable ~project~ , shakespeare-js >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11 , hjsmin >= 0.0.14 && < 0.1 + , monad-control >= 0.3 && < 0.4 diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index 72fe6f2b..ab1855c0 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -76,4 +76,5 @@ executable ~project~ , shakespeare-text >= 0.10 && < 0.11 , wai >= 0.4.2 && < 0.5 , transformers >= 0.2 && < 0.3 + , monad-control >= 0.3 && < 0.4 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index f72f884e..390457d1 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 0.9.3.3 +version: 0.9.3.4 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -76,7 +76,7 @@ library , yesod-json >= 0.2.2 && < 0.3 , yesod-persistent >= 0.2 && < 0.3 , yesod-form >= 0.3 && < 0.4 - , monad-control >= 0.2 && < 0.3 + , monad-control >= 0.2 && < 0.4 , transformers >= 0.2.2 && < 0.3 , wai >= 0.4 && < 0.5 , wai-extra >= 0.4.1 && < 0.5