From f9c06aacd54f2ad8315531f153f82475b7beb91f Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 3 Aug 2025 12:41:15 -0700
Subject: [PATCH 1/2] ci: use released utop on OCaml 5.4

---
 .github/workflows/opam-ci.yml |  3 ---
 flake.lock                    | 14 +++++++-------
 flake.nix                     |  9 +++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/opam-ci.yml b/.github/workflows/opam-ci.yml
index 1c0e3c48f..658cf1f90 100644
--- a/.github/workflows/opam-ci.yml
+++ b/.github/workflows/opam-ci.yml
@@ -58,9 +58,6 @@ jobs:
           path: _opam
           key: opam-${{ matrix.setup.os }}-${{ matrix.setup.ocaml-compiler }}-${{ hashFiles('**.opam') }}
 
-      - name: Pin utop for OCaml 5.4
-        if: ${{ matrix.setup.ocaml-compiler == 'ocaml-base-compiler.5.4.0~alpha1' }}
-        run: opam pin add utop --dev-repo
       - name: Install dependencies
         run: opam install . --deps-only
 
diff --git a/flake.lock b/flake.lock
index d748ed7a4..4fbf825e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1751221602,
-        "narHash": "sha256-WpsgPoqYirgZJfTripq32LqflvHTRofZ8ONUWEBAfno=",
+        "lastModified": 1754239449,
+        "narHash": "sha256-MuBdH0pXcN0wVb57Y92ppAd2mQ/z6pJj+jxBjMUQ84g=",
         "owner": "nix-ocaml",
         "repo": "nix-overlays",
-        "rev": "82012db51c324b3d384702b0d0757da8d1cdaf4f",
+        "rev": "123166a438d3e9e2d0d0666ed88bfe6fdb08b2a0",
         "type": "github"
       },
       "original": {
@@ -20,17 +20,17 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1751203939,
-        "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=",
+        "lastModified": 1754196730,
+        "narHash": "sha256-qwbI79PEvEHdThZh4XMDuzo2de5XyQACr890uMOZQD8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe",
+        "rev": "b16813baa89e3bf87c62d459e6c8b2c3da57a369",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe",
+        "rev": "b16813baa89e3bf87c62d459e6c8b2c3da57a369",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 96d595d7b..8364ea85d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,11 @@
                     if super.lib.versionOlder "5.4" osuper.ocaml.version then
                       osuper.ppxlib.src
                     else
-                      builtins.fetchurl {
-                        url = "https://github.com/ocaml-ppx/ppxlib/releases/download/0.36.0/ppxlib-0.36.0.tbz";
-                        sha256 = "0d54j19vi1khzmw0ffngs8xzjjq07n20q49h85hhhcf52k71pfjs";
-                      };
+                      builtins.fetchurl
+                        {
+                          url = "https://github.com/ocaml-ppx/ppxlib/releases/download/0.36.1/ppxlib-0.36.1.tbz";
+                          sha256 = "1czgf474himz3wj3qqmy8zrsn0m40yj2z9imlhb491d1xv1vllk1";
+                        };
                 });
 
               pp = osuper.pp.overrideAttrs (_: {

From a503bce7453b2c75d24d2b79c422eacde09a5657 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 3 Aug 2025 12:57:58 -0700
Subject: [PATCH 2/2] depend on ppxlib properly

---
 dune-project | 2 +-
 reason.opam  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dune-project b/dune-project
index 5ccd4bf4c..fc2777cb2 100644
--- a/dune-project
+++ b/dune-project
@@ -44,7 +44,7 @@
    (>= "0.6.2"))
   fix
   cppo
-  (ppxlib :dev)))
+  (ppxlib (>= 0.36))))
 
 (package
  (name rtop)
diff --git a/reason.opam b/reason.opam
index fdebe24bd..e016ba147 100644
--- a/reason.opam
+++ b/reason.opam
@@ -24,7 +24,7 @@ depends: [
   "merlin-extend" {>= "0.6.2"}
   "fix"
   "cppo"
-  "ppxlib" {dev}
+  "ppxlib" {>= "0.36"}
   "odoc" {with-doc}
 ]
 build: [