diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-05 11:22:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-05 11:22:32 -0400 |
| commit | 80de75d25c19f37564ac6db97db534f40d26f108 (patch) | |
| tree | 0ccf8611ba4fdfdccb6f90cee16c76a481d9feaa /git-annex.cabal | |
| parent | aa5de5e25c46cbf5c0eb2cd6e0fb6e84be5586fb (diff) | |
| parent | cd8e2e4eeb70d22f9a7daa375474d80aa188574b (diff) | |
Merge branch 'no-cbits'
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index f36902f8f..dcb038d93 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -111,7 +111,8 @@ Executable git-annex esqueleto, persistent-sqlite, persistent, persistent-template, aeson, feed, - regex-tdfa + regex-tdfa, + disk-free-space CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports @@ -143,11 +144,8 @@ Executable git-annex process (>= 1.3.0.0) else Build-Depends: unix - -- Need to list these because they're generated from .hsc files. - Other-Modules: Utility.Touch Utility.Mounts - Include-Dirs: Utility - C-Sources: Utility/libdiskfree.c Utility/libmounts.c - CPP-Options: -DWITH_CLIBS + if impl(ghc <= 7.6.3) + Other-Modules: Utility.Touch.Old if flag(TestSuite) Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun, @@ -163,7 +161,7 @@ Executable git-annex CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(solaris) - Build-Depends: dns + Build-Depends: dns, mountpoints CPP-Options: -DWITH_ASSISTANT if flag(Assistant) |