wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git-annex 6.20161118

Browse source 
upstream git-annex recommends using the esqueleto patch from Debian
since the persistent < 2.5 constraint was removed from git-annex.cabal

Closes #7075.

Signed-off-by: ilovezfs <ilovezfs@icloud.com>
This commit is contained in:
ilovezfs 2016-11-19 08:06:57 -08:00
parent 959df83885
commit d14c054af2
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Formula/git-annex.rb
View file

@ -5,8 +5,8 @@ class GitAnnex < Formula
desc "Manage files with git without checking in file contents"
homepage "https://git-annex.branchable.com/"
url "https://hackage.haskell.org/package/git-annex-6.20161111/git-annex-6.20161111.tar.gz"
sha256 "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45"
url "https://hackage.haskell.org/package/git-annex-6.20161118/git-annex-6.20161118.tar.gz"
sha256 "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba"
head "git://git-annex.branchable.com/"
bottle do
@ -27,18 +27,37 @@ class GitAnnex < Formula
depends_on "gnutls"
depends_on "quvi"
def install
# Fixes CI timeout by providing a more specific hint for Solver
# Reported 9 Aug 2016: https://github.com/joeyh/git-annex/pull/56
# Can be removed once prowdsponsor/esqueleto#137 is resolved
inreplace "git-annex.cabal", "persistent (< 2.5)", "persistent (== 2.2.4.1)"
resource "esqueleto-2.4.3" do
url "https://mirrors.ocf.berkeley.edu/debian/pool/main/h/haskell-esqueleto/haskell-esqueleto_2.4.3.orig.tar.gz"
mirror "https://mirrors.kernel.org/debian/pool/main/h/haskell-esqueleto/haskell-esqueleto_2.4.3.orig.tar.gz"
sha256 "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434"
end
install_cabal_package :using => ["alex", "happy", "c2hs"], :flags => ["s3", "webapp"] do
# this can be made the default behavior again once git-union-merge builds properly when bottling
if build.with? "git-union-merge"
system "make", "git-union-merge", "PREFIX=#{prefix}"
bin.install "git-union-merge"
system "make", "git-union-merge.1", "PREFIX=#{prefix}"
# Patch for esqueleto to be able to use persistent 2.6
# https://github.com/joeyh/git-annex/commit/6416ae9c09f54c062c05cc686ade35c2e08c1434
# https://github.com/haskell-infra/hackage-trustees/issues/84
# https://github.com/prowdsponsor/esqueleto/issues/137
resource "esqueleto-newer-persistent-patch" do
url "https://mirrors.ocf.berkeley.edu/debian/pool/main/h/haskell-esqueleto/haskell-esqueleto_2.4.3-5.debian.tar.xz"
mirror "https://mirrors.kernel.org/debian/pool/main/h/haskell-esqueleto/haskell-esqueleto_2.4.3-5.debian.tar.xz"
sha256 "b152307e6c8f5f79d070bcadcf05d32c52a205bd2bacc578686c2aa01491aff6"
end
def install
cabal_sandbox do
(buildpath/"esqueleto-2.4.3").install resource("esqueleto-2.4.3")
resource("esqueleto-newer-persistent-patch").stage do
system "patch", "-p1", "-i", Pathname.pwd/"patches/newer-persistent",
"-d", buildpath/"esqueleto-2.4.3"
end
cabal_sandbox_add_source "esqueleto-2.4.3"
install_cabal_package :using => ["alex", "happy", "c2hs"], :flags => ["s3", "webapp"] do
# this can be made the default behavior again once git-union-merge builds properly when bottling
if build.with? "git-union-merge"
system "make", "git-union-merge", "PREFIX=#{prefix}"
bin.install "git-union-merge"
system "make", "git-union-merge.1", "PREFIX=#{prefix}"
end
end
end
bin.install_symlink "git-annex" => "git-annex-shell"