diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index e70094b994eb..ee74d77101e7 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -2,13 +2,16 @@ version ? null }: let ocamlPackages = coq.ocamlPackages; - defaultVersion = lib.switch coq.coq-version [ - { case = "8.18"; out = "2.0.3+coq8.18"; } + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "2.1.2"; } + { case = isEq "8.18"; out = "2.0.3+coq8.18"; } ] null; location = { domain = "github.com"; owner = "coq-community"; repo = "vscoq"; }; fetch = metaFetch ({ release."2.0.3+coq8.18".sha256 = "sha256-VXhHCP6Ni5/OcsgoI1EbJfYCpXzwkuR8kbbKrl6dfjU="; release."2.0.3+coq8.18".rev = "v2.0.3+coq8.18"; + release."2.1.2".rev = "v2.1.2"; + release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328="; inherit location; }); fetched = fetch (if version != null then version else defaultVersion); in @@ -16,12 +19,13 @@ ocamlPackages.buildDunePackage { pname = "vscoq-language-server"; inherit (fetched) version; src = "${fetched.src}/language-server"; + nativeBuildInputs = [ coq ]; buildInputs = [ coq glib gnome.adwaita-icon-theme wrapGAppsHook ] ++ (with ocamlPackages; [ findlib lablgtk3-sourceview3 yojson zarith ppx_inline_test ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib - ppx_yojson_conv lsp sel ]); + ppx_yojson_conv lsp sel ppx_optcomp ]); meta = with lib; { description = "Language server for the vscoq vscode/codium extension";