b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocaml-lsp: 1.14.1 -> 1.14.2

Browse source
This commit is contained in:
Ulrik Strid 2022-11-08 09:14:16 +01:00 committed by Vincent Laporte
parent 91bc003d5e
commit ef62f6566b
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
View file

@ -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 ];

4
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
View file

@ -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";

2
pkgs/development/ocaml-modules/ocamlc-loc/default.nix
View file

@ -12,7 +12,7 @@ buildDunePackage {
rm -rf vendor/pp
'';
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ dyn ];