ocaml 5.1.0; ocaml@4 4.14.1 (new formula); ledit 2.06

Aliases/ocaml@5

@@ -0,0 +1 @@
+../Formula/o/ocaml.rb

Formula/c/camlp-streams.rb

@@ -4,6 +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
 
   bottle do
     sha256 cellar: :any,                 arm64_sonoma:   "e329a416fd6e58bde5d1b39a4ac5a194960f398b2e825c9b819c656d3729cb11"
@@ -28,6 +29,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/"test.ml").write <<~EOS
       let stream = Stream.of_list ([] : unit list)
     EOS

Formula/c/camlp5.rb

@@ -4,6 +4,7 @@ class Camlp5 < Formula
   url "https://github.com/camlp5/camlp5/archive/refs/tags/8.02.01.tar.gz"
   sha256 "58d4bce0c20fa1151fc2c15f172f5884472e2044a4b0da22aababf46c361e515"
   license "BSD-3-Clause"
+  revision 1
   head "https://github.com/camlp5/camlp5.git", branch: "master"
 
   livecheck do
@@ -48,11 +49,11 @@ def install
     ocaml = Formula["ocaml"]
     (testpath/"hi.ml").write "print_endline \"Hi!\";;"
     assert_equal "let _ = print_endline \"Hi!\"",
-      # The purpose of linking with the file "bigarray.cma" is to ensure that the
+      # The purpose of linking with the file "str.cma" is to ensure that the
       # 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 " \
-                   "#{ocaml.opt_lib}/ocaml/bigarray.cma hi.ml")
+                   "#{ocaml.opt_lib}/ocaml/str/str.cma hi.ml")
   end
 end

Formula/c/coccinelle.rb

@@ -1,13 +1,40 @@
 class Coccinelle < Formula
   desc "Program matching and transformation engine for C code"
   homepage "https://coccinelle.lip6.fr/"
-  url "https://github.com/coccinelle/coccinelle.git",
-      tag:      "1.1.1",
-      revision: "5444e14106ff17404e63d7824b9eba3c0e7139ba"
   license "GPL-2.0-only"
   revision 1
   head "https://github.com/coccinelle/coccinelle.git", branch: "master"
 
+  stable do
+    url "https://github.com/coccinelle/coccinelle.git",
+        tag:      "1.1.1",
+        revision: "5444e14106ff17404e63d7824b9eba3c0e7139ba"
+
+    # Backport compatibility with OCaml 5. Remove in the next release.
+    patch do
+      url "https://github.com/coccinelle/coccinelle/commit/f13b03aa20a08e5187ce36bfd5e606f18acd2888.patch?full_index=1"
+      sha256 "84f06551652d9fcee63451fe8d3bce3845c01fe054087cde50bb3b8308014445"
+    end
+    patch do
+      url "https://github.com/coccinelle/coccinelle/commit/1d0733a27006b06eef712f541000a8bf10246804.patch?full_index=1"
+      sha256 "391ee079fc18ac4727af089fdf686cd41d4b2ba7847c4bcf2b3b04caf5b6d457"
+    end
+
+    # Backport usage of non-bundled packages to allow versions installed by opam
+    patch do
+      url "https://github.com/coccinelle/coccinelle/commit/3f54340c8ac907e528dbe1475a4a7141e77b9cdd.patch?full_index=1"
+      sha256 "94b23b53c023270368601bc5debefc918a99f87b7489e25acddf9c967ddb4486"
+    end
+    patch do
+      url "https://github.com/coccinelle/coccinelle/commit/2afa9f669b565badf17104176cc4850a2dff67f6.patch?full_index=1"
+      sha256 "882fe080f7fbce4b0f08b8854a5b02212c17efbc2a62c145eae562842d8e2337"
+    end
+    patch do
+      url "https://github.com/coccinelle/coccinelle/commit/d9ce82a556e313684af74912cf204bb902e04436.patch?full_index=1"
+      sha256 "4b27d81d27363efb1a83064abba1df1c09a1f1f064c81cc621ca61b79f58d83e"
+    end
+  end
+
   livecheck do
     url :stable
     regex(/^v?(\d+(?:\.\d+)+)$/i)
@@ -30,42 +57,28 @@
   depends_on "ocaml-findlib" => :build
   depends_on "opam" => :build
   depends_on "pkg-config" => :build
