ocamlPackages.ocaml-lsp: 1.1.0 -> 1.4.0

This commit is contained in:
Mario Rodas 2020-12-17 04:20:00 +00:00 committed by Vincent Laporte
parent a105609c5e
commit e1e45a40f2

View File

@ -2,6 +2,8 @@
, stdlib-shims , stdlib-shims
, ppx_yojson_conv_lib , ppx_yojson_conv_lib
, ocaml-syntax-shims , ocaml-syntax-shims
, yojson
, result
, omd , omd
, octavius , octavius
, dune-build-info , dune-build-info
@ -12,10 +14,10 @@
, lib , lib
}: }:
let let
version = "1.1.0"; version = "1.4.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz"; url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb"; sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33";
}; };
# unvendor some (not all) dependencies. # unvendor some (not all) dependencies.
@ -23,7 +25,7 @@ let
# ocaml-lsp without messing with your opam switch, but nix should prevent # ocaml-lsp without messing with your opam switch, but nix should prevent
# this type of problems without resorting to vendoring. # this type of problems without resorting to vendoring.
preBuild = '' preBuild = ''
rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
''; '';
buildInputs = [ buildInputs = [
@ -36,6 +38,7 @@ let
dune-build-info dune-build-info
omd omd
cmdliner cmdliner
jsonrpc
]; ];
lsp = buildDunePackage { lsp = buildDunePackage {
@ -47,6 +50,15 @@ let
inherit buildInputs preBuild; inherit buildInputs preBuild;
}; };
jsonrpc = buildDunePackage {
pname = "jsonrpc";
inherit version src;
useDune2 = true;
minimumOCamlVersion = "4.06";
buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ];
};
in in
buildDunePackage { buildDunePackage {
pname = "ocaml-lsp-server"; pname = "ocaml-lsp-server";