From ec80c8f75e0bb5184dcc059c60c5375783d13bd7 Mon Sep 17 00:00:00 2001 From: Freiric Barral Date: Fri, 29 Aug 2014 18:43:39 +0200 Subject: [PATCH] fix cabal file: take into account the split of network from version 2.6, and avoid authenticate 1.3.2.6 which gave the following strange error: ... Building authenticate-1.3.2.6... Preprocessing library authenticate-1.3.2.6... [1 of 9] Compiling OpenId2.XRDS ( OpenId2/XRDS.hs, dist/dist-sandbox-a1429708/build/OpenId2/XRDS.o ) [2 of 9] Compiling Web.Authenticate.OpenId.Providers ( Web/Authenticate/OpenId/Providers.hs, dist/dist-sandbox-a1429708/build/Web/Authenticate/OpenId/Providers.o ) [3 of 9] Compiling Web.Authenticate.BrowserId ( Web/Authenticate/BrowserId.hs, dist/dist-sandbox-a1429708/build/Web/Authenticate/BrowserId.o ) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Web/Authenticate/BrowserId.hs:15:22: Module ‘Data.Conduit’ does not export ‘MonadBaseControl’ Web/Authenticate/BrowserId.hs:15:40: Module ‘Data.Conduit’ does not export ‘MonadResource’ Failed to install authenticate-1.3.2.6 --- yesod-auth-oauth2.cabal | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/yesod-auth-oauth2.cabal b/yesod-auth-oauth2.cabal index 4250d32..aef15aa 100644 --- a/yesod-auth-oauth2.cabal +++ b/yesod-auth-oauth2.cabal @@ -14,7 +14,16 @@ homepage: http://github.com/scan/yesod-auth-oauth2 flag ghc7 +flag network-uri + description: Get Network.URI from the network-uri package + default: True + library + if flag(network-uri) + build-depends: network-uri >= 2.6 + else + build-depends: network < 2.6 + if flag(ghc7) build-depends: base >= 4.3 && < 5 cpp-options: -DGHC7 @@ -26,6 +35,7 @@ library , http-types >= 0.8 && < 0.9 , aeson >= 0.6 && < 0.8 , yesod-core >= 1.2 && < 1.4 + , authenticate >= 1.3.2.7 && < 1.4 , yesod-auth >= 1.3 && < 1.4 , text >= 0.7 && < 2.0 , yesod-form >= 1.3 && < 1.4