Unverified Commit 416ffcd0 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

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

ocamlPackages.lsp: fix propagatedInputs
parents d4f08c0e 18f2c5f5

pkgs/development/ocaml-modules/linol/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ rec { 
  pname = "linol";

  version = "2023-04-25";



  minimalOCamlVersion = "4.08";

  minimalOCamlVersion = "4.14";

  duneVersion = "3";



  src = fetchFromGitHub {

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix

+25 −5
Original line number Diff line number Diff line
@@ -84,11 +84,31 @@ buildDunePackage rec { 


  nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;



  propagatedBuildInputs = [

  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

  ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;

    ] else [

      csexp

      jsonrpc

      ppx_yojson_conv_lib

      stdlib-shims

      uutf

    ];



  meta = jsonrpc.meta // {

    description = "LSP protocol implementation in OCaml";