From 9de803c7b5567b6d9000f76c82c45c02a38da29b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Feb 2013 07:14:25 +0200 Subject: [PATCH] Fix some deps --- authenticate/OpenId2/Discovery.hs | 3 +-- authenticate/Web/Authenticate/BrowserId.hs | 3 +-- authenticate/Web/Authenticate/OpenId.hs | 3 +-- authenticate/Web/Authenticate/Rpxnow.hs | 3 +-- authenticate/authenticate.cabal | 9 +++------ 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/authenticate/OpenId2/Discovery.hs b/authenticate/OpenId2/Discovery.hs index 9e183dbc..c0bfb1a1 100644 --- a/authenticate/OpenId2/Discovery.hs +++ b/authenticate/OpenId2/Discovery.hs @@ -41,8 +41,7 @@ import Text.HTML.TagSoup (parseTags, Tag (TagOpen)) import Control.Applicative ((<$>), (<*>)) import Network.HTTP.Types (status200) import Control.Exception (throwIO) -import Control.Monad.Trans.Resource (MonadResource) -import Control.Monad.Trans.Control (MonadBaseControl) +import Data.Conduit (MonadBaseControl, MonadResource) data Discovery = Discovery1 Text (Maybe Text) | Discovery2 Provider Identifier IdentType diff --git a/authenticate/Web/Authenticate/BrowserId.hs b/authenticate/Web/Authenticate/BrowserId.hs index c2a23b8c..17ed0531 100644 --- a/authenticate/Web/Authenticate/BrowserId.hs +++ b/authenticate/Web/Authenticate/BrowserId.hs @@ -12,8 +12,7 @@ import Data.Attoparsec.Lazy (parse, maybeResult) import qualified Data.HashMap.Lazy as Map import Data.Text.Encoding (encodeUtf8) import Control.Monad.IO.Class (liftIO) -import Control.Monad.Trans.Control (MonadBaseControl) -import Control.Monad.Trans.Resource (MonadResource) +import Data.Conduit (MonadBaseControl, MonadResource) -- | Location of the Javascript file hosted by browserid.org browserIdJs :: Text diff --git a/authenticate/Web/Authenticate/OpenId.hs b/authenticate/Web/Authenticate/OpenId.hs index 30e54f32..a31d3d29 100644 --- a/authenticate/Web/Authenticate/OpenId.hs +++ b/authenticate/Web/Authenticate/OpenId.hs @@ -36,8 +36,7 @@ import Data.Text.Encoding (encodeUtf8, decodeUtf8) import Blaze.ByteString.Builder (toByteString) import Network.HTTP.Types (renderQueryText) import Control.Exception (throwIO) -import Control.Monad.Trans.Control (MonadBaseControl) -import Control.Monad.Trans.Resource (MonadResource) +import Data.Conduit (MonadBaseControl, MonadResource) getForwardUrl :: (MonadResource m, MonadBaseControl IO m) diff --git a/authenticate/Web/Authenticate/Rpxnow.hs b/authenticate/Web/Authenticate/Rpxnow.hs index 0407aeb7..d9fd4063 100644 --- a/authenticate/Web/Authenticate/Rpxnow.hs +++ b/authenticate/Web/Authenticate/Rpxnow.hs @@ -38,8 +38,7 @@ import qualified Data.Aeson.Types import qualified Data.HashMap.Lazy as Map import Control.Applicative ((<$>), (<*>)) import Control.Exception (throwIO) -import Control.Monad.Trans.Control (MonadBaseControl) -import Control.Monad.Trans.Resource (MonadResource) +import Data.Conduit (MonadBaseControl, MonadResource) -- | Information received from Rpxnow after a valid login. data Identifier = Identifier diff --git a/authenticate/authenticate.cabal b/authenticate/authenticate.cabal index 8e5c0686..21b16438 100644 --- a/authenticate/authenticate.cabal +++ b/authenticate/authenticate.cabal @@ -1,5 +1,5 @@ name: authenticate -version: 1.3.2.4 +version: 1.3.2.5 license: BSD3 license-file: LICENSE author: Michael Snoyman, Hiromi Ishii, Arash Rouhani @@ -18,8 +18,8 @@ homepage: http://github.com/yesodweb/authenticate library build-depends: base >= 4 && < 5 , aeson >= 0.5 - , http-conduit >= 1.5 && < 1.9 - , tagsoup >= 0.12 && < 0.13 + , http-conduit >= 1.5 + , tagsoup >= 0.12 , transformers >= 0.1 , bytestring >= 0.9 , network @@ -32,9 +32,6 @@ library , containers , unordered-containers , conduit >= 0.5 - , resourcet >= 0.3 - , monad-control >= 0.3 - , blaze-builder-conduit >= 0.5 exposed-modules: Web.Authenticate.Rpxnow, Web.Authenticate.OpenId, Web.Authenticate.BrowserId,