Merge pull request #154837 from cho-m/ocaml-5.1.0

ocaml 5.1.0; ocaml@4 4.14.1 (new formula); ledit 2.06
Homebrew · Dec 1, 2023 · a71a2bd · a71a2bd
2 parents fb888a2 + fd8a69d
commit a71a2bd
Show file tree

Hide file tree

Showing 13 changed files with 249 additions and 165 deletions.
diff --git a/Aliases/ocaml@5 b/Aliases/ocaml@5
@@ -0,0 +1 @@
+../Formula/o/ocaml.rb
diff --git a/Formula/c/camlp-streams.rb b/Formula/c/camlp-streams.rb
@@ -4,18 +4,16 @@ 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"
-    sha256 cellar: :any,                 arm64_ventura:  "71fce4c1acb3764add19c7bc62932779d6eba6bd5a71c5eb0da1f1d94631f58f"
-    sha256 cellar: :any,                 arm64_monterey: "1aa419c01a3ca2738adf10d613def4cb213efea7c7af7682246287ef5a96a09a"
-    sha256 cellar: :any,                 arm64_big_sur:  "551ca86de9bdb769f0f22de773eb4a93f9faf31193f6b8833e39d30efe15fa03"
-    sha256 cellar: :any,                 sonoma:         "105139063c2a04638025f44bae454692f5cf2782fe977abbe6294319727109e0"
-    sha256 cellar: :any,                 ventura:        "0a47174a14ce39c3f2c3b1528a01365a2fd3269533f0eb7b6605faf698fb7545"
-    sha256 cellar: :any,                 monterey:       "f4fd0d6a51abb24f93fea4e7326dce470808aa5d6f2a8aca2750cd4bc9987174"
-    sha256 cellar: :any,                 big_sur:        "ee7ac1eda08673f956c10805187f58271fc1867522d93c004ebdbc085ca822af"
-    sha256 cellar: :any,                 catalina:       "0ef92902025844dd1abbe5fdc3f3c8e114b090738e6022f68d72c21aa608b9d3"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "81e1d03158ed662d6266ae792dcb9145c042c61c0d3bd2b0e1079f8e42d6c72b"
+    sha256 cellar: :any,                 arm64_sonoma:   "1ab3f2156883e27bcfeff416cccb5e6f5e32102a52640299c5d6ca561b0b09f4"
+    sha256 cellar: :any,                 arm64_ventura:  "ee43234549a20178bcc759f2b630f68869c956527061079b3203091358c49195"
+    sha256 cellar: :any,                 arm64_monterey: "c88d7c4203e0111c6f21c6db54bfeb963e7962025741659d827a4153a096f3e0"
+    sha256 cellar: :any,                 sonoma:         "909acae960bc459db4f9f721801086296809a7b85db919229cc26ae67457f92e"
+    sha256 cellar: :any,                 ventura:        "e57d2a7c4e1ed7d865c72f6e0699a5e8439b22b76cff119ca10f41ccaf38ac92"
+    sha256 cellar: :any,                 monterey:       "584919e25737e013998be682d4cb0b79a512dd37180444e134f853c254586fd6"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "c23521a07bf157dc5f7fd018fdc804149a5e4c4acb375db87f1396bf50a1321c"
   end
 
   depends_on "dune" => :build
@@ -28,6 +26,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

diff --git a/Formula/c/camlp5.rb b/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
@@ -12,15 +13,13 @@ class Camlp5 < Formula
   end
 
   bottle do
