admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #4958 from commitay/haskell

Browse Source 
language/haskell: use `v1` commands
This commit is contained in:
commitay 2018-09-22 08:43:27 +10:00 committed by GitHub
commit f239b7a627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/language/haskell.rb
View File

@ -16,7 +16,7 @@ module Language
saved_home = ENV["HOME"] saved_home = ENV["HOME"]
ENV["HOME"] = home ENV["HOME"] = home
system "cabal", "sandbox", "init" system "cabal", "v1-sandbox", "init"
cabal_sandbox_bin = pwd/".cabal-sandbox/bin" cabal_sandbox_bin = pwd/".cabal-sandbox/bin"
mkdir_p cabal_sandbox_bin mkdir_p cabal_sandbox_bin
@ -25,7 +25,7 @@ module Language
ENV.prepend_path "PATH", cabal_sandbox_bin ENV.prepend_path "PATH", cabal_sandbox_bin
# avoid updating the cabal package database more than once # 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 yield
@ -41,7 +41,7 @@ module Language
end end
def cabal_sandbox_add_source(*args) def cabal_sandbox_add_source(*args)
system "cabal", "sandbox", "add-source", *args system "cabal", "v1-sandbox", "add-source", *args
end end
def cabal_install(*args) def cabal_install(*args)
@ -55,11 +55,11 @@ module Language
# needed value by a formula at this time (February 2016) was 43,478 for # 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 # git-annex, so 100,000 should be enough to avoid most gratuitous
# backjumps build failures. # 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 end
def cabal_configure(flags) def cabal_configure(flags)
system "cabal", "configure", flags system "cabal", "v1-configure", flags
end end
def cabal_install_tools(*tools) def cabal_install_tools(*tools)