From 9d9fe9971d4a71712c1a154b1dc14ff315fb9bf2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 24 May 2023 07:26:59 +0200
Subject: [PATCH 1/3] ocamlPackages.polynomial: disable for OCaml < 4.08

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

diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix
index e23ae5f25fae..cd56175d72d9 100644
--- a/pkgs/development/ocaml-modules/polynomial/default.nix
+++ b/pkgs/development/ocaml-modules/polynomial/default.nix
@@ -9,6 +9,7 @@ buildDunePackage rec {
   pname = "polynomial";
   version = "0.4.0";
   duneVersion = "3";
+  minimalOCamlVersion = "4.08";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "cryptography/ocaml-polynomial";

From 6c31436baae0df3ca41077a4a6cc2052173608e1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 24 May 2023 07:27:06 +0200
Subject: [PATCH 2/3] ocamlPackages.dot-merlin-reader: add missing input

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

diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
index c4b69eb55309..89af62ed70e6 100644
--- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
+++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }:
+{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }:
 
 buildDunePackage rec {
   pname = "dot-merlin-reader";
@@ -12,7 +12,7 @@ buildDunePackage rec {
   buildInputs = [ findlib ]
   ++ (if lib.versionAtLeast version "4.7-414"
   then [ merlin-lib ]
-  else [ yojson csexp ]);
+  else [ yojson csexp result ]);
 
   meta = with lib; {
     description = "Reads config files for merlin";

From c26ad319b39232a0cd4a2680a7d7e62e43af1a80 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 24 May 2023 07:27:10 +0200
Subject: [PATCH 3/3] ocamlPackages.lsp: add missing input

---
 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index b067614f5058..c1a97641f240 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -16,6 +16,7 @@
 , chrome-trace
 , dune_3
 , csexp
+, result
 , pp
 , cmdliner
 , ordering
@@ -101,6 +102,7 @@ buildDunePackage rec {
       jsonrpc
       pp
       ppx_yojson_conv_lib
+      result
       uutf
     ] else [
       csexp