+  depends_on "[email protected]" => :build
   depends_on "ocaml"
   depends_on "pcre"
 
   uses_from_macos "unzip" => :build
 
-  # Bootstrap resource for Ocaml 4.12 compatibility.
-  # Remove when Coccinelle supports Ocaml 4.12 natively
-  resource "stdcompat" do
-    url "https://github.com/thierry-martinez/stdcompat/releases/download/v15/stdcompat-15.tar.gz"
-    sha256 "5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5"
-  end
-
   def install
-    resource("stdcompat").stage do
-      system "./configure", "--prefix=#{buildpath}/bootstrap"
-      ENV.deparallelize { system "make" }
-      system "make", "install"
-    end
-    ENV.prepend_path "OCAMLPATH", buildpath/"bootstrap/lib"
-
     Dir.mktmpdir("opamroot") do |opamroot|
       ENV["OPAMROOT"] = opamroot
       ENV["OPAMYES"] = "1"
       ENV["OPAMVERBOSE"] = "1"
       system "opam", "init", "--no-setup", "--disable-sandboxing"
+      system "opam", "exec", "--", "opam", "install", ".", "--deps-only", "-y", "--no-depexts"
       system "./autogen"
-      system "opam", "config", "exec", "--", "./configure",
-                            "--disable-dependency-tracking",
-                            "--enable-release",
-                            "--enable-ocaml",
-                            "--enable-opt",
-                            "--with-pdflatex=no",
-                            "--prefix=#{prefix}",
-                            "--libdir=#{lib}"
+      system "opam", "exec", "--", "./configure", *std_configure_args,
+                                                  "--disable-silent-rules",
+                                                  "--enable-ocaml",
+                                                  "--enable-opt",
+                                                  "--without-pdflatex",
+                                                  "--with-bash-completion=#{bash_completion}"
       ENV.deparallelize
-      system "opam", "config", "exec", "--", "make"
+      system "opam", "exec", "--", "make"
       system "make", "install"
     end
 

Formula/c/comby.rb

@@ -1,4 +1,4 @@
 class Comby < Formula
   desc "Tool for changing code across many languages"
   homepage "https://comby.dev"
   url "https://github.com/comby-tools/comby/archive/refs/tags/1.8.1.tar.gz"
@@ -20,7 +20,7 @@
 
   depends_on "autoconf" => :build
   depends_on "gmp" => :build
-  depends_on "ocaml" => :build
+  depends_on "ocaml@4" => :build # https://github.com/comby-tools/comby/issues/358
   depends_on "opam" => :build
   depends_on "pkg-config" => :build
   depends_on "gmp"

Formula/l/ledit.rb

@@ -1,9 +1,9 @@
 class Ledit < Formula
   desc "Line editor for interactive commands"
   homepage "https://pauillac.inria.fr/~ddr/ledit/"
-  url "https://github.com/chetmurthy/ledit/archive/refs/tags/ledit-2-05.tar.gz"
-  version "2.05"
-  sha256 "493ee6eae47cc92f1bee5f3c04a2f7aaa0812e4bdf17e03b32776ab51421392c"
+  url "https://github.com/chetmurthy/ledit/archive/refs/tags/ledit-2-06.tar.gz"
+  version "2.06"
+  sha256 "9fb4fe256ca9e878a0b47dfd43b4c64c6a3f089c9e76193b2db347f0d90855be"
   license "BSD-3-Clause"
 
   livecheck do
@@ -28,13 +28,27 @@ class Ledit < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "ec38d1627d6277d03b8a607a91d6d1d7c43b8f4287b15393e0a26cac27d04e06"
   end
 
+  depends_on "ocaml-findlib" => :build
+  depends_on "camlp-streams"
   depends_on "camlp5"
   depends_on "ocaml"
 
+  # Backport Makefile fixes. Remove in the next release.
+  patch do
+    url "https://github.com/chetmurthy/ledit/commit/3dbd668d9c69aab5ccd61f6b906c14122ae3271d.patch?full_index=1"
+    sha256 "f5aafe054a5daa97d311155931bc997f1065b20acfdf23211fbcbf1172fd7e97"
+  end
+
   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
+
     # like camlp5, this build fails if the jobs are parallelized
     ENV.deparallelize
