summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:00:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:00:52 -0400
commit7ed1ce981efe3062d5823d1d69ed59d7f04a020f (patch)
tree12368a3cc266929a9b45bda63924d3f042a6b000 /git-annex.cabal
parent0d0f0802632e3af2788846d0f64f15c61c24fdff (diff)
persistent-sqlite is now a hard build dependency, since v6 repository mode needs it.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal11
1 files changed, 2 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 4794d38e5..bbd3542fe 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -104,10 +104,6 @@ Flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
-Flag Database
- Description: Enable building with persistent for database use (disable to build on platforms not supporting TH)
- Default: True
-
Flag Cryptonite
Description: Use the cryptonite library, instead of the older cryptohash
@@ -128,7 +124,8 @@ Executable git-annex
monad-control, transformers,
bloomfilter, edit-distance,
resourcet, http-conduit, http-client, http-types,
- time, old-locale
+ time, old-locale,
+ esqueleto, persistent-sqlite, persistent, persistent-template
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports
@@ -273,10 +270,6 @@ Executable git-annex
Build-Depends: torrent (>= 10000.0.0)
CPP-Options: -DWITH_TORRENTPARSER
- if flag(Database)
- Build-Depends: esqueleto, persistent-sqlite, persistent, persistent-template
- CPP-Options: -DWITH_DATABASE
-
if flag(ConcurrentOutput)
Build-Depends: concurrent-output (>= 1.6)
CPP-Options: -DWITH_CONCURRENTOUTPUT