summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
commit1933f8a5599f33b95811710ad10e1ed17703699d (patch)
treeacf454abe167051a7ff77a752deb6c5b9f45a758 /git-annex.cabal
parentc3a372f8f500f6b88d467af42df6332836d8dd31 (diff)
concurrent-output, first pass
Output without -Jn should be unchanged from before. With -Jn, concurrent-output is used for messages, but regions are not used yet, so it's a mess.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 273477316..f38834bfe 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -93,8 +93,8 @@ Flag DesktopNotify
Flag TorrentParser
Description: Use haskell torrent library to parse torrent files
-Flag AsciiProgress
- Description: Use ascii-progress library (experimental)
+Flag ConcurrentOutput
+ Description: Use concurrent-output library
Default: False
Flag EKG
@@ -278,9 +278,9 @@ Executable git-annex
Build-Depends: esqueleto, persistent-sqlite, persistent, persistent-template
CPP-Options: -DWITH_DATABASE
- if flag(AsciiProgress)
- Build-Depends: ascii-progress (<= 0.2.1.2), terminal-size
- CPP-Options: -DWITH_ASCIIPROGRESS
+ if flag(ConcurrentOutput)
+ Build-Depends: concurrent-output (>= 1.4.1)
+ CPP-Options: -DWITH_CONCURRENTOUTPUT
if flag(EKG)
Build-Depends: ekg