-    args = %W[BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}]
+    args = %W[BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man1}]
+    args << "CUSTOM=" if OS.linux? # Work around brew corrupting appended bytecode
     system "make", *args
     system "make", "install", *args
   end

Formula/o/ocaml-findlib.rb

@@ -1,9 +1,10 @@
 class OcamlFindlib < Formula
   desc "OCaml library manager"
   homepage "http://projects.camlcity.org/projects/findlib.html"
   url "http://download.camlcity.org/download/findlib-1.9.6.tar.gz"
   sha256 "2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2"
   license "MIT"
+  revision 1
 
   livecheck do
     url "http://download.camlcity.org/download/"
@@ -45,6 +46,10 @@
 
     # Avoid conflict with ocaml-num package
     rm_rf Dir[lib/"ocaml/num", lib/"ocaml/num-top"]
+
+    # Save extra findlib.conf to work around https://github.com/Homebrew/homebrew-test-bot/issues/805
+    libexec.mkpath
+    cp etc/"findlib.conf", libexec/"findlib.conf"
   end
 
   test do

Formula/o/ocaml-num.rb

@@ -1,10 +1,10 @@
 class OcamlNum < Formula
   desc "OCaml legacy Num library for arbitrary-precision arithmetic"
   homepage "https://github.com/ocaml/num"
   url "https://github.com/ocaml/num/archive/refs/tags/v1.4.tar.gz"
   sha256 "015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24"
   license "LGPL-2.1"
-  revision 3
+  revision 4
 
   bottle do
     sha256 cellar: :any,                 arm64_sonoma:   "c9fa6f0a88f6aae923bba24c8dbd7355e65523d4fd72b8b80260f4dee7d072eb"
@@ -23,6 +23,11 @@
   depends_on "ocaml"
 
   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["OCAMLFIND_DESTDIR"] = lib/"ocaml"
 
     (lib/"ocaml").mkpath

Formula/o/ocaml-zarith.rb

@@ -1,9 +1,10 @@
 class OcamlZarith < Formula
   desc "OCaml library for arbitrary-precision arithmetic"
   homepage "https://github.com/ocaml/Zarith"
   url "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.13.tar.gz"
   sha256 "a5826d33fea0103ad6e66f92583d8e075fb77976de893ffdd73ada0409b3f83b"
   license "LGPL-2.0-only"
+  revision 1
 
   bottle do
     sha256 cellar: :any,                 arm64_sonoma:   "30941c4d36a66cd0fdb3ba0204f4f93a18ee4a68d92d5952db4a5834f50321a9"
@@ -22,6 +23,11 @@
   depends_on "ocaml"
 
   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["OCAMLFIND_DESTDIR"] = lib/"ocaml"
 
     (lib/"ocaml").mkpath

Formula/o/ocaml.rb

@@ -1,4 +1,4 @@
 # OCaml does not preserve binary compatibility across compiler releases,
 # so when updating it you should ensure that all dependent packages are
 # also updated by incrementing their revisions.
 #
@@ -13,19 +13,11 @@
 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"
   license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" }
   head "https://github.com/ocaml/ocaml.git", branch: "trunk"
 
