diff --git a/Library/Homebrew/language/haskell.rb b/Library/Homebrew/language/haskell.rb index f3758c2f51..ee0a061624 100644 --- a/Library/Homebrew/language/haskell.rb +++ b/Library/Homebrew/language/haskell.rb @@ -16,7 +16,7 @@ module Language 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 @@ -25,7 +25,7 @@ module Language 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 @@ -41,7 +41,7 @@ module Language 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) @@ -55,11 +55,11 @@ module Language # 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)