-    sha256 arm64_sonoma:   "68bc1221b21f49d08586934bc06f19a62eef0308b92aa6257b5313e3f97e08e3"
-    sha256 arm64_ventura:  "b66cf027c5621a927617b974a01507b903b60f92aed85458b50bd1571241cb69"
-    sha256 arm64_monterey: "3176a9e4b1bf08b23615ada8387811cf2d63b8acbc18d1e1d4645007350a0bab"
-    sha256 arm64_big_sur:  "087ce00b6ef3367386236ba7832c658b01fe0e41288647f4a9a41dd304e6aebd"
-    sha256 sonoma:         "056cdf35c1cc5a6dfac714380f69cc3851d535464ef347af7ed70a866ddb3015"
-    sha256 ventura:        "7043d9895aa1e64a3ac4a7a9f26778770dd91b17a8507e35b43614f84d7dac21"
-    sha256 monterey:       "dcbffb83005849f1446742c2ba704577a495e2ef9ca82375d87b03d76640d977"
-    sha256 big_sur:        "dcc8d08791e3b42d7faba7faeebc3dc2c0fd17d23b730ad5a4dd468ad5d4d862"
-    sha256 x86_64_linux:   "16ba10a0ccfbda37bbed0d5513c5c7d4f82e5f7b40c102c48024429ddd4635d2"
+    sha256 arm64_sonoma:   "b759ee090fbf543cdc3fc06316f6e49688031dadc5f596dcb7d202c5e9b6259d"
+    sha256 arm64_ventura:  "fecb24a088b59346812faa716de555a939e6ff0efd38cec825ce4178834c3ba7"
+    sha256 arm64_monterey: "6b9fb48113e2cb84683f72fa3744da3bbe00f483df59ea1e07016a2e06352a9f"
+    sha256 sonoma:         "23da0a4d852c4d00da8523d2a2303b482dbddd40a9eb8d674f87907d9f718937"
+    sha256 ventura:        "07d9c205a10282211954729926982a14215def6e5ebf511bba15a39d0f77adf4"
+    sha256 monterey:       "582c31c1fd609b1904515b878ce4a2f886391a042ae6b9de6d595dabf832fda9"
+    sha256 x86_64_linux:   "6dbd19efdc0c99cd9fb94ee55ce1b8d5f6ee12e73ae93a3146c5bdec602e04d3"
   end
 
   depends_on "ocaml-findlib" => :build
@@ -48,11 +47,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
diff --git a/Formula/c/coccinelle.rb b/Formula/c/coccinelle.rb
@@ -1,27 +1,54 @@
 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)
   end
 
   bottle do
-    sha256 arm64_ventura:  "c36d64915f8f1fb1d3f1b11affa180d87cce7c2fab525ca5d43e000d6552ac84"
-    sha256 arm64_monterey: "6d709b2576f84260edf15ed3a6c4e4b4e0cc73bde3819f9d9085f964c761b155"
-    sha256 arm64_big_sur:  "43e22010b8b1f3bf93817d161e2d0e96d907f4a38972d27f91d0231042f70860"
-    sha256 ventura:        "7d44848e93251045e263c647aa95c2fd7639ab2918dcdea672ea12115c0f922d"
-    sha256 monterey:       "9e00a25cc6afe398d4a5ae42300bacd883bf1f570e6c1523ffb43bd3d330ae30"
-    sha256 big_sur:        "270fe7690278277362ebf04707665ae41e3831c21e33d945408f2e7d9737669e"
-    sha256 catalina:       "27b442146b362f44848997fa840389ff9df05317e915147d289a74e1ef4c5a68"
-    sha256 x86_64_linux:   "29a0aeaeb102990cac27cdc3ecc713f2af6366f38c5d3cefb520ef70dcd2fa84"
+    rebuild 1
+    sha256 arm64_sonoma:   "ca6145d84ac088d6a9af56409383ee95fcdfc019d565f57a16ab6571b468df10"
+    sha256 arm64_ventura:  "cb7b2f3f20840b99f22efba6538fd4e7a6fa3868aa9f934c5722e26a968dc753"
+    sha256 arm64_monterey: "368b32215f0409f8686364f2d5f9fa6d6ef3896ae1baddba37ad34abc2021a8a"
+    sha256 sonoma:         "6e9fcb9482970a2459a8e6bc4b319cd06d555dbfcd6501ad5cae9d9fc8dad61b"
+    sha256 ventura:        "60b09a4b123954c6a206cfa471c8653622f9567f786eb183241b1cd55f412128"
+    sha256 monterey:       "108f9640319df581d2feb12d6f52540d7f30876d24f48547e2a901ddda474aed"
+    sha256 x86_64_linux:   "1d24df746aee06ce03219fb78ff208b30b7b14c666195e30623c9012c9f825ea"
   end
 
   depends_on "autoconf" => :build
@@ -30,42 +57,28 @@ class Coccinelle < Formula
   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
 

diff --git a/Formula/c/comby.rb b/Formula/c/comby.rb
@@ -6,21 +6,19 @@ class Comby < Formula
   license "Apache-2.0"
 
   bottle do
