diff options
| author | Rudi Grinberg <me@rgrinberg.com> | 2021-08-30 01:36:27 -0700 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-09-09 07:51:55 +0200 |
| commit | 7e10715778240535cc6e4db19bcdfb7c89378b71 (patch) | |
| tree | 5bfc04c7bf90ae55ed12cad76969ac05ccb6c027 /pkgs/development/ocaml-modules | |
| parent | af82bb0abf2b16f6b077bc48633e6daf68414c31 (diff) | |
| download | nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar.gz nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar.bz2 nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar.lz nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar.xz nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.tar.zst nixlib-7e10715778240535cc6e4db19bcdfb7c89378b71.zip | |
ocamlPackages.ocaml-lsp: fix list of dependencies for 1.7.0
ocaml-lsp 1.7.0 depends on re which was omitted. it also does not depend on cppo, ocaml-syntax-shims, stdlib-shims. Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index fb38dea3d4cf..869e9f633540 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -9,6 +9,7 @@ , octavius , dune-build-info , uutf +, re , pp , csexp , cmdliner @@ -32,22 +33,24 @@ buildDunePackage rec { rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner} ''; - buildInputs = [ - cppo - ppx_yojson_conv_lib - ocaml-syntax-shims - octavius - dune-build-info - omd - cmdliner - ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp; + buildInputs = + if lib.versionAtLeast version "1.7.0" then + [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ] + else + [ cppo + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + dune-build-info + omd + cmdliner + ]; propagatedBuildInputs = [ csexp jsonrpc - stdlib-shims uutf - ]; + ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims; meta = jsonrpc.meta // { description = "LSP protocol implementation in OCaml"; |