diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-08-07 12:00:00 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-08-27 13:38:37 +0200 |
| commit | c765c1d6955d9a450a005712906215ee3c0d2f25 (patch) | |
| tree | 6b3a9bfc23ed2b01efb016e83960254284c414ed /pkgs/development/ocaml-modules/ocaml-lsp | |
| parent | 6ba20fa087be388c286bf439a69b95abafdbaa9c (diff) | |
ocamlPackages.ocaml-lsp: 1.5.0 -> 1.7.0
Diffstat (limited to 'pkgs/development/ocaml-modules/ocaml-lsp')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index a56621465f345..13ae64292ec7d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 4921f579c418e..a1d457f8775f9 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 6e172dee6ee67..f81def4a7b40d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -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 |