-    sha256 cellar: :any, arm64_sonoma:   "e1b1c09efa1955a2ae845e6783ef790f01f3afad0a170cc7f82f2b39d49b5a26"
-    sha256 cellar: :any, arm64_ventura:  "ead924a94b73aede202b3afc9146124efb1ac7b8416e0b0119a59cf2ab6d3310"
-    sha256 cellar: :any, arm64_monterey: "c75ee2deab2abc20778e51a40cbb7ca305948dc0e10c6e13e9d23004d26f8dfb"
-    sha256 cellar: :any, arm64_big_sur:  "886f0b5d1a6ac7075a18f3d0075578e81ae2462656a578cf61c344622629a5a4"
-    sha256 cellar: :any, sonoma:         "7ae11688f7baff37ed21570abb0615e0ae36103c1b8d83942bd7ee569b301544"
-    sha256 cellar: :any, ventura:        "535c3320832e70d126405a7535298c615dfdaa66e0ee0ddceaae680d3f189113"
-    sha256 cellar: :any, monterey:       "8e84488e24e0df5a5bbee5a2df201eb1027c90d177ebcd8bf030c91dec47d636"
-    sha256 cellar: :any, big_sur:        "72ce5e95f8772bc54d8d8706ed06e08ab99b9a6eb2682d8fea480ed1be202704"
-    sha256 cellar: :any, catalina:       "7519ef48876a5d5b3636556b0b6987c1c9ec7b568d299c49b849036aafcb61bb"
-    sha256               x86_64_linux:   "275be90d9ac8149c51abc9c5fc972e7aff125326cdadfd1ed0f55a8d6d84dc15"
+    rebuild 1
+    sha256 cellar: :any, arm64_sonoma:   "9879569428b8a7bde2b56490bf6bd99cf5f0cdc1c524250af7173eae9b3b6621"
+    sha256 cellar: :any, arm64_ventura:  "375dd89916c279b00020467fdbb699d05807a6caf866ad35fa76d9adabcaff8b"
+    sha256 cellar: :any, arm64_monterey: "fb4cc78f0a4a95aa911d3bc4a619e53fae22a1bd5a4bbb94e17cdc849baa4485"
+    sha256 cellar: :any, sonoma:         "fb116fe361c37cefad3d3d4aa0d37a8a76264e2920d3d9d49c4996423aaab5d4"
+    sha256 cellar: :any, ventura:        "f46b53e793bbce9dd888ec53a90224566c2b52ce4c2db664f93a945a425ac52c"
+    sha256 cellar: :any, monterey:       "54ab143ff66d46db4a02ad2c373edabf4c9ad23af83c0fd4945dc66b41ce9772"
+    sha256               x86_64_linux:   "919a845aa0880568e9ca2288c6f390437a8e14a12a59a597e0b8e90f0f540b79"
   end
 
   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"

diff --git a/Formula/l/ledit.rb b/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
@@ -15,26 +15,36 @@ class Ledit < Formula
   end
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:   "6c6d44cbb79018e7eb08d9f3f2f94fde098e31dd971f1697f68c9170278029c7"
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "f4e5f04c79d703b1e22f1b49794bbf416135f209fcad88ae3bc043bc17114c1b"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "642349a8d05b4f9048fcd7d9fdf389e35d98b921e3d52bd06eee365b50a4f1e2"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "06141836398681d2250bf04d1bba965038f5f707482f0ecab1cc464c8a95bcfb"
-    sha256 cellar: :any_skip_relocation, sonoma:         "7a990f131f16b372437ad98b6708de1812b4e11d61acdaabda6197c86828ee03"
-    sha256 cellar: :any_skip_relocation, ventura:        "2f70d37553e6bb5b2e1953781022747f4f1d0659934ef5103e92baa10b481d70"
-    sha256 cellar: :any_skip_relocation, monterey:       "da6338af250d9b52557f52707b0730c379bdd8216c53e10477c351f72d6aa406"
-    sha256 cellar: :any_skip_relocation, big_sur:        "2d404ace597c8a7062fbe96e15e9e7d1226ec5ca97e0c8981062c77fef10b4eb"
-    sha256 cellar: :any_skip_relocation, catalina:       "158141ebf4edc253de428b8789d77eae0b19fdd4d8002e9910cf4c2486a12bb6"
-    sha256 cellar: :any_skip_relocation, mojave:         "463dd47cebd8510a630e39008b001e52659f64f1bcda7503bdc8a0f28e55adfc"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "ec38d1627d6277d03b8a607a91d6d1d7c43b8f4287b15393e0a26cac27d04e06"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:   "fb17134571471349a072e47eb5849e5ecc66006616fa77bf2363d04a8fa91446"
+    sha256 cellar: :any_skip_relocation, arm64_ventura:  "26e778db2994c1524b3b993e94eb642586c227cfe04b103e9ead54a557fa67ac"
+    sha256 cellar: :any_skip_relocation, arm64_monterey: "9799ea6b0736a0a266eabd35ca40719683f4cb9dfecf220f4f73f3de26ee3b5d"
+    sha256 cellar: :any_skip_relocation, sonoma:         "ab446bc5a875dc4527f05103db24700488cc32761aa241d18065ac6a66082971"
+    sha256 cellar: :any_skip_relocation, ventura:        "3b7c8d59ad0746dab63189ddc5fa9176b177c39404c368520be0cf03c9c14cca"
+    sha256 cellar: :any_skip_relocation, monterey:       "6fd3e1bcddb9d283dd6dbb8b84bb0dcab8ee5ec215bef0004be1c2a4991c912a"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "3521f1fe5b11e11d11a53c988888cf4807db6f5f17e420010e5c85a543ce7211"
   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

