From 8d9716283ca1952d4960e2c0c28c61f12938ccfd Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 24 Jul 2024 21:20:30 -0400 Subject: [PATCH 1/2] unisonlang 0.5.25 autobump: add unisonlang Signed-off-by: Rui Chen --- .github/autobump.txt | 1 + Formula/u/unisonlang.rb | 47 ++++++++++++++++++----------------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.github/autobump.txt b/.github/autobump.txt index 010e106f4383..5470543e7489 100644 --- a/.github/autobump.txt +++ b/.github/autobump.txt @@ -2601,6 +2601,7 @@ uni uni-algo uni2ascii unison +unisonlang universal-ctags uriparser urlscan diff --git a/Formula/u/unisonlang.rb b/Formula/u/unisonlang.rb index c41a6cb05c03..bfa6c6e60435 100644 --- a/Formula/u/unisonlang.rb +++ b/Formula/u/unisonlang.rb @@ -7,20 +7,18 @@ class Unisonlang < Formula stable do url "https://github.com/unisonweb/unison.git", - tag: "release/M5j", - revision: "7778bdc1a1e97e82a6ae3910a7ed10074297ff27" - version "M5j" + tag: "release/0.5.25", + revision: "7301b693c8a9f9a8647de4e2b8f65e96cb3260b0" resource "local-ui" do - url "https://github.com/unisonweb/unison-local-ui/archive/refs/tags/release/M5j.tar.gz" - version "M5j" - sha256 "99f8dd4c86b1cae263f16b2e04ace88764a8a1b138cead4756ceaadb7899c338" + url "https://github.com/unisonweb/unison-local-ui/archive/refs/tags/release/0.5.25.tar.gz" + sha256 "04565fb26f7ba8367968f382ee20edaecda917c548a51a93ed7c69057f0796b7" end end livecheck do url :stable - regex(%r{^release/(M\d+[a-z]*)$}i) + regex(%r{^release/v?(\d+(?:\.\d+)+)$}i) end bottle do @@ -41,9 +39,10 @@ class Unisonlang < Formula end end - depends_on "ghc@9.2" => :build # GHC 9.4 PR: https://github.com/unisonweb/unison/pull/4009 + depends_on "elm" => :build + depends_on "ghc@9.6" => :build depends_on "haskell-stack" => :build - depends_on "node@18" => :build + depends_on "node@20" => :build uses_from_macos "python" => :build uses_from_macos "xz" => :build @@ -53,10 +52,6 @@ class Unisonlang < Formula depends_on "ncurses" end - on_arm do - depends_on "elm" => :build - end - def install odie "local-ui resource needs to be updated" if build.stable? && version != resource("local-ui").version @@ -66,12 +61,10 @@ def install # Build and install the web interface resource("local-ui").stage do system "npm", "install", *Language::Node.local_npm_install_args - if Hardware::CPU.arm? - # Replace x86_64 elm binary to avoid dependency on Rosetta - elm = Pathname("node_modules/elm/bin/elm") - elm.unlink - elm.parent.install_symlink Formula["elm"].opt_bin/"elm" - end + # Replace pre-built x86_64 elm binary + elm = Pathname("node_modules/elm/bin/elm") + elm.unlink + elm.parent.install_symlink Formula["elm"].opt_bin/"elm" # HACK: Flaky command occasionally stalls build indefinitely so we force fail # if that occurs. Problem seems to happening while running `elm-json install`. # Issue ref: https://github.com/zwilias/elm-json/issues/50 @@ -83,13 +76,13 @@ def install prefix.install "dist/unisonLocal" => "ui" end - stack_args = [ - "-v", - "--system-ghc", - "--no-install-ghc", - "--skip-ghc-check", - "--copy-bins", - "--local-bin-path=#{buildpath}", + stack_args = %W[ + -v + --system-ghc + --no-install-ghc + --skip-ghc-check + --copy-bins + --local-bin-path=#{buildpath} ] system "stack", "-j#{jobs}", "build", "--flag", "unison-parser-typechecker:optimized", *stack_args @@ -111,7 +104,7 @@ def install (testpath/"hello.md").write <<~EOS ```ucm - .> project.create test + scratch/main> project.create test test/main> load hello.u test/main> add test/main> run hello From 289c4b9a0964e0de900b1a91f14f2eb24da8aa6a Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 28 Jul 2024 22:46:13 +0000 Subject: [PATCH 2/2] unisonlang: update 0.5.25 bottle. --- Formula/u/unisonlang.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/u/unisonlang.rb b/Formula/u/unisonlang.rb index bfa6c6e60435..a1e40ff3c752 100644 --- a/Formula/u/unisonlang.rb +++ b/Formula/u/unisonlang.rb @@ -22,13 +22,13 @@ class Unisonlang < Formula end bottle do - sha256 cellar: :any_skip_relocation, arm64_sonoma: "27ab477693638d1b62c7b679ad24dddf5ea6bd0745d8ff03c0da85d8c4560d5e" - sha256 cellar: :any_skip_relocation, arm64_ventura: "8ca8bfe440d39d66d88e2d436d8ad374393963737fd8a7d0a4e53a37758d8aa7" - sha256 cellar: :any_skip_relocation, arm64_monterey: "d772b22156d824974696caf89ea263f125a62cd8eb0d8a4cab2c07f710efe14f" - sha256 cellar: :any_skip_relocation, sonoma: "77d8a6b34336d5c63564877a8a6dd97a855a3edef5a3926adbaba5d5fbdb5aa1" - sha256 cellar: :any_skip_relocation, ventura: "24d03a539050feb1aefe0ebbecef1c4f06f2379d91a063ea144af02dc3f94f45" - sha256 cellar: :any_skip_relocation, monterey: "2de0f07799a44b4d53619f62b20741dfa12040fb90fcab8421a8564c5006d5ca" - sha256 cellar: :any_skip_relocation, x86_64_linux: "d594aae90116a8136956555221276bd192bccd2155c64b71cface577c8f5d981" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "588dfadbe6163e6deee17e080a4885a8174814cb709126d3c874b1cd1adbd200" + sha256 cellar: :any_skip_relocation, arm64_ventura: "b707cf5713961b8d1b797654f9fbc876d24e4a25c91dd2085b35b670787ee395" + sha256 cellar: :any_skip_relocation, arm64_monterey: "9d19a8eab85219b6dc15a50fbbbd9d41068326480d9687269d42d3b665240c6c" + sha256 cellar: :any_skip_relocation, sonoma: "e59326ebe8e09b4baec2a67ee8d7766d9f8b485f404ba511cb5637894d88661b" + sha256 cellar: :any_skip_relocation, ventura: "997a0883fad382246f33ca204ecc6d6f05df74958cdcf85876f10e7874faab8b" + sha256 cellar: :any_skip_relocation, monterey: "2fabab188500a58f189a21cf64588160855e85db202e4d2df536ceb7e8f5da26" + sha256 cellar: :any_skip_relocation, x86_64_linux: "ea921a1229683575fb6e5b8596d098beef8c7666a05b495a6f031da4a0ca14e2" end head do