-  stable do
-    url "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0.tar.xz"
-    sha256 "36abd8cca53ff593d5e7cd8b98eee2f1f36bd49aaf6ff26dc4c4dd21d861ac2b"
-
-    # Remove use of -flat_namespace. Upstreamed at
-    # https://github.com/ocaml/ocaml/pull/10723
-    # We embed a patch here so we don't have to regenerate configure.
-    patch :DATA
-  end
-
   livecheck do
     url "https://ocaml.org/releases"
     regex(%r{href=.*?/releases/v?(\d+(?:\.\d+)+)/?["']}i)
@@ -74,16 +66,3 @@
     assert_match HOMEBREW_PREFIX.to_s, shell_output("#{bin}/ocamlc -where")
   end
 end
-
-__END__
---- a/configure
-+++ b/configure
-@@ -14087,7 +14087,7 @@ if test x"$enable_shared" != "xno"; then :
-   case $host in #(
-   *-apple-darwin*) :
-     mksharedlib="$CC -shared \
--                   -flat_namespace -undefined suppress -Wl,-no_compact_unwind \
-+                   -undefined dynamic_lookup -Wl,-no_compact_unwind \
-                    \$(LDFLAGS)"
-       supports_shared_libraries=true ;; #(
-   *-*-mingw32) :

Formula/o/ocaml@4.rb

@@ -0,0 +1,67 @@
+# OCaml does not preserve binary compatibility across compiler releases,
+# so when updating it you should ensure that all dependent packages are
+# also updated by incrementing their revisions.
+#
+# Applications that really shouldn't break on a compiler update are:
+# - coccinelle
+class OcamlAT4 < Formula
+  desc "General purpose programming language in the ML family"
+  homepage "https://ocaml.org/"
+  url "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.1.tar.xz"
+  sha256 "c127974d0242576cf47061b20aa9c86d17be0d6aa9687f6ec9835de67be7bb6f"
+  license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" }
+
+  livecheck do
+    url "https://ocaml.org/releases"
+    regex(%r{href=.*?/releases/v?(4(?:\.\d+)+)/?["']}i)
+  end
+
+  # The ocaml compilers embed prefix information in weird ways that the default
+  # brew detection doesn't find, and so needs to be explicitly blocked.
+  pour_bottle? only_if: :default_prefix
+
+  keg_only :versioned_formula
+
+  # Fix -flat_namespace being used on Big Sur and later.
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/formula-patches/03cf8088210822aa2c1ab544ed58ea04c897d9c4/libtool/configure-big_sur.diff"
+    sha256 "35acd6aebc19843f1a2b3a63e880baceb0f5278ab1ace661e57a502d9d78c93c"
+  end
+
+  # Remove use of -flat_namespace. Upstreamed at
+  # https://github.com/ocaml/ocaml/pull/10723
+  # We embed a patch here so we don't have to regenerate configure.
+  patch :DATA
+
+  def install
+    ENV.deparallelize # Builds are not parallel-safe, esp. with many cores
+
+    # the ./configure in this package is NOT a GNU autoconf script!
+    args = %W[
+      --prefix=#{prefix}
+      --enable-debug-runtime
+      --mandir=#{man}
+    ]
+    system "./configure", *args
+    system "make", "world.opt"
+    system "make", "prefix=#{prefix}", "install"
+  end
+
+  test do
+    output = pipe_output("#{bin}/ocaml 2>&1", "let x = 1 ;;")
+    assert_match "val x : int = 1", output
+  end
+end
+
+__END__
+--- a/configure
++++ b/configure
+@@ -14087,7 +14087,7 @@ if test x"$enable_shared" != "xno"; then :
+   case $host in #(
+   *-apple-darwin*) :
+     mksharedlib="$CC -shared \
+-                   -flat_namespace -undefined suppress -Wl,-no_compact_unwind \
++                   -undefined dynamic_lookup -Wl,-no_compact_unwind \
+                    \$(LDFLAGS)"
+       supports_shared_libraries=true ;; #(
+   *-*-mingw32) :

Formula/o/ott.rb

@@ -1,4 +1,4 @@
 class Ott < Formula
   desc "Tool for writing definitions of programming languages and calculi"
   homepage "https://www.cl.cam.ac.uk/~pes20/ott/"
   url "https://github.com/ott-lang/ott/archive/refs/tags/0.32.tar.gz"
@@ -24,7 +24,7 @@
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "0ca84d7f68137c731edd143156701f3abca196a1aacfc36120ec31b545549a55"
   end
 
-  depends_on "ocaml" => :build
+  depends_on "ocaml@4" => :build
 
   def install
     system "make", "world"

Formula/s/stanc3.rb

@@ -1,7 +1,9 @@
 class Stanc3 < Formula
   desc "Stan transpiler"
   homepage "https://github.com/stan-dev/stanc3"
   # git is needed for dune subst
+  # TODO: Update `ocaml@4` dependency to `ocaml` on next release as OCaml 4.14 PR
+  # also adds support for OCaml 5: https://github.com/stan-dev/stanc3/pull/1366
   url "https://github.com/stan-dev/stanc3.git",
       tag:      "v2.32.2",
       revision: "bcbf83c52c76018ce4a6cd86233de1601ddf9422"
@@ -19,7 +21,7 @@
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "5e684d8fd2b13d3d1f02fc304e8b6bf205288a8806fbdbbbfffc9ca10480465f"
   end
 
-  depends_on "ocaml" => :build
+  depends_on "ocaml@4" => :build
   depends_on "opam" => :build
 
   uses_from_macos "unzip" => :build