mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove yesod version parametisation

Browse source 
Seems cabal defaults to trying to satisfy both flags, which cannot works,
and does not fall back to only selecting one, as hoped. While users could
manually specify flags, I don't want to require that to build, so let's
just require the newer yesod version when building with cabal.
This commit is contained in:
Joey Hess 2012-08-29 11:59:00 -04:00
parent 63d4d9c71f
commit 38e2dbb1cb
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
git-annex.cabal
View file

@ -40,12 +40,6 @@ Flag Assistant
Flag Webapp
Description: Enable git-annex webapp
Flag CurrentYesod
Description: Using a current version of Yesod
Flag OldYesod
Description: Using an old version of Yesod
Executable git-annex
Main-Is: git-annex.hs
Build-Depends: MissingH, hslogger, directory, filepath,
@ -79,18 +73,11 @@ Executable git-annex
Build-Depends: dbus
CPP-Options: -DWITH_DBUS
if flag(CurrentYesod)
Build-Depends: yesod-default (>= 1.1.0)
if flag(OldYesod)
Build-Depends: yesod-default (<= 1.0.1.1)
CPP-Options: -DWITH_OLD_YESOD
if flag(Webapp) && (flag(CurrentYesod) || flag(OldYesod))
if flag(Webapp)
Build-Depends: yesod, yesod-static, case-insensitive,
http-types, transformers, wai, wai-logger, warp, blaze-builder,
blaze-html, crypto-api, hamlet, clientsession,
template-haskell
template-haskell, yesod-default (>= 1.1.0)
CPP-Options: -DWITH_WEBAPP
if os(darwin)