summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-06 14:48:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-06 14:48:15 -0400
commit3778e8897dcd8b2a5a54d076cc5d3a6d0a0bb689 (patch)
tree2df74d3730caec8421f48a248ae4c9c02ab6e77e
parent7722147e1625e0a16cfcf13fd967a4a961decaf7 (diff)
switch to using cabal-install git-annex
-rw-r--r--doc/install/Fedora.mdwn19
-rw-r--r--doc/install/OSX.mdwn18
2 files changed, 3 insertions, 34 deletions
diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn
index 17b863521..068d5c111 100644
--- a/doc/install/Fedora.mdwn
+++ b/doc/install/Fedora.mdwn
@@ -3,22 +3,5 @@ Installation recipe for Fedora 14.
<pre>
sudo yum install ghc cabal-install
sudo cabal update
-sudo cabal install missingh
-sudo cabal install utf8-string
-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 json
-sudo cabal install hS3
-
-git clone git://git-annex.branchable.com/
-
-cd git-annex
-sudo make # For some reason you need to use sudo here as otherwise the cabal installed packages doesn't seem to be there...
-sudo install git-annex
+sudo cabal install git-annex
</pre>
-
-Originally posted by Jon at <https://gist.github.com/997568> --[[Joey]]
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index 12502e090..680c331ee 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -4,26 +4,12 @@ Install Haskel Platform from [[http://hackage.haskell.org/platform/mac.html]]. T
sudo port install git-core ossp-uuid md5sha1sum coreutils pcre
sudo ln -s /opt/local/include/pcre.h /usr/include/pcre.h # This is hack that allows pcre-light to find pcre
-sudo cabal update
-sudo cabal install missingh
-sudo cabal install utf8-string
-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 json
-sudo cabal install hS3 # optional
# optional: this will enable the gnu tools, (to give sha224sum etc..., it does not override the BSD userland)
export PATH=$PATH:/opt/local/libexec/gnubin
-git clone git://git-annex.branchable.com/
-
-cd git-annex
-make
-sudo make install
+sudo cabal update
+sudo cabal install git-annex
</pre>
Originally posted by Jon at <https://gist.github.com/671785> --[[Joey]], modified by [[kristianrumberg]]