From 439bb0b7acc021154669fd6df4ccb5e1a24b742d Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 13 Jan 2025 15:44:37 +0100
Subject: [PATCH 1/2] ocamlPackages_5_3.merlin: Init at 5.4.1-503

---
 pkgs/development/tools/ocaml/merlin/4.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix
index 2e206d850c6b..e0138c742c68 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -28,6 +28,7 @@
       "5.1.1" = "4.17.1-501";
       "5.2.0" = "5.2.1-502";
       "5.2.1" = "5.2.1-502";
+      "5.3.0" = "5.4.1-503";
     }
     ."${ocaml.version}",
 }:
@@ -43,6 +44,7 @@ let
     "4.17.1-414" = "sha256-vz+AbvSGMgU4YdVLc73vlTm6QhivAh2LCsrY435kX8Y=";
     "4.17.1-501" = "sha256-N2cHqocfCeljlFbT++S4miHJrXXHdOlMu75n+EKwpQA=";
     "5.2.1-502" = "sha256-XALccbLTG2GYUcFKlluRxlCk281Jv1YATu5h4MWNWEw=";
+    "5.4.1-503" = "sha256-SbO0x3jBISX8dAXnN5CwsxLV15dJ3XPUg4tlYqJTMCI=";
   };
 
 in

From cc4260500c5f91a8fbd68cdecc8c031046fdf27d Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 13 Jan 2025 15:46:48 +0100
Subject: [PATCH 2/2] ocamlPackages.merlin: Update for OCaml 5.2 and 4.14

---
 pkgs/development/tools/ocaml/merlin/4.x.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix
index e0138c742c68..2a230cd8039e 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -20,14 +20,14 @@
       "4.12.1" = "4.7-412";
       "4.13.0" = "4.7-413";
       "4.13.1" = "4.7-413";
-      "4.14.0" = "4.17.1-414";
-      "4.14.1" = "4.17.1-414";
-      "4.14.2" = "4.17.1-414";
+      "4.14.0" = "4.18-414";
+      "4.14.1" = "4.18-414";
+      "4.14.2" = "4.18-414";
       "5.0.0" = "4.14-500";
       "5.1.0" = "4.17.1-501";
       "5.1.1" = "4.17.1-501";
-      "5.2.0" = "5.2.1-502";
-      "5.2.1" = "5.2.1-502";
+      "5.2.0" = "5.3-502";
+      "5.2.1" = "5.3-502";
       "5.3.0" = "5.4.1-503";
     }
     ."${ocaml.version}",
@@ -39,11 +39,11 @@ let
     "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
     "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
     "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4=";
-    "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0=";
-    "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY=";
-    "4.17.1-414" = "sha256-vz+AbvSGMgU4YdVLc73vlTm6QhivAh2LCsrY435kX8Y=";
+    "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; # Used by ocaml-lsp
+    "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; # Used by ocaml-lsp
+    "4.18-414" = "sha256-9tb3omYUHjWMGoaWEsgTXIWRhdVH6julya17tn/jDME=";
     "4.17.1-501" = "sha256-N2cHqocfCeljlFbT++S4miHJrXXHdOlMu75n+EKwpQA=";
-    "5.2.1-502" = "sha256-XALccbLTG2GYUcFKlluRxlCk281Jv1YATu5h4MWNWEw=";
+    "5.3-502" = "sha256-LOpG8SOX+m4x7wwNT14Rwc/ZFu5JQgaUAFyV67OqJLw=";
     "5.4.1-503" = "sha256-SbO0x3jBISX8dAXnN5CwsxLV15dJ3XPUg4tlYqJTMCI=";
   };