diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2022-08-09 18:55:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 18:55:13 -0400 |
| commit | f07ad0a0b52814bd42535f5c5c1fe9ba8f399459 (patch) | |
| tree | 789e00ac2dfe5527cff64d97e053c1e5c5efb0e9 | |
| parent | Merge pull request #185068 from kira-bruneau/linuxPackages.xpadneo (diff) | |
| parent | cmake-language-server: 0.1.5 → 0.1.6 (diff) | |
| download | nixpkgs-f07ad0a0b52814bd42535f5c5c1fe9ba8f399459.tar.gz | |
Merge pull request #185144 from kira-bruneau/cmake-language-server
cmake-language-server: 0.1.5 → 0.1.6
| -rw-r--r-- | pkgs/development/tools/misc/cmake-language-server/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch | 13 |
2 files changed, 2 insertions, 25 deletions
diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index fcaac283029a..168c40911e68 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/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 = [ 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 deleted file mode 100644 index 3ff3171aa3b3..000000000000 --- a/pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch +++ /dev/null @@ -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] |