From e05c8dd3e6adb6a3a64eea344bbe66f0173d6b37 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 8 Aug 2020 18:01:35 -0400 Subject: [PATCH 1/3] texmath: deprecate cabal v1 installation --- Formula/texmath.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Formula/texmath.rb b/Formula/texmath.rb index 1f4b4c0653a7..79f356365ba3 100644 --- a/Formula/texmath.rb +++ b/Formula/texmath.rb @@ -1,13 +1,10 @@ -require "language/haskell" - class Texmath < Formula - include Language::Haskell::Cabal - desc "Haskell library for converting LaTeX math to MathML" homepage "https://johnmacfarlane.net/texmath.html" url "https://hackage.haskell.org/package/texmath-0.12.0.2/texmath-0.12.0.2.tar.gz" sha256 "2fec285a2266e56bba17914c122045f31b38de3efcd202dcf32a4f8b830bd184" license "GPL-2.0" + revision 1 bottle do cellar :any_skip_relocation @@ -20,9 +17,8 @@ class Texmath < Formula depends_on "ghc" => :build def install - install_cabal_package "--enable-tests", flags: ["executable"] do - system "cabal", "test" - end + system "cabal", "v2-update" + system "cabal", "v2-install", *std_cabal_v2_args end test do From ace81c8df8dd2cbc11428585695e035daaf2fb62 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 16 Aug 2020 20:36:09 -0400 Subject: [PATCH 2/3] use stack to build formula --- Formula/texmath.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Formula/texmath.rb b/Formula/texmath.rb index 79f356365ba3..06fc3b8edb70 100644 --- a/Formula/texmath.rb +++ b/Formula/texmath.rb @@ -13,12 +13,15 @@ class Texmath < Formula sha256 "c73f655501e17551219bf6bd028aedaa09b40464b3706db4d1a0d12b673c824e" => :high_sierra end - depends_on "cabal-install" => :build - depends_on "ghc" => :build + depends_on "haskell-stack" => :build def install - system "cabal", "v2-update" - system "cabal", "v2-install", *std_cabal_v2_args + # Let `stack` handle its own parallelization + jobs = ENV.make_jobs + ENV.deparallelize + + system "stack", "-j#{jobs}", "build" + system "stack", "-j#{jobs}", "--local-bin-path=#{bin}", "install" end test do From 779a3ada2a5e3c7037ca0e56c982fe9a9b9459e0 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 16 Aug 2020 21:17:54 -0400 Subject: [PATCH 3/3] add stack init step --- Formula/texmath.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/texmath.rb b/Formula/texmath.rb index 06fc3b8edb70..dca84cb9e921 100644 --- a/Formula/texmath.rb +++ b/Formula/texmath.rb @@ -20,6 +20,7 @@ def install jobs = ENV.make_jobs ENV.deparallelize + system "stack", "init" system "stack", "-j#{jobs}", "build" system "stack", "-j#{jobs}", "--local-bin-path=#{bin}", "install" end