From af82bb0abf2b16f6b077bc48633e6daf68414c31 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 30 Aug 2021 01:28:10 -0700 Subject: [PATCH] ocamlPackages.ocaml-lsp: fix minimum ocaml version ocaml-lsp 1.7.0 is only available for OCaml 4.12 and above. For previous version of OCaml, an old version must be used. 1.7.0 only supports 4.12 Signed-off-by: Rudi Grinberg --- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index f81def4a7b40..fb38dea3d4cf 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -14,11 +14,15 @@ , cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; useDune2 = true; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = + if lib.versionAtLeast version "1.7.0" then + "4.12" + else + "4.06"; # unvendor some (not all) dependencies. # They are vendored by upstream only because it is then easier to install