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

Using cabal MIN_VERSION for transformers

Browse Source
This commit is contained in:
Michael Snoyman 2010-05-04 22:02:16 +03:00
parent 746754d510
commit 56fc788d3f
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Yesod.hs
View File

@ -35,7 +35,7 @@ import Yesod.Handler hiding (runHandler)
import Network.Wai (Application) import Network.Wai (Application)
import Yesod.Hamlet import Yesod.Hamlet
import Data.Convertible.Text (cs) import Data.Convertible.Text (cs)
#if TRANSFORMERS_02 #if MIN_VERSION_transformers(0,2,0)
import "transformers" Control.Monad.IO.Class (liftIO) import "transformers" Control.Monad.IO.Class (liftIO)
#else #else
import "transformers" Control.Monad.Trans (liftIO) import "transformers" Control.Monad.Trans (liftIO)

2
Yesod/Form.hs
View File

@ -27,7 +27,7 @@ import Data.Time (Day)
import Data.Convertible.Text import Data.Convertible.Text
import Control.Monad.Attempt import Control.Monad.Attempt
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
#if TRANSFORMERS_02 #if MIN_VERSION_transformers(0,2,0)
import "transformers" Control.Monad.IO.Class import "transformers" Control.Monad.IO.Class
#else #else
import "transformers" Control.Monad.Trans import "transformers" Control.Monad.Trans

2
Yesod/Handler.hs
View File

@ -58,7 +58,7 @@ import Web.Mime
import Control.Exception hiding (Handler) import Control.Exception hiding (Handler)
import Control.Applicative import Control.Applicative
#if TRANSFORMERS_02 #if MIN_VERSION_transformers(0,2,0)
import "transformers" Control.Monad.IO.Class import "transformers" Control.Monad.IO.Class
#else #else
import "transformers" Control.Monad.Trans import "transformers" Control.Monad.Trans

2
Yesod/Request.hs
View File

@ -38,7 +38,7 @@ import qualified Network.Wai as W
import Yesod.Definitions import Yesod.Definitions
import Web.Encodings import Web.Encodings
import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Lazy as BL
#if TRANSFORMERS_02 #if MIN_VERSION_transformers(0,2,0)
import "transformers" Control.Monad.IO.Class import "transformers" Control.Monad.IO.Class
#else #else
import "transformers" Control.Monad.Trans import "transformers" Control.Monad.Trans

15
yesod.cabal
View File

@ -11,8 +11,6 @@ cabal-version: >= 1.6
build-type: Simple build-type: Simple
homepage: http://docs.yesodweb.com/yesod/ homepage: http://docs.yesodweb.com/yesod/
flag transformers_02
description: transformers = 0.2.*
flag buildtests flag buildtests
description: Build the executable to run unit tests description: Build the executable to run unit tests
default: False default: False
@ -33,12 +31,8 @@ library
template-haskell, template-haskell,
web-routes >= 0.22 && < 0.23, web-routes >= 0.22 && < 0.23,
web-routes-quasi >= 0.1 && < 0.2, web-routes-quasi >= 0.1 && < 0.2,
hamlet >= 0.0.1 && < 0.1 hamlet >= 0.0.1 && < 0.1,
if flag(transformers_02) transformers >= 0.1 && < 0.3
build-depends: transformers >= 0.2 && < 0.3
CPP-OPTIONS: -DTRANSFORMERS_02
else
build-depends: transformers >= 0.1 && < 0.2
exposed-modules: Yesod exposed-modules: Yesod
Yesod.Content Yesod.Content
Yesod.Definitions Yesod.Definitions
@ -68,11 +62,6 @@ executable runtests
QuickCheck >= 2 && < 3 QuickCheck >= 2 && < 3
else else
Buildable: False Buildable: False
if flag(transformers_02)
build-depends: transformers >= 0.2 && < 0.3
CPP-OPTIONS: -DTRANSFORMERS_02
else
build-depends: transformers >= 0.1 && < 0.2
ghc-options: -Wall ghc-options: -Wall
main-is: runtests.hs main-is: runtests.hs