diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2022-07-17 12:00:00 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-07-18 11:24:37 +0200 |
| commit | 9eddb61dcffc7602a1a88e858d695fad956af89d (patch) | |
| tree | 0863059dad922b8153d5b4e5efcc4c18f44e5f6d /pkgs/development/ocaml-modules/ocaml-lsp | |
| parent | caa3cefeb5082fe770c0e62984d52bc742810f79 (diff) | |
ocaml-ng.ocamlPackages_4_14.ocaml-lsp: 1.11 -> 1.12
Diffstat (limited to 'pkgs/development/ocaml-modules/ocaml-lsp')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 18 |
2 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 2e6802a504266..4e79e0310ac63 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,17 +12,21 @@ let params = if lib.versionAtLeast ocaml.version "4.14" then { - version = "1.11.3"; - sha256 = "sha256-KlMFh05O04I0Xil2B+nL2hUxZw0jaDMUnI23oUwGyhs="; + name = "lsp"; + version = "1.12.4"; + sha256 = "sha256-kZuYAny8VjWdq+ipEdPSTRcGzqjNBOgXOi0dOwb52EY="; } else if lib.versionAtLeast ocaml.version "4.13" then { + name = "jsonrpc"; version = "1.10.5"; sha256 = "sha256-TeJS6t1ruWhWPvWNatrnSUWI6T17XKiosHLYizBDDcw="; } else if lib.versionAtLeast ocaml.version "4.12" then { + name = "jsonrpc"; version = "1.9.0"; sha256 = "sha256:1ac44n6g3rf84gvhcca545avgf9vpkwkkkm0s8ipshfhp4g4jikh"; } else { + name = "jsonrpc"; version = "1.4.1"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; } @@ -32,7 +36,7 @@ buildDunePackage rec { pname = "jsonrpc"; inherit (params) version; src = fetchurl { - url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/${params.name}-${version}.tbz"; inherit (params) sha256; }; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index faa1495190770..3111d4277c41d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -13,6 +13,7 @@ , dyn , re , stdune +, chrome-trace , dune_3 , csexp , pp @@ -40,7 +41,22 @@ buildDunePackage rec { ''; buildInputs = - if lib.versionAtLeast version "1.10.0" then + if lib.versionAtLeast version "1.12.0" then + [ + pp + re + ppx_yojson_conv_lib + octavius + dune-build-info + dune-rpc + omd + cmdliner + ocamlformat-rpc-lib + dyn + stdune + chrome-trace + ] + else if lib.versionAtLeast version "1.10.0" then [ pp re |