diff --git a/Formula/o/ocaml-findlib.rb b/Formula/o/ocaml-findlib.rb
@@ -4,23 +4,21 @@ class OcamlFindlib < Formula
   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/"
     regex(/href=.*?findlib[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
   bottle do
-    sha256 arm64_sonoma:   "27f8601cdaa2e36271662c1284a30353c6b1c22f45ef7ccc3a7a4a1a73b60d6c"
-    sha256 arm64_ventura:  "bac75b12905f7138e93455ef3c4599fd417448dccafec8cbf5cc63b7192b63c7"
-    sha256 arm64_monterey: "3b7dc9a49293c982c8b8fbb4bd3a979b652d9bf48b6ae6a915fe734960acb2d3"
-    sha256 arm64_big_sur:  "259a336b537993add90ebef09bc6473dfa39426ee80292d443307f36e77e8ac4"
-    sha256 sonoma:         "86ddb1564581e10c8f1c59bad5fae8126411a12cc0218eb3af2835557913f7e7"
-    sha256 ventura:        "c9731166502de936c4897ce2f9c50b0432ac81f53dd904569ef406a4ac7bcbae"
-    sha256 monterey:       "716c17abb924c7958ebad686f456cd3c19842ba334875ae0a91f1392df756815"
-    sha256 big_sur:        "d6e7046fbe14735edb44ce83654736a476357344009fe7fd497416ade6374c47"
-    sha256 catalina:       "ef1c177401fad930e6912ae5103326dc673913e0ec16d1bd730bcc6ba5a43cf8"
-    sha256 x86_64_linux:   "c319106538e9f3e0faecd3900c1ebd105ad9b39645e0952ed5cd14de9b8ef2e4"
+    sha256 arm64_sonoma:   "57ff114e13929f3b5382c78418a43b896cd2c4f3d9627d9017b1d94a2609489a"
+    sha256 arm64_ventura:  "377870c6a2a9a7e059136d3fb161e9cf0d48191f4e3df7fb7adfc7003e0527fc"
+    sha256 arm64_monterey: "ad81c990d61dbcee8f0ab536ac519f697e7839313290a3b3f9ccff2717100a07"
+    sha256 sonoma:         "187c3979f7d1a04e3e009a9c36d0943c5d6bf7ae780fdfb38a27e0923d31eea6"
+    sha256 ventura:        "a0fc2d66f141c96efbf271429b7655ca53f05ee1c33350822903807beb8a96d7"
+    sha256 monterey:       "32251158ac86cbfafb14df0866da222e540fa0c4a30a023e631fb411dc604a8d"
+    sha256 x86_64_linux:   "0d81ac15dc0af7b4675ca0c2a5f302594ed5f5a676af51066d7d9c0f8f41faf5"
   end
 
   depends_on "ocaml"
@@ -45,6 +43,10 @@ def install
 
     # 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