From 9139415648b1d46fcf5df2620d4479a042057953 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Sep 2024 18:07:08 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.lsp:=201.18.0=20=E2=86=92=201.19.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/linol/default.nix     | 8 +++++++-
 pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 9 ++++++++-
 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix     | 4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
index dc7ee4835801..97630cc3db93 100644
--- a/pkgs/development/ocaml-modules/linol/default.nix
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -12,7 +12,13 @@ rec {
     hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo=";
   };
 
-  propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ];
+  propagatedBuildInputs = [
+    yojson
+    logs
+    (lsp.override { version = "1.18.0"; })
+    ppx_yojson_conv_lib
+    trace
+  ];
 
   meta = with lib; {
     description = "LSP server library";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index 6ad8420fc134..1a2a97d21f2b 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -8,7 +8,9 @@
 , lib
 , ocaml
 , version ?
-    if lib.versionAtLeast ocaml.version "4.14" then
+    if lib.versionAtLeast ocaml.version "5.02" then
+      "1.19.0"
+    else if lib.versionAtLeast ocaml.version "4.14" then
       "1.18.0"
     else if lib.versionAtLeast ocaml.version "4.13" then
       "1.10.5"
@@ -19,6 +21,11 @@
 }:
 
 let params = {
+  "1.19.0" = {
+    name = "lsp";
+    minimalOCamlVersion = "5.02";
+    sha256 = "sha256-54PZ8af4nOG/TJFIqjSiKDaL0Um7zKQ96AtFkiHe5ew=";
+  };
   "1.18.0" = {
     name = "lsp";
     minimalOCamlVersion = "4.14";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index c77d1ed40453..b22561666b34 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -22,7 +22,9 @@
 , ocamlformat-rpc-lib
 , ocaml
 , version ?
-    if lib.versionAtLeast ocaml.version "4.14" then
+    if lib.versionAtLeast ocaml.version "5.02" then
+      "1.19.0"
+    else if lib.versionAtLeast ocaml.version "4.14" then
       "1.18.0"
     else if lib.versionAtLeast ocaml.version "4.13" then
       "1.10.5"