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.

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

ocaml 5.2.0 #172795

Merged
merged 22 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Formula/c/camlp-streams.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class CamlpStreams < Formula
url "https://github.com/ocaml/camlp-streams/archive/refs/tags/v5.0.1.tar.gz"
sha256 "ad71f62406e9bb4e7fb5d4593ede2af6c68f8b0d96f25574446e142c3eb0d9a4"
license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" }
revision 1
revision 2

bottle do
sha256 cellar: :any, arm64_sonoma: "1ab3f2156883e27bcfeff416cccb5e6f5e32102a52640299c5d6ca561b0b09f4"
Expand Down
9 changes: 5 additions & 4 deletions Formula/c/camlp5.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Camlp5 < Formula
desc "Preprocessor and pretty-printer for OCaml"
homepage "https://camlp5.github.io/"
url "https://github.com/camlp5/camlp5/archive/refs/tags/8.02.01.tar.gz"
sha256 "58d4bce0c20fa1151fc2c15f172f5884472e2044a4b0da22aababf46c361e515"
url "https://github.com/camlp5/camlp5/archive/refs/tags/8.03.00.tar.gz"
sha256 "0dae6d32184aca6f2cdbe818ee2f26aa58baa87d9e82f820914c63b35aa075de"
license "BSD-3-Clause"
revision 1
head "https://github.com/camlp5/camlp5.git", branch: "master"

