Merge pull request #185144 from kira-bruneau/cmake-language-server

cmake-language-server: 0.1.5 → 0.1.6

pkgs/development/tools/misc/cmake-language-server/default.nix

@@ -4,7 +4,6 @@
 , poetry
 , cmake-format
 , pygls
-, pyparsing
 , cmake
 , pytest-datadir
 , pytestCheckHook
@@ -12,29 +11,21 @@
 
 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
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"'
-  '';
-
   nativeBuildInputs = [
     poetry
   ];
@@ -42,7 +33,6 @@ buildPythonApplication rec {
   propagatedBuildInputs = [
     cmake-format
     pygls
-    pyparsing
   ];
 
   checkInputs = [

pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch

@@ -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]