summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-07 19:10:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-07 20:53:57 -0400
commit2a108982ad95f9bba9bb1ae1c6152ef9b10be53c (patch)
tree95b285fe049c1c0ae44f7d392151876e59553afd
parent8c1fa1ab5f15c096e76fd2727f41b3bc042a2f3a (diff)
add monad-control to build depends
Will use this to handle exceptions in the Annex monad, yay.
-rw-r--r--debian/control1
-rw-r--r--doc/install.mdwn1
-rw-r--r--doc/install/Fedora.mdwn1
-rw-r--r--doc/install/OSX.mdwn1
-rw-r--r--git-annex.cabal2
5 files changed, 5 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 434723384..d519c42b7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
libghc-testpack-dev [any-i386 any-amd64],
+ libghc-monad-control-dev,
ikiwiki,
perlmagick,
git | git-core,
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 38963695b..49ddd913f 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -23,6 +23,7 @@ To build and use git-annex, you will need:
* [utf8-string](http://hackage.haskell.org/package/utf8-string)
* [SHA](http://hackage.haskell.org/package/SHA)
* [dataenc](http://hackage.haskell.org/package/dataenc)
+ * [monad-control](http://hackage.haskell.org/package/monad-control)
* [TestPack](http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack)
* [QuickCheck 2](http://hackage.haskell.org/package/QuickCheck)
* [HTTP](http://hackage.haskell.org/package/HTTP)
diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn
index 7814eec94..0c1da2e6a 100644
--- a/doc/install/Fedora.mdwn
+++ b/doc/install/Fedora.mdwn
@@ -9,6 +9,7 @@ sudo cabal install pcre-light
sudo cabal install quickcheck
sudo cabal install SHA
sudo cabal install dataenc
+sudo cabal install monad-control
sudo cabal install HTTP
sudo cabal install hS3
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index ade4fa30e..23cb1b62e 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -7,6 +7,7 @@ sudo cabal install pcre-light
sudo cabal install quickcheck
sudo cabal install SHA
sudo cabal install dataenc
+sudo cabal install monad-control
sudo cabal install HTTP
sudo cabal install hS3 # optional
diff --git a/git-annex.cabal b/git-annex.cabal
index eb02ae0ca..29ad80a58 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -31,7 +31,7 @@ Executable git-annex
Build-Depends: haskell98, 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
+ base < 5, monad-control
Executable git-annex-shell
Main-Is: git-annex-shell.hs