From dcd7be06e82b41bea3f4e08970d34dba0b383a83 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 11 Jul 2022 16:02:46 -0400 Subject: [PATCH 1/3] cmake-language-server: move to pkgs/development/tools/misc --- .../tools/{ => misc}/cmake-language-server/default.nix | 0 .../cmake-language-server/disable-test-timeouts.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/tools/{ => misc}/cmake-language-server/default.nix (100%) rename pkgs/development/tools/{ => misc}/cmake-language-server/disable-test-timeouts.patch (100%) diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix similarity index 100% rename from pkgs/development/tools/cmake-language-server/default.nix rename to pkgs/development/tools/misc/cmake-language-server/default.nix diff --git a/pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch b/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch similarity index 100% rename from pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch rename to pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dec06f3853ff..07b6bf1539ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15698,7 +15698,7 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { + cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { inherit cmake; }; From 1a03d094f47a0f6ceac1a9de6bc52be2a954268d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 17:41:15 -0400 Subject: [PATCH 2/3] cmake-language-server: fix build using latest pygls version --- .../tools/misc/cmake-language-server/default.nix | 3 +++ .../cmake-language-server/use-latest-pygls.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 12c14fcb73b4..deb5599770f0 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -24,6 +24,9 @@ buildPythonApplication rec { 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 = '' 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 new file mode 100644 index 000000000000..5e1d80dd8788 --- /dev/null +++ b/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch @@ -0,0 +1,13 @@ +diff --git a/pyproject.toml b/pyproject.toml +index bc6251d..39d6686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -19,7 +19,7 @@ classifiers = [ + + [tool.poetry.dependencies] + python = "^3.6" +-pygls = "^0.11" ++pygls = "^0.12" + pyparsing = "^2.4" + importlib-metadata = {version = "^4.8", python = "<3.8"} + From 3c98399b9da00c5cdb6405d3ab58f8e73b1dae09 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 21:02:11 -0400 Subject: [PATCH 3/3] =?UTF-8?q?cmake-language-server:=200.1.4=20=E2=86=92?= =?UTF-8?q?=200.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/cmake-language-server/default.nix | 26 ++++++++++++++----- .../disable-test-timeouts.patch | 10 +++---- .../use-latest-pygls.patch | 4 +-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index deb5599770f0..fcaac283029a 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 febe7cf77e71..6b66681056bb 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 5e1d80dd8788..3ff3171aa3b3 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] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07b6bf1539ba..c4896b0d85eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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