Skip to content

cabal-install: improve Sierra compatibility #6412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ilovezfs wants to merge 1 commit into from
Closed

cabal-install: improve Sierra compatibility #6412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions Formula/cabal-install.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
class CabalInstall < Formula
desc "Command-line interface for Cabal and Hackage"
homepage "https://www.haskell.org/cabal/"
url "https://hackage.haskell.org/package/cabal-install-1.24.0.0/cabal-install-1.24.0.0.tar.gz"
sha256 "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e"
revision 1
revision 2
head "https://github.com/haskell/cabal.git", :branch => "1.24"

stable do
if MacOS.version >= :sierra
url "https://github.com/haskell/cabal.git",
:branch => "1.24",
:revision => "51ff8b66468977dcccb81d19ac2d42ee27c9ccd1"
version "1.24.0.0"
else
url "https://hackage.haskell.org/package/cabal-install-1.24.0.0/cabal-install-1.24.0.0.tar.gz"
sha256 "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e"

# disables haddock for hackage-security
patch :p2 do
url "https://github.com/haskell/cabal/commit/9441fe.patch"
sha256 "5506d46507f38c72270efc4bb301a85799a7710804e033eaef7434668a012c5e"
end
end
end

bottle do
cellar :any_skip_relocation
Expand All @@ -17,13 +34,8 @@ class CabalInstall < Formula

fails_with :clang if MacOS.version <= :lion # Same as ghc.rb

# disables haddock for hackage-security
patch :p2 do
url "https://github.com/haskell/cabal/commit/9441fe.patch"
sha256 "5506d46507f38c72270efc4bb301a85799a7710804e033eaef7434668a012c5e"
end

def install
cd "cabal-install" if MacOS.version >= :sierra || build.head?
system "sh", "bootstrap.sh", "--sandbox"
bin.install ".cabal-sandbox/bin/cabal"
bash_completion.install "bash-completion/cabal"
Expand Down