diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-11 16:00:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-11 16:00:58 -0400 |
| commit | 66864d5d99e595e56ed77bd89312abc43d593c83 (patch) | |
| tree | 47bb74bc92145c51faf76632785500e1bad3a30e /git-annex.cabal | |
| parent | 4b5aa38d39f4bef06bcbface980584d2654bcd28 (diff) | |
| parent | e658dc378eaa14607278cddd30f965ffcff89426 (diff) | |
Merge branch 'android'
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 24fc251ee..1b06564e5 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -57,16 +57,16 @@ Executable git-annex Build-Depends: MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network (>= 2.0), mtl (>= 2.1.1), bytestring, old-locale, time, - pcre-light, extensible-exceptions, dataenc, SHA, process, json, + extensible-exceptions, dataenc, SHA, process, json, base (>= 4.5 && < 4.8), monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, - SafeSemaphore + SafeSemaphore, uuid, Glob -- 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 Extensions: CPP - GHC-Options: -threaded + GHC-Options: -threaded -DWITH_GLOB if flag(S3) Build-Depends: hS3 @@ -123,15 +123,15 @@ Test-Suite test Main-Is: test.hs Build-Depends: testpack, HUnit, MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network, mtl (>= 2.1.1), bytestring, - old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, - process, json, HTTP, base (>= 4.5 && < 4.7), monad-control, + old-locale, time, extensible-exceptions, dataenc, SHA, + process, json, base (>= 4.5 && < 4.7), monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, - bloomfilter, edit-distance, process, SafeSemaphore + bloomfilter, edit-distance, process, SafeSemaphore, Glob Other-Modules: Utility.Touch Include-Dirs: Utility C-Sources: Utility/libdiskfree.c Extensions: CPP - GHC-Options: -threaded + GHC-Options: -threaded -DWITH_GLOB source-repository head type: git |