pyrox.dev / nixpkgs
lol
fork atom

cmake-language-server: 0.1.4 → 0.1.5

Kira Bruneau 3c98399b 1a03d094

+28 -14
unified split
+20 -6
pkgs/development/tools/misc/cmake-language-server/default.nix
··· 2 2 , buildPythonApplication 3 3 , fetchFromGitHub 4 4 , poetry 5 + , cmake-format 5 6 , pygls 6 7 , pyparsing 7 8 , cmake ··· 11 12 12 13 buildPythonApplication rec { 13 14 pname = "cmake-language-server"; 14 - version = "0.1.4"; 15 + version = "0.1.5"; 15 16 format = "pyproject"; 16 17 17 18 src = fetchFromGitHub { 18 19 owner = "regen100"; 19 20 repo = pname; 20 - rev = "v${version}"; 21 - sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY="; 21 + rev = "refs/tags/v${version}"; 22 + sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ="; 22 23 }; 23 24 24 25 patches = [ ··· 34 35 --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' 35 36 ''; 36 37 37 - nativeBuildInputs = [ poetry ]; 38 - propagatedBuildInputs = [ pygls pyparsing ]; 38 + nativeBuildInputs = [ 39 + poetry 40 + ]; 39 41 40 - checkInputs = [ cmake pytest-datadir pytestCheckHook ]; 42 + propagatedBuildInputs = [ 43 + cmake-format 44 + pygls 45 + pyparsing 46 + ]; 47 + 48 + checkInputs = [ 49 + cmake 50 + cmake-format 51 + pytest-datadir 52 + pytestCheckHook 53 + ]; 54 + 41 55 dontUseCmakeConfigure = true; 42 56 pythonImportsCheck = [ "cmake_language_server" ]; 43 57
+5 -5
pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch
··· 1 1 diff --git a/tests/test_server.py b/tests/test_server.py 2 - index c0777f5..1184fb3 100644 2 + index 2d09bb2..59a122a 100644 3 3 --- a/tests/test_server.py 4 4 +++ b/tests/test_server.py 5 - @@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams, 6 - InitializeParams, Position, TextDocumentIdentifier, 7 - TextDocumentItem, TextDocumentPositionParams) 5 + @@ -26,7 +26,7 @@ from pygls.lsp.types import ( 6 + ) 7 + from pygls.server import LanguageServer 8 8 9 9 -CALL_TIMEOUT = 2 10 10 +CALL_TIMEOUT = None 11 11 12 12 13 - def _init(client: LanguageServer, root: Path): 13 + def _init(client: LanguageServer, root: Path) -> None:
+2 -2
pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch
··· 1 1 diff --git a/pyproject.toml b/pyproject.toml 2 - index bc6251d..39d6686 100644 2 + index 417df1d..0f59857 100644 3 3 --- a/pyproject.toml 4 4 +++ b/pyproject.toml 5 5 @@ -19,7 +19,7 @@ classifiers = [ ··· 8 8 python = "^3.6" 9 9 -pygls = "^0.11" 10 10 +pygls = "^0.12" 11 - pyparsing = "^2.4" 12 11 importlib-metadata = {version = "^4.8", python = "<3.8"} 13 12 13 + [tool.poetry.dev-dependencies]
+1 -1
pkgs/top-level/all-packages.nix
··· 15699 15699 cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; 15700 15700 15701 15701 cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { 15702 - inherit cmake; 15702 + inherit cmake cmake-format; 15703 15703 }; 15704 15704 15705 15705 # Does not actually depend on Qt 5