b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #230070 from vbgl/ocaml-lsp-fix-propagated-inputs

Browse source 
ocamlPackages.lsp: fix propagatedInputs
This commit is contained in:
Ulrik Strid 2023-05-05 12:10:41 +02:00 committed by GitHub
parent d4f08c0efb 18f2c5f5b8
commit 416ffcd08f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/ocaml-modules/linol/default.nix
View file

@ -5,7 +5,7 @@ rec {
pname = "linol";
version = "2023-04-25";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.14";
duneVersion = "3";
src = fetchFromGitHub {

30
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
View file

@ -84,11 +84,31 @@ buildDunePackage rec {
nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
propagatedBuildInputs = [
csexp
jsonrpc
uutf
] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
propagatedBuildInputs =
if lib.versionAtLeast version "1.14.0" then [
jsonrpc
ppx_yojson_conv_lib
uutf
] else if lib.versionAtLeast version "1.10.0" then [
dyn
jsonrpc
ordering
ppx_yojson_conv_lib
stdune
uutf
] else if lib.versionAtLeast version "1.7.0" then [
csexp
jsonrpc
pp
ppx_yojson_conv_lib
uutf
] else [
csexp
jsonrpc
ppx_yojson_conv_lib
stdlib-shims
uutf
];
meta = jsonrpc.meta // {
description = "LSP protocol implementation in OCaml";