Skip to content
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

Jump to bottom

language/haskell: use v1 commands #4958

Merged
merged 1 commit into from
Sep 21, 2018
Merged

language/haskell: use v1 commands #4958

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Library/Homebrew/language/haskell.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def cabal_sandbox(options = {})
saved_home = ENV["HOME"]
ENV["HOME"] = home

system "cabal", "sandbox", "init"
system "cabal", "v1-sandbox", "init"
cabal_sandbox_bin = pwd/".cabal-sandbox/bin"
mkdir_p cabal_sandbox_bin

Expand All @@ -25,7 +25,7 @@ def cabal_sandbox(options = {})
ENV.prepend_path "PATH", cabal_sandbox_bin

# avoid updating the cabal package database more than once
system "cabal", "update" unless (home/".cabal/packages").exist?
system "cabal", "v1-update" unless (home/".cabal/packages").exist?

yield

Expand All @@ -41,7 +41,7 @@ def cabal_sandbox(options = {})
end

def cabal_sandbox_add_source(*args)
system "cabal", "sandbox", "add-source", *args
system "cabal", "v1-sandbox", "add-source", *args
end

def cabal_install(*args)
Expand All @@ -55,11 +55,11 @@ def cabal_install(*args)
# needed value by a formula at this time (February 2016) was 43,478 for
# git-annex, so 100,000 should be enough to avoid most gratuitous
# backjumps build failures.
system "cabal", "install", "--jobs=#{make_jobs}", "--max-backjumps=100000", *args
system "cabal", "v1-install", "--jobs=#{make_jobs}", "--max-backjumps=100000", *args
end

def cabal_configure(flags)
system "cabal", "configure", flags
system "cabal", "v1-configure", flags
end

def cabal_install_tools(*tools)
Expand Down