livecheck do
Expand Down Expand Up @@ -51,7 +50,9 @@ def install
# ocaml files are in sync with the camlp5 files. If camlp5 has been
# compiled with an older version of the ocaml compiler, then an error
# "interface mismatch" will occur.
shell_output("#{bin}/camlp5 #{lib}/ocaml/camlp5/pa_o.cmo #{lib}/ocaml/camlp5/pr_o.cmo " \
shell_output("#{bin}/camlp5 #{lib}/ocaml/camlp5/pa_o.cmo " \
"#{lib}/ocaml/camlp5/o_keywords.cmo " \
"#{lib}/ocaml/camlp5/pr_o.cmo " \
"#{ocaml.opt_lib}/ocaml/str/str.cma hi.ml")
end
end
9 changes: 9 additions & 0 deletions Formula/c/coq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Coq < Formula
url "https://github.com/coq/coq/releases/download/V8.19.1/coq-8.19.1.tar.gz"
sha256 "1e535ed924234f18394efce94b12d9247a67e8af29241eb79615804160f21674"
license "LGPL-2.1-only"
revision 1
head "https://github.com/coq/coq.git", branch: "master"

livecheck do
Expand Down Expand Up @@ -31,6 +32,10 @@ class Coq < Formula
uses_from_macos "unzip" => :build

def install
# Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805
if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist?
ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf"
end
ENV.prepend_path "OCAMLPATH", Formula["ocaml-zarith"].opt_lib/"ocaml"
ENV.prepend_path "OCAMLPATH", Formula["ocaml-findlib"].opt_lib/"ocaml"
system "./configure", "-prefix", prefix,
Expand All @@ -49,6 +54,10 @@ def install
end

test do
# Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805
if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist?
ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf"
end
(testpath/"testing.v").write <<~EOS
Require Coq.micromega.Lia.
Require Coq.ZArith.ZArith.
Expand Down
1 change: 1 addition & 0 deletions Formula/h/hyperkit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
url "https://github.com/moby/hyperkit/archive/refs/tags/v0.20210107.tar.gz"
sha256 "095f5f5ef550d7cad10e4d13e9c9ce8b58cc319d654a6d837d8d87ee70537835"
license "BSD-2-Clause"
revision 1

bottle do
sha256 cellar: :any_skip_relocation, ventura: "3b67078315551718bc3c752b943b933713ddb69058f3cb72a0f65faa6e9295ab"
Expand Down Expand Up @@ -47,7 +48,7 @@
man1.install "hyperkit.1"
end

test do

Check warning on line 51 in Formula/h/hyperkit.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

`brew test --verbose hyperkit` failed on macOS Sonoma (14)!

/usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/bin/bundle clean ==> Testing hyperkit ==> /usr/local/Cellar/hyperkit/0.20210107_1/bin/hyperkit -v 2>&1 /usr/bin/env tar --extract --no-same-owner --file /Users/brew/Library/Caches/Homebrew/downloads/840a6f58d851f8ac4dbfee434980e81b172cdb88593b1f5bfacf1fb074f981c5--tinycorelinux_8.x.tar.gz --directory /private/tmp/homebrew-unpack20240604-95580-8zm55f /usr/bin/env cp -pR /private/tmp/homebrew-unpack20240604-95580-8zm55f/tinycorelinux_8.x/. /private/tmp/hyperkit--tinycorelinux-20240604-95580-z1d0wq/tinycorelinux_8.x ==> expect test_hyperkit.exp spawn /usr/local/Cellar/hyperkit/0.20210107_1/bin/hyperkit -A -m 512M -s 0:0,hostbridge -s 31,lpc -l com1,stdio -f kexec,./vmlinuz,./initrd.gz,earlyprintk=serial console=ttyS0 Using fd 8 for I/O notifications send: spawn id exp6 not open while executing "send "sudo halt\r\n"" (file "test_hyperkit.exp" line 17) Error: hyperkit: failed ::error::hyperkit: failed An exception occurred within a child process: BuildError: Failed executing: expect test_hyperkit.exp /usr/local/Homebrew/Library/Homebrew/formula.rb:3042:in `block in system' /usr/local/Homebrew/Library/Homebrew/formula.rb:2978:in `open' /usr/local/Homebrew/Library/Homebrew/formula.rb:2978:in `system' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/call_validation.rb:270:in `bind_call' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/call_validation.rb:270:in `validate_call' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/_methods.rb:277:in `block in _on_method_added' /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/h/hyperkit.rb:84:in `block in <class:Hyperkit>' /usr/local/Homebrew/Library/Homebrew/formula.rb:2784:in `block (3 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/extend/kernel.rb:528:in `with_env' /usr/local/Homebrew/Library/Homebrew/formula.rb:2783:in `block (2 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/formula.rb:1189:in `with_logging' /usr/local/Homebrew/Library/Homebrew/formula.rb:2782:in `block in run_test' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `block in run' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `chdir' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `run' /usr/local/Homebrew/Library/Homebrew/formula.rb:3093:in `mktemp' /usr/local/Homebrew/Library/Homebrew/formula.rb:2776:in `run_test' /usr/local/Homebrew/Library/Homebrew/test.rb:46:in `block in <main>' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:186:in `block in timeout' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:41:in `handle_timeout' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:195:in `timeout' /usr/local/Homebrew/Library/Homebrew/test.rb:50:in `<main>'

Check failure on line 51 in Formula/h/hyperkit.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

`brew test --verbose hyperkit` failed on macOS Ventura (13)!

/usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/bin/bundle clean ==> Testing hyperkit ==> /usr/local/Cellar/hyperkit/0.20210107_1/bin/hyperkit -v 2>&1 /usr/bin/env tar --extract --no-same-owner --file /Users/brew/Library/Caches/Homebrew/downloads/840a6f58d851f8ac4dbfee434980e81b172cdb88593b1f5bfacf1fb074f981c5--tinycorelinux_8.x.tar.gz --directory /private/tmp/homebrew-unpack20240604-95904-d9qjou /usr/bin/env cp -pR /private/tmp/homebrew-unpack20240604-95904-d9qjou/tinycorelinux_8.x/. /private/tmp/hyperkit--tinycorelinux-20240604-95904-14e20l/tinycorelinux_8.x ==> expect test_hyperkit.exp spawn /usr/local/Cellar/hyperkit/0.20210107_1/bin/hyperkit -A -m 512M -s 0:0,hostbridge -s 31,lpc -l com1,stdio -f kexec,./vmlinuz,./initrd.gz,earlyprintk=serial console=ttyS0 Using fd 8 for I/O notifications send: spawn id exp6 not open while executing "send "sudo halt\r\n"" (file "test_hyperkit.exp" line 17) Error: hyperkit: failed ::error::hyperkit: failed An exception occurred within a child process: BuildError: Failed executing: expect test_hyperkit.exp /usr/local/Homebrew/Library/Homebrew/formula.rb:3042:in `block in system' /usr/local/Homebrew/Library/Homebrew/formula.rb:2978:in `open' /usr/local/Homebrew/Library/Homebrew/formula.rb:2978:in `system' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/call_validation.rb:270:in `bind_call' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/call_validation.rb:270:in `validate_call' /usr/local/Homebrew/Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/sorbet-runtime-0.5.11406/lib/types/private/methods/_methods.rb:277:in `block in _on_method_added' /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/h/hyperkit.rb:84:in `block in <class:Hyperkit>' /usr/local/Homebrew/Library/Homebrew/formula.rb:2784:in `block (3 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/extend/kernel.rb:528:in `with_env' /usr/local/Homebrew/Library/Homebrew/formula.rb:2783:in `block (2 levels) in run_test' /usr/local/Homebrew/Library/Homebrew/formula.rb:1189:in `with_logging' /usr/local/Homebrew/Library/Homebrew/formula.rb:2782:in `block in run_test' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `block in run' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `chdir' /usr/local/Homebrew/Library/Homebrew/mktemp.rb:75:in `run' /usr/local/Homebrew/Library/Homebrew/formula.rb:3093:in `mktemp' /usr/local/Homebrew/Library/Homebrew/formula.rb:2776:in `run_test' /usr/local/Homebrew/Library/Homebrew/test.rb:46:in `block in <main>' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:186:in `block in timeout' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:41:in `handle_timeout' /usr/local/Homebrew/Library/Homebrew/vendor/portable-ruby/3.3.2/lib/ruby/3.3.0/timeout.rb:195:in `timeout' /usr/local/Homebrew/Library/Homebrew/test.rb:50:in `<main>'
assert_match(version.to_s, shell_output("#{bin}/hyperkit -v 2>&1"))

if Hardware::CPU.features.include? :vmx
Expand Down
1 change: 1 addition & 0 deletions Formula/l/ledit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Ledit < Formula
version "2.06"
sha256 "9fb4fe256ca9e878a0b47dfd43b4c64c6a3f089c9e76193b2db347f0d90855be"
license "BSD-3-Clause"
revision 1

livecheck do
url :stable
Expand Down
12 changes: 11 additions & 1 deletion Formula/m/math-comp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class MathComp < Formula
url "https://github.com/math-comp/math-comp/archive/refs/tags/mathcomp-1.19.0.tar.gz"
sha256 "786db902d904347f2108ffceae15ba29037ff8e63a6c58b87928f08671456394"
license "CECILL-B"
revision 2
revision 3
head "https://github.com/math-comp/math-comp.git", branch: "master"

bottle do
Expand All @@ -22,6 +22,11 @@ class MathComp < Formula
depends_on "coq"

def install
# Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805
if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist?
ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf"
end

coqlib = "#{lib}/coq/"

(buildpath/"mathcomp/Makefile.coq.local").write <<~EOS
Expand All @@ -40,6 +45,11 @@ def install
end

test do
# Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805
if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist?
ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf"
end

(testpath/"testing.v").write <<~EOS
From mathcomp Require Import ssreflect seq.

Expand Down
21 changes: 21 additions & 0 deletions Formula/m/menhir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Menhir < Formula
url "https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/menhir-20231231.tar.bz2"
sha256 "fb76a37b84e28acd3ecf58efea3abc8c7a9a70987a44915837e81093a7853d3a"
license "GPL-3.0-or-later"
revision 1

bottle do
sha256 cellar: :any, arm64_sonoma: "182247d95722654249f03821183168020c5fd2c8dfc2cb537f7849113d55077f"
Expand All @@ -19,6 +20,11 @@ class Menhir < Formula
depends_on "ocamlbuild" => :build
depends_on "ocaml"

# Allow to compile with OCaml >= 5.2.0
# Shall be removed once the first new version of menhir after 20231231 is released.
# https://gitlab.inria.fr/fpottier/menhir/-/commit/9b49658fc64736511ec41a06bb474afbf3dc6690
patch :DATA

def install
system "dune", "build", "@install"
system "dune", "install", "--prefix=#{prefix}", "--mandir=#{man}"
Expand Down Expand Up @@ -47,3 +53,18 @@ def install
assert_predicate testpath/"test.mli", :exist?
end
end

__END__
diff --git a/sdk/cmly_api.ml b/sdk/cmly_api.ml
index acbb8714..88c93951 100644
--- a/sdk/cmly_api.ml
+++ b/sdk/cmly_api.ml
@@ -146,7 +146,7 @@ module type GRAMMAR = sig
val default_reduction : t -> production option

val reductions : t -> (terminal * production list) list
- [@@@ocaml.deprecated "Please use [get_reductions]"]
+ [@@ocaml.deprecated "Please use [get_reductions]"]
end

module Print : sig
2 changes: 1 addition & 1 deletion Formula/o/ocaml-findlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class OcamlFindlib < Formula
url "http://download.camlcity.org/download/findlib-1.9.6.tar.gz"
sha256 "2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2"
license "MIT"
revision 1
revision 2

livecheck do
url "http://download.camlcity.org/download/"
Expand Down
1 change: 1 addition & 0 deletions Formula/o/ocaml-num.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class OcamlNum < Formula
url "https://github.com/ocaml/num/archive/refs/tags/v1.5.tar.gz"
sha256 "7ae07c8f5601e2dfc5008a62dcaf2719912ae596a19365c5d7bdf2230515959a"
license "LGPL-2.1"
revision 1

bottle do
sha256 cellar: :any, arm64_sonoma: "6a837fdd87b83bdb4db4602fc9942dad50624c7d99481f41b99716bf592aee85"
Expand Down
2 changes: 1 addition & 1 deletion Formula/o/ocaml-zarith.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class OcamlZarith < Formula
url "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.13.tar.gz"
sha256 "a5826d33fea0103ad6e66f92583d8e075fb77976de893ffdd73ada0409b3f83b"
license "LGPL-2.0-only"
revision 1
revision 2

bottle do
sha256 cellar: :any, arm64_sonoma: "932642604c05ad5bb0d69c83b846263480e871dd637a07b25dadd3c9819dd282"
Expand Down
4 changes: 2 additions & 2 deletions Formula/o/ocaml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
class Ocaml < Formula
desc "General purpose programming language in the ML family"
homepage "https://ocaml.org/"
url "https://caml.inria.fr/pub/distrib/ocaml-5.1/ocaml-5.1.0.tar.xz"
sha256 "6ce8db393aafc264e5af731c68fbeb20920ab6ae84d5bf93511965b7423351ab"
url "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0.tar.xz"
sha256 "2f4bf479f51479f9bf8c7f1694a6ea7336bbf774f4ad6da6b59d1ad4939dd8a7"
license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" }
head "https://github.com/ocaml/ocaml.git", branch: "trunk"

Expand Down
Loading