summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-24 23:02:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-24 23:02:42 -0400
commit6d4382a89ee0a021b3fa71302bfd74a906029e63 (patch)
tree99885f1cf6862aff0ffa37ba1f4b018ba92effa1 /git-annex.cabal
parentffefe742d8cc2655e29fa356c82326e867e27aa9 (diff)
parente04852c8af22f784d184a001b9fee04adb1828c1 (diff)
Merge branch 'new-monad-control'
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index ae6a129b3..a0980b1f0 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -30,8 +30,8 @@ Executable git-annex
Main-Is: git-annex.hs
Build-Depends: MissingH, hslogger, directory, filepath,
unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
- pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, HTTP,
- base < 5, monad-control < 0.3, json
+ pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, json, HTTP,
+ base < 5, monad-control, transformers-base, lifted-base
Executable git-annex-shell
Main-Is: git-annex-shell.hs