From 8fa170c9d01b59f2e159d43f50e1cf7d206dc984 Mon Sep 17 00:00:00 2001
From: Thomas Letan <lthms@nomadic-labs.com>
Date: Sat, 21 Dec 2024 12:38:09 +0100
Subject: [PATCH] Dev: We can now use latest ocaml-lsp-server

We need to update the Opam repository tag to get the newest version. We do not
use the opportunity to update our dependency tree, because we only care about
`ocamllsp`.
---
 flake.lock                       | 6 +++---
 manifest/externals.ml            | 7 ++-----
 opam/virtual/octez-dev-deps.opam | 4 ++--
 scripts/version.sh               | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 628d2b938afd..3cf8985e44c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -121,11 +121,11 @@
     "opam-repository": {
       "flake": false,
       "locked": {
-        "lastModified": 1730731085,
-        "narHash": "sha256-RmibDeHeQCNWiJbnOKLbpbhb8BKuUpLdOPPlX6Kl220=",
+        "lastModified": 1734734649,
+        "narHash": "sha256-/v7vZQbiCjBaXFEkSZH6llNOe6VuGiLDOFsWKDa9h6s=",
         "owner": "ocaml",
         "repo": "opam-repository",
-        "rev": "8476aa70b71db29af398e70bb8a00298c1e64b86",
+        "rev": "1db3104e98a25ff2b5f859189c9408dc760260e7",
         "type": "github"
       },
       "original": {
diff --git a/manifest/externals.ml b/manifest/externals.ml
index cec690ef384e..7c4b1bcce620 100644
--- a/manifest/externals.ml
+++ b/manifest/externals.ml
@@ -339,11 +339,8 @@ let () =
   List.iter
     (add_dep_to_profile "octez-dev-deps")
     [
-      (* ocaml-lsp-server-1.18 is not compatible with version above 4.16.x of merlin.
-         Selected versions of those 2 should be kept in sync
-         (opam should handle this constraint for us) *)
-      external_lib "merlin" V.(at_least "4.14" && less_than "4.17");
-      external_lib "ocaml-lsp-server" V.(at_least "1.18.0");
+      external_lib "merlin" V.(at_least "4.18");
+      external_lib "ocaml-lsp-server" V.(exactly "1.20.1-4.14");
       (* TODO: https://gitlab.com/tezos/tezos/-/issues/7085
          remove constraint on odoc version when odoc bug is solved *)
       external_lib "odoc" V.(at_least "2.4.2");
diff --git a/opam/virtual/octez-dev-deps.opam b/opam/virtual/octez-dev-deps.opam
index ef311f81b62d..dfdbf5463c0b 100644
--- a/opam/virtual/octez-dev-deps.opam
+++ b/opam/virtual/octez-dev-deps.opam
@@ -10,8 +10,8 @@ license: "MIT"
 depends: [
   "dune" { >= "3.11.1" }
   "merge-fmt"
-  "merlin" { >= "4.14" & < "4.17" }
-  "ocaml-lsp-server" { >= "1.18.0" }
+  "merlin" { >= "4.18" }
+  "ocaml-lsp-server" { = "1.20.1-4.14" }
   "ocp-indent"
   "odoc" { >= "2.4.2" }
   "utop" { >= "2.8" }
diff --git a/scripts/version.sh b/scripts/version.sh
index 48ba39d07bac..dd93a68fa4f3 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -24,7 +24,7 @@ export recommended_node_version=18.18.2
 
 ## opam_repository is a commit hash of the public opam repository, i.e.
 ## https://github.com/ocaml/opam-repository
-export opam_repository_tag=8476aa70b71db29af398e70bb8a00298c1e64b86
+export opam_repository_tag=1db3104e98a25ff2b5f859189c9408dc760260e7
 
 # SHA-256 hashes of the DAL SRSs, as used in 'scripts/install_dal_trusted_setup.sh' to verify
 # integrity of downloaded SRS.
-- 
GitLab