diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
| commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
| tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/development/python-modules/python-lsp-server | |
| parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
| parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
| download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/python-lsp-server')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 2dca97b7f858..a74ebb5b5bb9 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -4,9 +4,9 @@ , buildPythonPackage , docstring-to-markdown , fetchFromGitHub -, fetchpatch , flake8 , flaky +, importlib-metadata , jedi , matplotlib , mccabe @@ -19,9 +19,9 @@ , pylint , pyqt5 , pytestCheckHook -, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder +, pythonRelaxDepsHook , rope , setuptools , setuptools-scm @@ -35,27 +35,18 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.4"; + version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; + hash = "sha256-hLgMGZumuNY70/qyD9t5pMpYI/g70sqFIt1LEfIEALY="; }; - patches = [ - # https://github.com/python-lsp/python-lsp-server/pull/416 - (fetchpatch { - name = "bump-jedi-upper-pin-to-0.20.patch"; - url = "https://github.com/python-lsp/python-lsp-server/commit/f33a93afc8c3a0f16751f9e1f6601a37967fd7df.patch"; - hash = "sha256-lBpzXxjlQp2ig0z2DRJw+jQZ5eRLIOJYjGrzfgvknDA="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ @@ -86,6 +77,8 @@ buildPythonPackage rec { python-lsp-jsonrpc setuptools # `pkg_resources`imported in pylsp/config/config.py ujson + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; passthru.optional-dependencies = { |