From 3a953fa32ed26449e5e8304c12d6ba18a4f08438 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Tue, 16 Jan 2024 21:32:35 -0800
Subject: [PATCH] add 5.1 submodule and opam constraints

---
 dune-project                 | 4 +++-
 flake.lock                   | 7 ++++---
 flake.nix                    | 4 ++--
 melange.opam                 | 9 +--------
 melange.opam.template        | 7 -------
 vendor/melange-compiler-libs | 2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 melange.opam.template

diff --git a/dune-project b/dune-project
index c673a79c6..9af2b611d 100644
--- a/dune-project
+++ b/dune-project
@@ -32,7 +32,9 @@
  (synopsis "Toolchain to produce JS from Reason/OCaml")
  (depends
   (ocaml
-   (>= "5.2"))
+   (and
+    (>= "5.1")
+    (< "5.2")))
   (cmdliner
    (>= "1.1.0"))
   dune-build-info
diff --git a/flake.lock b/flake.lock
index 03adeb782..091ca4540 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,15 +28,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1715648563,
-        "narHash": "sha256-hRBg2XQ6KePIAV8m/lLLhrrgqJS/Sv4OOP/nWwYq30c=",
+        "lastModified": 1712870503,
+        "narHash": "sha256-am2qlo/n9edHsSWc5Lq9Cy0H/rU3lfnp/Ltyw1vBYGs=",
         "owner": "melange-re",
         "repo": "melange-compiler-libs",
-        "rev": "5d286734b8f6c75913ed98bb8f20ac0a55d4293e",
+        "rev": "566ed4134bf9caca87e7fe5fa9db6df801578db9",
         "type": "github"
       },
       "original": {
         "owner": "melange-re",
+        "ref": "5.1",
         "repo": "melange-compiler-libs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6c2896b17..0195bef98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
     melange-compiler-libs = {
       # this changes rarely, and it's better than having to rely on nix's poor
       # support for submodules
-      url = "github:melange-re/melange-compiler-libs";
+      url = "github:melange-re/melange-compiler-libs/5.1";
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -26,7 +26,7 @@
     } // (flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
-          ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
+          ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
         });
 
         packages =
diff --git a/melange.opam b/melange.opam
index d21a2ea8b..53927a860 100644
--- a/melange.opam
+++ b/melange.opam
@@ -8,7 +8,7 @@ homepage: "https://github.com/melange-re/melange"
 bug-reports: "https://github.com/melange-re/melange/issues"
 depends: [
   "dune" {>= "3.13"}
-  "ocaml" {>= "5.2"}
+  "ocaml" {>= "5.1" & < "5.2"}
   "cmdliner" {>= "1.1.0"}
   "dune-build-info"
   "cppo" {build}
@@ -35,10 +35,3 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/melange-re/melange.git"
-pin-depends: [
-  [ "merlin-lib.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "merlin.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "dot-merlin-reader.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
-  [ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
-]
diff --git a/melange.opam.template b/melange.opam.template
deleted file mode 100644
index 25f9f054e..000000000
--- a/melange.opam.template
+++ /dev/null
@@ -1,7 +0,0 @@
-pin-depends: [
-  [ "merlin-lib.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "merlin.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "dot-merlin-reader.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
-  [ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
-  [ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
-]
diff --git a/vendor/melange-compiler-libs b/vendor/melange-compiler-libs
index 5d286734b..566ed4134 160000
--- a/vendor/melange-compiler-libs
+++ b/vendor/melange-compiler-libs
@@ -1 +1 @@
-Subproject commit 5d286734b8f6c75913ed98bb8f20ac0a55d4293e
+Subproject commit 566ed4134bf9caca87e7fe5fa9db6df801578db9