git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.ocaml-lsp: 1.5.0 -> 1.7.0
commitc765c1d6955d9a450a005712906215ee3c0d2f25 authorGuillaume Girol <symphorien+git@xlumurb.eu> dateSat 7 Aug 2021, 12:00 (5 years ago) parent6ba20fa
3 files changed+8−6
compare with master
unifiedsplit
pkgs/development/ocaml-modules/ocaml-lsp/default.nix+2−2 pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix+2−2 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix+4−2
pkgs/development/ocaml-modules/ocaml-lsp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
1+{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }:
22
33buildDunePackage {
44 pname = "ocaml-lsp-server";
@@ -7,7 +7,7 @@ buildDunePackage {
77
88 inherit (lsp) preBuild;
99
10− buildInputs = lsp.buildInputs ++ [ lsp ];
10+ buildInputs = lsp.buildInputs ++ [ lsp re ];
1111
1212 nativeBuildInputs = [ makeWrapper ];
1313
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix+2−2
@@ -12,8 +12,8 @@
1212let params =
1313 if lib.versionAtLeast ocaml.version "4.12"
1414 then {
15− version = "1.5.0";
16− sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2";
15+ version = "1.7.0";
16+ sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya";
1717 } else {
1818 version = "1.4.1";
1919 sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix+4−2
@@ -1,4 +1,5 @@
11{ buildDunePackage
2+, lib
23, cppo
34, stdlib-shims
45, ppx_yojson_conv_lib
@@ -8,6 +9,7 @@
89, octavius
910, dune-build-info
1011, uutf
12+, pp
1113, csexp
1214, cmdliner
1315}:
@@ -23,7 +25,7 @@ buildDunePackage {
2325 # ocaml-lsp without messing with your opam switch, but nix should prevent
2426 # this type of problems without resorting to vendoring.
2527 preBuild = ''
26− rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
28+ rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
2729 '';
2830
2931 buildInputs = [
@@ -34,7 +36,7 @@ buildDunePackage {
3436 dune-build-info
3537 omd
3638 cmdliner
37− ];
39+ ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
3840
3941 propagatedBuildInputs = [
4042 csexp