ocamlPackages.lsp: 1.18.0 → 1.19.0 (#344686)

NixOS · Sep 30, 2024 · 04efabb · 04efabb
2 parents 226757c + 9139415
commit 04efabb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"