cmake-language-server: 0.1.4 → 0.1.5

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

@@ -2,6 +2,7 @@
 , buildPythonApplication
 , fetchFromGitHub
 , poetry
+, cmake-format
 , pygls
 , pyparsing
 , cmake
@@ -11,14 +12,14 @@
 
 buildPythonApplication rec {
   pname = "cmake-language-server";
-  version = "0.1.4";
+  version = "0.1.5";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "regen100";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY=";
+    sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ=";
   };
 
   patches = [
@@ -34,10 +35,23 @@ buildPythonApplication rec {
       --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"'
   '';
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [
-  propagatedBuildInputs = [ pygls pyparsing ];
+    poetry
+  ];
+
+  propagatedBuildInputs = [
+    cmake-format
+    pygls
+    pyparsing
+  ];
+
+  checkInputs = [
+    cmake
+    cmake-format
+    pytest-datadir
+    pytestCheckHook
+  ];
 
-  checkInputs = [ cmake pytest-datadir pytestCheckHook ];
   dontUseCmakeConfigure = true;
   pythonImportsCheck = [ "cmake_language_server" ];
 

pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch

@@ -1,13 +1,13 @@
 diff --git a/tests/test_server.py b/tests/test_server.py
-index c0777f5..1184fb3 100644
+index 2d09bb2..59a122a 100644
 --- a/tests/test_server.py
 +++ b/tests/test_server.py
-@@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams,
+@@ -26,7 +26,7 @@ from pygls.lsp.types import (
-                          InitializeParams, Position, TextDocumentIdentifier,
+ )
-                          TextDocumentItem, TextDocumentPositionParams)
+ from pygls.server import LanguageServer
  
 -CALL_TIMEOUT = 2
 +CALL_TIMEOUT = None
  
  
- def _init(client: LanguageServer, root: Path):
+ def _init(client: LanguageServer, root: Path) -> None:

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

@@ -1,5 +1,5 @@
 diff --git a/pyproject.toml b/pyproject.toml
-index bc6251d..39d6686 100644
+index 417df1d..0f59857 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -19,7 +19,7 @@ classifiers = [
@@ -8,6 +8,6 @@ index bc6251d..39d6686 100644
  python = "^3.6"
 -pygls = "^0.11"
 +pygls = "^0.12"
- pyparsing = "^2.4"
  importlib-metadata = {version = "^4.8", python = "<3.8"}
  
+ [tool.poetry.dev-dependencies]

pkgs/top-level/all-packages.nix

@@ -15699,7 +15699,7 @@ with pkgs;
   cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
 
   cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server {
-    inherit cmake;
+    inherit cmake cmake-format;
   };
 
   # Does not actually depend on Qt 5