diff options
author | Kira Bruneau <kira.bruneau@pm.me> | 2022-08-02 21:02:11 -0400 |
---|---|---|
committer | Kira Bruneau <kira.bruneau@pm.me> | 2022-08-02 22:20:52 -0400 |
commit | 3c98399b9da00c5cdb6405d3ab58f8e73b1dae09 (patch) | |
tree | 92cccd59b0bceabfc261b786accc380d3723aacb /pkgs/development/tools/misc/cmake-language-server | |
parent | 1a03d094f47a0f6ceac1a9de6bc52be2a954268d (diff) |
cmake-language-server: 0.1.4 → 0.1.5
Diffstat (limited to 'pkgs/development/tools/misc/cmake-language-server')
3 files changed, 27 insertions, 13 deletions
diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index deb5599770f05..fcaac283029a5 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/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}"; - sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ="; }; patches = [ @@ -34,10 +35,23 @@ buildPythonApplication rec { --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' ''; - nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ pygls pyparsing ]; + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + cmake-format + pygls + pyparsing + ]; + + checkInputs = [ + cmake + cmake-format + pytest-datadir + pytestCheckHook + ]; - checkInputs = [ cmake pytest-datadir pytestCheckHook ]; dontUseCmakeConfigure = true; pythonImportsCheck = [ "cmake_language_server" ]; diff --git a/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch b/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch index febe7cf77e71a..6b66681056bbf 100644 --- a/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch +++ b/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, - InitializeParams, Position, TextDocumentIdentifier, - TextDocumentItem, TextDocumentPositionParams) +@@ -26,7 +26,7 @@ from pygls.lsp.types import ( + ) + from pygls.server import LanguageServer -CALL_TIMEOUT = 2 +CALL_TIMEOUT = None - def _init(client: LanguageServer, root: Path): + def _init(client: LanguageServer, root: Path) -> None: 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 index 5e1d80dd87881..3ff3171aa3b3c 100644 --- a/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch +++ b/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] |