cknitt · Oct 18, 2026 · Oct 17, 2026 · Oct 17, 2026 · Oct 18, 2026 · Oct 18, 2026
diff --git a/.github/actions/setup-ocaml/action.yml b/.github/actions/setup-ocaml/action.yml
@@ -82,7 +82,7 @@ runs:
       run: |
         dependency_flags_key="${DEPENDENCY_FLAGS//--/}"
         dependency_flags_key="${dependency_flags_key// /_}"
-        dependency_hash="${{ hashFiles('*.opam', '.github/opam-repository/repo', '.github/opam-repository/packages/**') }}"
+        dependency_hash="${{ hashFiles('*.opam') }}"
         key="$CACHE_PREFIX-$OS-3.9.0-$COMPILER-$dependency_flags_key-$dependency_hash"
         echo "value=${key//,/-}" >> "$GITHUB_OUTPUT"
         echo "setup-version=3.9.0" >> "$GITHUB_OUTPUT"
@@ -131,7 +131,6 @@ runs:
       env:
         DEPENDENCY_FLAGS: ${{ inputs.dependency-flags }}
       run: |
-        opam repository add rescript-overrides "$GITHUB_WORKSPACE/.github/opam-repository"
         read -ra dependency_flags <<< "$DEPENDENCY_FLAGS"
         if [[ "$RUNNER_OS" == "Windows" ]]; then
           export AR=x86_64-w64-mingw32-ar

diff --git a/.github/opam-repository/README.md b/.github/opam-repository/README.md
diff --git a/.github/opam-repository/packages/luv/luv.0.5.14/files/arm64-musl-outline-atomics.patch b/.github/opam-repository/packages/luv/luv.0.5.14/files/arm64-musl-outline-atomics.patch
diff --git a/.github/opam-repository/packages/luv/luv.0.5.14/opam b/.github/opam-repository/packages/luv/luv.0.5.14/opam
diff --git a/.github/opam-repository/repo b/.github/opam-repository/repo
diff --git a/changes/luv-libuv-1-53.internal.md b/changes/luv-libuv-1-53.internal.md
@@ -0,0 +1 @@
+- Build the OCaml rewatch against libuv 1.53.0 via the rescript-lang/luv fork. https://github.com/rescript-lang/rescript/pull/8883
diff --git a/dune-project b/dune-project
@@ -35,7 +35,7 @@
   (cmdliner
    (= 2.1.1))
   (luv
-   (= 0.5.14))
+   (= 0.5.14+rescript.1))
   (re
    (= 1.14.0))
   (ounit2

diff --git a/rescript.opam b/rescript.opam
@@ -17,7 +17,7 @@ depends: [
   "yojson" {= "3.0.0"}
   "spawn" {= "v0.17.0"}
   "cmdliner" {= "2.1.1"}
-  "luv" {= "0.5.14"}
+  "luv" {= "0.5.14+rescript.1"}
   "re" {= "1.14.0"}
   "ounit2" {with-test & = "2.2.7"}
   "odoc" {with-doc}
@@ -39,3 +39,10 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+pin-depends: [
+  # libuv 1.53.0; https://github.com/rescript-lang/luv
+  [
+    "luv.0.5.14+rescript.1"
+    "git+https://github.com/rescript-lang/luv.git#2094c025da82482a8b71118a87e609f82666a2f6"
+  ]
+]
diff --git a/rescript.opam.template b/rescript.opam.template
@@ -0,0 +1,7 @@
+pin-depends: [
+  # libuv 1.53.0; https://github.com/rescript-lang/luv
+  [
+    "luv.0.5.14+rescript.1"
+    "git+https://github.com/rescript-lang/luv.git#2094c025da82482a8b71118a87e609f82666a2f6"
+  ]
+]
diff --git a/rewatch-ocaml/README.md b/rewatch-ocaml/README.md
@@ -123,8 +123,8 @@ These are intentional:
   ends its descendants.
 - **Pipes:** each child's stdout and stderr are drained by reader threads,
   because Windows can't `select` on anonymous pipes.
-- **Watching:** uses libuv through `luv`. `.github/opam-repository` holds a
-  patched luv package for static arm64 musl builds.
+- **Watching:** uses libuv through `luv`. `rescript.opam.template` pins luv
+  to a commit of the rescript-lang/luv fork (libuv 1.53).
 
 The test suite compiles `platform_windows.ml` on every platform, so the Windows
 backend is always type-checked. Its process and Job Object paths only run on
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Build the OCaml rewatch against libuv 1.53.0 via the rescript-lang/luv fork. https://github.com/rescript-lang/rescript/pull/8883