haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monad-control 0.3 for yesod package

Browse Source
This commit is contained in:
Michael Snoyman 2011-12-05 11:18:14 +02:00
parent 7619e4e9dd
commit 37ab6737ee
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 0.9.3.4 version: 0.9.3.5
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>

8
yesod/Yesod.hs
View File

@ -15,7 +15,11 @@ module Yesod
, Application , Application
, lift , lift
, liftIO , liftIO
#if MIN_VERSION_monad_control(0, 3, 0)
, MonadBaseControl
#else
, MonadControlIO , MonadControlIO
#endif
-- * Utilities -- * Utilities
, showIntegral , showIntegral
, readIntegral , readIntegral
@ -50,7 +54,11 @@ import Network.Wai (Application)
import Network.Wai.Middleware.Debug import Network.Wai.Middleware.Debug
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
import Control.Monad.IO.Class (liftIO) 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) import Control.Monad.IO.Control (MonadControlIO)
#endif
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import System.IO (stderr, hPutStrLn) import System.IO (stderr, hPutStrLn)

5
yesod/scaffold/project.cabal.cg
View File

@ -46,6 +46,7 @@ library
TypeFamilies TypeFamilies
GADTs GADTs
GeneralizedNewtypeDeriving GeneralizedNewtypeDeriving
FlexibleContexts
executable ~project~ executable ~project~
if flag(devel) if flag(devel)
@ -69,9 +70,10 @@ executable ~project~
TypeFamilies TypeFamilies
GADTs GADTs
GeneralizedNewtypeDeriving GeneralizedNewtypeDeriving
FlexibleContexts
build-depends: base >= 4 && < 5 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-core >= 0.9.3 && < 0.10
, yesod-auth >= 0.7.3 && < 0.8 , yesod-auth >= 0.7.3 && < 0.8
, yesod-static >= 0.3.1 && < 0.4 , yesod-static >= 0.3.1 && < 0.4
@ -89,3 +91,4 @@ executable ~project~
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, shakespeare-text >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11
, hjsmin >= 0.0.14 && < 0.1 , hjsmin >= 0.0.14 && < 0.1
, monad-control >= 0.3 && < 0.4

1
yesod/scaffold/tiny/project.cabal.cg
View File

@ -76,4 +76,5 @@ executable ~project~
, shakespeare-text >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11
, wai >= 0.4.2 && < 0.5 , wai >= 0.4.2 && < 0.5
, transformers >= 0.2 && < 0.3 , transformers >= 0.2 && < 0.3
, monad-control >= 0.3 && < 0.4

4
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 0.9.3.3 version: 0.9.3.4
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -76,7 +76,7 @@ library
, yesod-json >= 0.2.2 && < 0.3 , yesod-json >= 0.2.2 && < 0.3
, yesod-persistent >= 0.2 && < 0.3 , yesod-persistent >= 0.2 && < 0.3
, yesod-form >= 0.3 && < 0.4 , yesod-form >= 0.3 && < 0.4
, monad-control >= 0.2 && < 0.3 , monad-control >= 0.2 && < 0.4
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai >= 0.4 && < 0.5 , wai >= 0.4 && < 0.5
, wai-extra >= 0.4.1 && < 0.5 , wai-extra >= 0.4.1 && < 0.5