diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-29 11:59:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-29 11:59:00 -0400 |
| commit | 38e2dbb1cb4a5fa84a8a345b175994fc6bedb2c8 (patch) | |
| tree | 0dba8590cbacb5d385142b706b28f87079dc7c07 /git-annex.cabal | |
| parent | 63d4d9c71f05b9bf45404a02dbbe05e9d46745d1 (diff) | |
remove yesod version parametisation
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.
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 943b1d380..f17f4c6c9 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -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) |