aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorTomasz Pajor2014-06-15 22:58:10 +0200
committerJack Nagel2014-06-16 10:14:16 -0500
commit3c6d43eadfa7f828cfdd03be3ca96c0e5148d203 (patch)
treee10be438d7dc38e4cfed4fb85f02cf9f9ddbf022 /Library/Formula
parent5ce5ad362cc8846b019e25c72a767cb220c02987 (diff)
downloadhomebrew-3c6d43eadfa7f828cfdd03be3ca96c0e5148d203.tar.bz2
git-annex 5.20140613
Fixes #30160. Fixes #30165. Closes #30192. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/git-annex.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Formula/git-annex.rb b/Library/Formula/git-annex.rb
index d0c4c9acd..6e1a6cfa6 100644
--- a/Library/Formula/git-annex.rb
+++ b/Library/Formula/git-annex.rb
@@ -5,12 +5,11 @@ class GitAnnex < Formula
include Language::Haskell::Cabal
homepage "https://git-annex.branchable.com/"
- url "http://hackage.haskell.org/package/git-annex-5.20140421/git-annex-5.20140421.tar.gz"
- sha1 "f818164eaddf2887a15c0c4c745a1cb8174152dc"
+ url "http://hackage.haskell.org/package/git-annex-5.20140613/git-annex-5.20140613.tar.gz"
+ sha1 "45a889114f4687553abffb48b0603c863e1ce816"
bottle do
cellar :any
- revision 1
sha1 "b26da4d239a3bb3cb7f09b34f9272f74d7098cce" => :mavericks
sha1 "16a56854088be3e0c82463f04d3738dfd24fe458" => :mountain_lion
sha1 "444f4575cbfa462c737a260cbad9a4ce57d4d77e" => :lion
@@ -29,11 +28,12 @@ class GitAnnex < Formula
cabal_sandbox do
cabal_install_tools "alex", "happy", "c2hs"
# gcc required to build gnuidn
- cabal_install "--with-gcc=#{Formula["gcc"].bin}/gcc", "--only-dependencies"
+ cabal_install "--with-gcc=#{Formula["gcc"].bin}/gcc-4.8", "--only-dependencies"
cabal_install "--prefix=#{prefix}"
end
- system "make", "git-annex.1", "git-annex-shell.1"
- man1.install "git-annex.1", "git-annex-shell.1"
+ bin.install_symlink "git-annex" => "git-annex-shell"
+ system "make", "git-annex.1", "git-annex-shell.1", "git-union-merge.1"
+ man1.install "git-annex.1", "git-annex-shell.1", "git-union-merge.1"
end
test do