mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 13:15:30 +03:00
ocaml-lsp: 1.14.1 -> 1.14.2
This commit is contained in:
parent
91bc003d5e
commit
ef62f6566b
3 changed files with 6 additions and 5 deletions
|
@ -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 {
|
buildDunePackage rec {
|
||||||
pname = "ocaml-lsp-server";
|
pname = "ocaml-lsp-server";
|
||||||
|
@ -7,7 +7,8 @@ buildDunePackage rec {
|
||||||
|
|
||||||
buildInputs = lsp.buildInputs ++ [ lsp re ]
|
buildInputs = lsp.buildInputs ++ [ lsp re ]
|
||||||
++ lib.optional (lib.versionAtLeast version "1.9") spawn
|
++ 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 ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,8 @@ let params =
|
||||||
if lib.versionAtLeast ocaml.version "4.14"
|
if lib.versionAtLeast ocaml.version "4.14"
|
||||||
then {
|
then {
|
||||||
name = "lsp";
|
name = "lsp";
|
||||||
version = "1.14.1";
|
version = "1.14.2";
|
||||||
sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk=";
|
sha256 = "sha256-1R+HYaGbPLGDs5DMN3jmnrZFMhMmPUHgF+s+yNzIVJQ=";
|
||||||
} else if lib.versionAtLeast ocaml.version "4.13"
|
} else if lib.versionAtLeast ocaml.version "4.13"
|
||||||
then {
|
then {
|
||||||
name = "jsonrpc";
|
name = "jsonrpc";
|
||||||
|
|
|
@ -12,7 +12,7 @@ buildDunePackage {
|
||||||
rm -rf vendor/pp
|
rm -rf vendor/pp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
minimumOCamlVersion = "4.08";
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
propagatedBuildInputs = [ dyn ];
|
propagatedBuildInputs = [ dyn ];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue