colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.ocaml-lsp: 1.5.0 -> 1.7.0

Browse Source
This commit is contained in:
Guillaume Girol 2021-08-07 12:00:00 +00:00 committed by Vincent Laporte
parent 6ba20fa087
commit c765c1d695
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
View File

@ -1,4 +1,4 @@
{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }:
buildDunePackage {
pname = "ocaml-lsp-server";
@ -7,7 +7,7 @@ buildDunePackage {
inherit (lsp) preBuild;
buildInputs = lsp.buildInputs ++ [ lsp ];
buildInputs = lsp.buildInputs ++ [ lsp re ];
nativeBuildInputs = [ makeWrapper ];

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

@ -12,8 +12,8 @@
let params =
if lib.versionAtLeast ocaml.version "4.12"
then {
version = "1.5.0";
sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2";
version = "1.7.0";
sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya";
} else {
version = "1.4.1";
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";

6
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
View File

@ -1,4 +1,5 @@
{ buildDunePackage
, lib
, cppo
, stdlib-shims
, ppx_yojson_conv_lib
@ -8,6 +9,7 @@
, octavius
, dune-build-info
, uutf
, pp
, csexp
, cmdliner
}:
@ -23,7 +25,7 @@ buildDunePackage {
# ocaml-lsp without messing with your opam switch, but nix should prevent
# this type of problems without resorting to vendoring.
preBuild = ''
rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
'';
buildInputs = [
@ -34,7 +36,7 @@ buildDunePackage {
dune-build-info
omd
cmdliner
];
] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
propagatedBuildInputs = [
csexp