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

Add back transformers 0.1 support

Browse Source
This commit is contained in:
Michael Snoyman 2010-04-25 11:12:56 -07:00
parent 59753521a2
commit 4590d4afad
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Web/Authenticate/OpenId.hs
View File

@ -1,6 +1,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE CPP #-}
--------------------------------------------------------- ---------------------------------------------------------
-- | -- |
-- Module : Web.Authenticate.OpenId -- Module : Web.Authenticate.OpenId
@ -23,8 +24,12 @@ module Web.Authenticate.OpenId
import Network.HTTP.Wget import Network.HTTP.Wget
import Text.HTML.TagSoup import Text.HTML.TagSoup
import Numeric (showHex) import Numeric (showHex)
import Control.Monad.IO.Class
import qualified Safe.Failure as A import qualified Safe.Failure as A
#if TRANSFORMERS_02
import Control.Monad.IO.Class
#else
import Control.Monad.Trans
#endif
import Data.Generics import Data.Generics
import Control.Failure hiding (Error) import Control.Failure hiding (Error)
import Control.Exception import Control.Exception

5
Web/Authenticate/Rpxnow.hs
View File

@ -1,4 +1,5 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE CPP #-}
--------------------------------------------------------- ---------------------------------------------------------
-- --
-- Module : Web.Authenticate.Rpxnow -- Module : Web.Authenticate.Rpxnow
@ -20,7 +21,11 @@ module Web.Authenticate.Rpxnow
import Text.JSON -- FIXME use Data.Object.JSON import Text.JSON -- FIXME use Data.Object.JSON
import Network.HTTP.Wget import Network.HTTP.Wget
import Data.Maybe (isJust, fromJust) import Data.Maybe (isJust, fromJust)
#if TRANSFORMERS_02
import Control.Monad.IO.Class import Control.Monad.IO.Class
#else
import Control.Monad.Trans
#endif
import Control.Failure import Control.Failure
-- | Information received from Rpxnow after a valid login. -- | Information received from Rpxnow after a valid login.

11
authenticate.cabal
View File

@ -1,5 +1,5 @@
name: authenticate name: authenticate
version: 0.6.0 version: 0.6.0.1
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -13,6 +13,9 @@ cabal-version: >= 1.2
build-type: Simple build-type: Simple
homepage: http://github.com/snoyberg/authenticate/tree/master homepage: http://github.com/snoyberg/authenticate/tree/master
flag transformers_02
description: transformers = 0.2.*
library library
build-depends: base >= 4 && < 5, build-depends: base >= 4 && < 5,
json >= 0.4.3 && < 0.5, json >= 0.4.3 && < 0.5,
@ -20,8 +23,12 @@ library
tagsoup >= 0.6 && < 0.9, tagsoup >= 0.6 && < 0.9,
failure >= 0.0.0 && < 0.1, failure >= 0.0.0 && < 0.1,
safe-failure >= 0.4 && < 0.5, safe-failure >= 0.4 && < 0.5,
transformers >= 0.2 && < 0.3,
syb syb
if flag(transformers_02)
build-depends: transformers >= 0.2 && < 0.3
CPP-OPTIONS: -DTRANSFORMERS_02
else
build-depends: transformers >= 0.1 && < 0.2
exposed-modules: Web.Authenticate.Rpxnow, exposed-modules: Web.Authenticate.Rpxnow,
Web.Authenticate.OpenId Web.Authenticate.OpenId
ghc-options: -Wall -fno-warn-orphans ghc-options: -Wall -fno-warn-orphans