diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index f5b69a3b1e3..b5cf8d3fe1c 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn }: +{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn, ocamlc-loc }: buildDunePackage rec { pname = "ocaml-lsp-server"; @@ -7,7 +7,8 @@ buildDunePackage rec { buildInputs = lsp.buildInputs ++ [ lsp re ] ++ lib.optional (lib.versionAtLeast version "1.9") spawn - ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ]; + ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ] + ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 41cf9fd3229..b2c43babcf6 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -13,8 +13,8 @@ let params = if lib.versionAtLeast ocaml.version "4.14" then { name = "lsp"; - version = "1.14.1"; - sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk="; + version = "1.14.2"; + sha256 = "sha256-1R+HYaGbPLGDs5DMN3jmnrZFMhMmPUHgF+s+yNzIVJQ="; } else if lib.versionAtLeast ocaml.version "4.13" then { name = "jsonrpc"; diff --git a/pkgs/development/ocaml-modules/ocamlc-loc/default.nix b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix index 931f40e0d23..3f2d9c013c4 100644 --- a/pkgs/development/ocaml-modules/ocamlc-loc/default.nix +++ b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix @@ -12,7 +12,7 @@ buildDunePackage { rm -rf vendor/pp ''; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ dyn ];