From 3576a3e25633039e9fd4755a2ac6a8c02eda0e3f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 May 2023 10:53:46 +0200
Subject: [PATCH 1/2] ocamlPackages.linol: fix minimalOCamlVersion

---
 pkgs/development/ocaml-modules/linol/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
index 64aace8851b7..34f32cf4f7bf 100644
--- a/pkgs/development/ocaml-modules/linol/default.nix
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -5,7 +5,7 @@ rec {
   pname = "linol";
   version = "2023-04-25";
 
-  minimalOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.14";
   duneVersion = "3";
 
   src = fetchFromGitHub {

From 18f2c5f5b860733ecbd499ebd74a72c685f8917d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 May 2023 10:42:06 +0200
Subject: [PATCH 2/2] ocamlPackages.lsp: fix propagatedInputs

---
 .../ocaml-modules/ocaml-lsp/lsp.nix           | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index 32e8fbaf2ef7..b067614f5058 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -84,11 +84,31 @@ buildDunePackage rec {
 
   nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
 
-  propagatedBuildInputs = [
-    csexp
-    jsonrpc
-    uutf
-  ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
+  propagatedBuildInputs =
+    if lib.versionAtLeast version "1.14.0" then [
+      jsonrpc
+      ppx_yojson_conv_lib
+      uutf
+    ] else if lib.versionAtLeast version "1.10.0" then [
+      dyn
+      jsonrpc
+      ordering
+      ppx_yojson_conv_lib
+      stdune
+      uutf
+    ] else if lib.versionAtLeast version "1.7.0" then [
+      csexp
+      jsonrpc
+      pp
+      ppx_yojson_conv_lib
+      uutf
+    ] else [
+      csexp
+      jsonrpc
+      ppx_yojson_conv_lib
+      stdlib-shims
+      uutf
+    ];
 
   meta = jsonrpc.meta // {
     description = "LSP protocol implementation in OCaml";