From 1a03d094f47a0f6ceac1a9de6bc52be2a954268d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 17:41:15 -0400 Subject: [PATCH] cmake-language-server: fix build using latest pygls version --- .../tools/misc/cmake-language-server/default.nix | 3 +++ .../cmake-language-server/use-latest-pygls.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 12c14fcb73b4..deb5599770f0 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -24,6 +24,9 @@ buildPythonApplication rec { patches = [ # Test timeouts occasionally cause the build to fail ./disable-test-timeouts.patch + + # cmake-language-server depends on pygls 0.11, but still works with 0.12 + ./use-latest-pygls.patch ]; postPatch = '' diff --git a/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch b/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch new file mode 100644 index 000000000000..5e1d80dd8788 --- /dev/null +++ b/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch @@ -0,0 +1,13 @@ +diff --git a/pyproject.toml b/pyproject.toml +index bc6251d..39d6686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -19,7 +19,7 @@ classifiers = [ + + [tool.poetry.dependencies] + python = "^3.6" +-pygls = "^0.11" ++pygls = "^0.12" + pyparsing = "^2.4" + importlib-metadata = {version = "^4.8", python = "<3.8"} +