summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-11 12:46:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-11 12:46:35 -0400
commit0847a300fc65a832171af53272439d18f6e9ed6b (patch)
tree1d5503b35e7fdb27bcd2e1e3f8f1020686882125 /git-annex.cabal
parent129f6123fe933310829986fd5a99a9fd6911ca0f (diff)
Revert "Build with ghc's threaded runtime, so threaded code does not busy-wait."
This reverts commit 129f6123fe933310829986fd5a99a9fd6911ca0f. Saw hang during batch add with -threaded, so deferred for now.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 9bfb5eec6..3459eaae0 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 3.20120612
+Version: 3.20120611
Cabal-Version: >= 1.8
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>
@@ -36,11 +36,10 @@ Executable git-annex
pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
base == 4.5.*, monad-control, transformers-base, lifted-base,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
- hinotify, stm
+ hinotify, STM
Other-Modules: Utility.Touch
C-Sources: Utility/libdiskfree.c
Extensions: CPP
- GHC-options: -threaded
if flag(S3)
Build-Depends: hS3
@@ -54,7 +53,7 @@ Test-Suite test
pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
base == 4.5.*, monad-control, transformers-base, lifted-base,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
- hinotify, stm
+ hinotify, STM
C-Sources: Utility/libdiskfree.c
Extensions: CPP