summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKira Bruneau <kira.bruneau@pm.me>2022-08-04 12:52:30 -0400
committerKira Bruneau <kira.bruneau@pm.me>2022-08-04 12:57:57 -0400
commit018acd1e677e7c4cf5e629ad31d559506715218a (patch)
tree12a61da82dd7b90aafda97e3af74e89ff82e10d9
parentcmake-language-server: remove pyparsing dependency (diff)
downloadnixpkgs-018acd1e677e7c4cf5e629ad31d559506715218a.tar.gz
cmake-language-server: 0.1.5 → 0.1.6
-rw-r--r--pkgs/development/tools/misc/cmake-language-server/default.nix7
-rw-r--r--pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch13
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix
index 8f712e7238be..168c40911e68 100644
--- a/pkgs/development/tools/misc/cmake-language-server/default.nix
+++ b/pkgs/development/tools/misc/cmake-language-server/default.nix
@@ -11,22 +11,19 @@
buildPythonApplication rec {
pname = "cmake-language-server";
- version = "0.1.5";
+ version = "0.1.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "regen100";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ=";
+ sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk=";
};
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
];
nativeBuildInputs = [
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
deleted file mode 100644
index 3ff3171aa3b3..000000000000
--- a/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 417df1d..0f59857 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -19,7 +19,7 @@ classifiers = [
-
- [tool.poetry.dependencies]
- python = "^3.6"
--pygls = "^0.11"
-+pygls = "^0.12"
- importlib-metadata = {version = "^4.8", python = "<3.8"}
-
- [tool.poetry.dev-dependencies]