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 )

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
This commit is contained in:
Freiric Barral 2014-08-29 18:43:39 +02:00
parent 7c002e167c
commit ec80c8f75e

View File

@ -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