Commit ef62f656 authored by Ulrik Strid's avatar Ulrik Strid Committed by Vincent Laporte
Browse files

ocaml-lsp: 1.14.1 -> 1.14.2

parent 91bc003d

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

+3 −2
Original line number Diff line number Diff line 
{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn }:

{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn, ocamlc-loc }:



buildDunePackage rec {

  pname = "ocaml-lsp-server";
@@ -7,7 +7,8 @@ buildDunePackage rec { 


  buildInputs = lsp.buildInputs ++ [ lsp re ]

  ++ lib.optional (lib.versionAtLeast version "1.9") spawn

  ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ];

  ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ]

  ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc;



  nativeBuildInputs = [ makeWrapper ];

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

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ let params = 
  if lib.versionAtLeast ocaml.version "4.14"

  then {

    name = "lsp";

    version = "1.14.1";

    sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk=";

    version = "1.14.2";

    sha256 = "sha256-1R+HYaGbPLGDs5DMN3jmnrZFMhMmPUHgF+s+yNzIVJQ=";

  } else if lib.versionAtLeast ocaml.version "4.13"

  then {

    name = "jsonrpc";

pkgs/development/ocaml-modules/ocamlc-loc/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ buildDunePackage { 
    rm -rf vendor/pp

  '';



  minimumOCamlVersion = "4.08";

  minimalOCamlVersion = "4.08";



  propagatedBuildInputs = [ dyn ];