From 832a240b12727f543501e688b795aea90bafa575 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sun, 5 Jul 2020 12:10:03 -0400 Subject: [PATCH] cmake-language-server: build with pygls 0.9.x --- pkgs/development/tools/cmake-language-server/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 135fdccd7c53..a01c0372ded9 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -15,6 +15,11 @@ buildPythonApplication rec { sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pygls = "^0.8.1"' 'pygls = "^0.9.0"' + ''; + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ pygls pyparsing ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ede249d1c37..70bc152f1890 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10330,7 +10330,9 @@ in cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { }; + cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { + inherit (pkgs) cmake; + }; # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;