nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.jsonrpc: 1.8.3 → 1.9

Browse Source 
(cherry picked from commit 8f7e8ee23d)
edited to not upgrade ocaml-lsp to 1.9 on ocaml < 4.12
This commit is contained in:
Guillaume Girol
2021-12-09 12:00:00 +00:00
parent 1bd4bbd49b
commit 3fdfd93819
2 changed files with 9 additions and 4 deletions
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 {
pname = "ocaml-lsp-server";
@@ -7,7 +7,8 @@ buildDunePackage {
inherit (lsp) preBuild;
buildInputs = lsp.buildInputs ++ [ lsp re ];
buildInputs = lsp.buildInputs ++ [ lsp re ]
++ lib.optional (lib.versionAtLeast jsonrpc.version "1.9") spawn;
nativeBuildInputs = [ makeWrapper ];

8
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
View File

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