diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp')
3 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 19f821370415..a8178c6ef717 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -8,8 +8,9 @@ , dot-merlin-reader , spawn , ocamlc-loc -, odoc-parser , merlin-lib +, astring +, camlp-streams }: buildDunePackage rec { @@ -21,7 +22,7 @@ buildDunePackage rec { ++ lib.optional (lib.versionAtLeast version "1.9") spawn ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ] ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc - ++ lib.optional (lib.versionAtLeast version "1.16.2") [ odoc-parser merlin-lib ]; + ++ lib.optionals (lib.versionAtLeast version "1.17.0") [ astring camlp-streams merlin-lib ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index c6c35c703142..ec4986bb8876 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -9,7 +9,7 @@ , ocaml , version ? if lib.versionAtLeast ocaml.version "4.14" then - "1.16.2" + "1.17.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" else if lib.versionAtLeast ocaml.version "4.12" then @@ -19,10 +19,10 @@ }: let params = { - "1.16.2" = { + "1.17.0" = { name = "lsp"; minimalOCamlVersion = "4.14"; - sha256 = "sha256-FIfVpOLy1PAjNBBYVRvbi6hsIzZ7fFtP3aOqfcAqrsQ="; + sha256 = "sha256-j7i71xfu/SYItNg0WBBbZg4N46ETTcj8IWrmWdTRlgA="; }; "1.14.2" = { name = "lsp"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 91d0d231e0bd..49a6db7a118e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -24,7 +24,7 @@ , ocaml , version ? if lib.versionAtLeast ocaml.version "4.14" then - "1.16.2" + "1.17.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" else if lib.versionAtLeast ocaml.version "4.12" then |