cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #149397 from vbgl/ocaml-jsonrpc-1.9.1

Browse source 
ocamlPackages.jsonrpc: 1.8.3 → 1.9.1
This commit is contained in:
Guillaume Girol 2021-12-09 14:27:37 +00:00 committed by GitHub
commit c6c8f0778f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
View file

@ -1,4 +1,4 @@
{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }: { lib, buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader, spawn }:
buildDunePackage { buildDunePackage {
pname = "ocaml-lsp-server"; pname = "ocaml-lsp-server";
@ -7,7 +7,8 @@ buildDunePackage {
inherit (lsp) preBuild; inherit (lsp) preBuild;
buildInputs = lsp.buildInputs ++ [ lsp re ]; buildInputs = lsp.buildInputs ++ [ lsp re ]
++ lib.optional (lib.versionAtLeast jsonrpc.version "1.9") spawn;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

12
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
View file

@ -10,10 +10,14 @@
}: }:
let params = let params =
if lib.versionAtLeast ocaml.version "4.12" if lib.versionAtLeast ocaml.version "4.13"
then { then {
version = "1.8.3"; version = "1.9.1";
sha256 = "sha256-WO9ap78XZxJCi04LEBX+r21nfL2UdPiCLRMrJSI7FOk="; sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g";
} else if lib.versionAtLeast ocaml.version "4.12"
then {
version = "1.9.0";
sha256 = "sha256:1ac44n6g3rf84gvhcca545avgf9vpkwkkkm0s8ipshfhp4g4jikh";
} else { } else {
version = "1.4.1"; version = "1.4.1";
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
@ -29,7 +33,7 @@ buildDunePackage rec {
}; };
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.06"; minimalOCamlVersion = "4.06";
buildInputs = buildInputs =
if lib.versionAtLeast version "1.7.0" then if lib.versionAtLeast version "1.7.0" then