pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #211901 from fabaff/jedi-language-server-fix

python310Packages.pygls: 0.13.0 -> 1.0.0, python310Packges.cmake-language-server: 0.1.6 -> unstable-2023-01-08

authored by

Fabian Affolter and committed by
GitHub 22a90868 bdbdd06d

+177 -24
unified split
+14 -8
pkgs/development/python-modules/jedi-language-server/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 3 + , docstring-to-markdown 4 4 , fetchFromGitHub 5 + , jedi 6 + , lsprotocol 5 7 , poetry-core 6 - , pythonRelaxDepsHook 7 - , docstring-to-markdown 8 - , jedi 9 8 , pygls 9 + , pydantic 10 + , pyhamcrest 10 11 , pytestCheckHook 11 - , pyhamcrest 12 12 , python-jsonrpc-server 13 + , pythonOlder 14 + , pythonRelaxDepsHook 13 15 }: 14 16 15 17 buildPythonPackage rec { 16 18 pname = "jedi-language-server"; 17 19 version = "0.40.0"; 18 20 format = "pyproject"; 21 + 22 + disabled = pythonOlder "3.8"; 19 23 20 24 src = fetchFromGitHub { 21 25 owner = "pappasam"; 22 26 repo = pname; 23 27 rev = "refs/tags/v${version}"; 24 - sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; 28 + hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; 25 29 }; 26 30 27 31 pythonRelaxDeps = [ ··· 36 40 propagatedBuildInputs = [ 37 41 docstring-to-markdown 38 42 jedi 43 + lsprotocol 44 + pydantic 39 45 pygls 40 46 ]; 41 47 ··· 54 60 ]; 55 61 56 62 meta = with lib; { 57 - homepage = "https://github.com/pappasam/jedi-language-server"; 58 - changelog = "https://github.com/pappasam/jedi-language-server/blob/${src.rev}/CHANGELOG.md"; 59 63 description = "A Language Server for the latest version(s) of Jedi"; 64 + homepage = "https://github.com/pappasam/jedi-language-server"; 65 + changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md"; 60 66 license = licenses.mit; 61 67 maintainers = with maintainers; [ doronbehar ]; 62 68 };
+66
pkgs/development/python-modules/lsprotocol/default.nix
··· 1 + { lib 2 + , attrs 3 + , buildPythonPackage 4 + , cattrs 5 + , fetchFromGitHub 6 + , flit-core 7 + , jsonschema 8 + , nox 9 + , pyhamcrest 10 + , pytest 11 + , pythonOlder 12 + }: 13 + 14 + buildPythonPackage rec { 15 + pname = "lsprotocol"; 16 + version = "2022.0.0a9"; 17 + format = "pyproject"; 18 + 19 + disabled = pythonOlder "3.7"; 20 + 21 + src = fetchFromGitHub { 22 + owner = "microsoft"; 23 + repo = pname; 24 + rev = "refs/tags/${version}"; 25 + hash = "sha256-6XecPKuBhwtkmZrGozzO+VEryI5wwy9hlvWE1oV6ajk="; 26 + }; 27 + 28 + nativeBuildInputs = [ 29 + flit-core 30 + nox 31 + ]; 32 + 33 + propagatedBuildInputs = [ 34 + attrs 35 + cattrs 36 + ]; 37 + 38 + nativeCheckInputs = [ 39 + pytest 40 + ]; 41 + 42 + checkInputs = [ 43 + jsonschema 44 + pyhamcrest 45 + ]; 46 + 47 + checkPhase = '' 48 + runHook preCheck 49 + 50 + sed -i "/^ _install_requirements/d" noxfile.py 51 + nox --session tests 52 + 53 + runHook postCheck 54 + ''; 55 + 56 + pythonImportsCheck = [ 57 + "lsprotocol" 58 + ]; 59 + 60 + meta = with lib; { 61 + description = "Python implementation of the Language Server Protocol"; 62 + homepage = "https://github.com/microsoft/lsprotocol"; 63 + license = licenses.mit; 64 + maintainers = with maintainers; [ doronbehar fab ]; 65 + }; 66 + }
+78
pkgs/development/python-modules/nox/default.nix
··· 1 + { lib 2 + , argcomplete 3 + , buildPythonPackage 4 + , colorlog 5 + , fetchFromGitHub 6 + , fetchpatch 7 + , setuptools 8 + , importlib-metadata 9 + , jinja2 10 + , packaging 11 + , pytestCheckHook 12 + , pythonOlder 13 + , tox 14 + , typing-extensions 15 + , virtualenv 16 + }: 17 + 18 + buildPythonPackage rec { 19 + pname = "nox"; 20 + version = "2022.11.21"; 21 + format = "pyproject"; 22 + 23 + disabled = pythonOlder "3.7"; 24 + 25 + src = fetchFromGitHub { 26 + owner = "wntrblm"; 27 + repo = pname; 28 + rev = "refs/tags/${version}"; 29 + hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU="; 30 + }; 31 + 32 + patches = [ 33 + # Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677 34 + (fetchpatch { 35 + name = "remove-py-pyth.patch"; 36 + url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch"; 37 + hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc="; 38 + }) 39 + ]; 40 + 41 + nativeBuildInputs = [ 42 + setuptools 43 + ]; 44 + 45 + propagatedBuildInputs = [ 46 + argcomplete 47 + colorlog 48 + packaging 49 + virtualenv 50 + ] ++ lib.optionals (pythonOlder "3.8") [ 51 + typing-extensions 52 + importlib-metadata 53 + ]; 54 + 55 + 56 + checkInputs = [ 57 + jinja2 58 + tox 59 + pytestCheckHook 60 + ]; 61 + 62 + pythonImportsCheck = [ 63 + "nox" 64 + ]; 65 + 66 + disabledTestPaths = [ 67 + # AttributeError: module 'tox.config' has... 68 + "tests/test_tox_to_nox.py" 69 + ]; 70 + 71 + meta = with lib; { 72 + description = "Flexible test automation for Python"; 73 + homepage = "https://nox.thea.codes/"; 74 + changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md"; 75 + license = licenses.asl20; 76 + maintainers = with maintainers; [ doronbehar fab ]; 77 + }; 78 + }
+4 -4
pkgs/development/python-modules/pygls/default.nix
··· 3 3 , pythonOlder 4 4 , fetchFromGitHub 5 5 , setuptools-scm 6 - , pydantic 6 + , lsprotocol 7 7 , toml 8 8 , typeguard 9 9 , mock ··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "pygls"; 16 - version = "0.13.0"; 16 + version = "1.0.0"; 17 17 format = "setuptools"; 18 18 19 19 disabled = pythonOlder "3.7"; ··· 22 22 owner = "openlawlibrary"; 23 23 repo = "pygls"; 24 24 rev = "v${version}"; 25 - hash = "sha256-guwOnB4EEUpucfprNLLr49Yn8EdOpRzzG+cT4NCn0rA="; 25 + hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM="; 26 26 }; 27 27 28 28 SETUPTOOLS_SCM_PRETEND_VERSION = version; ··· 32 32 ]; 33 33 34 34 propagatedBuildInputs = [ 35 - pydantic 35 + lsprotocol 36 36 typeguard 37 37 ]; 38 38
+11 -12
pkgs/development/tools/misc/cmake-language-server/default.nix
··· 1 1 { lib 2 2 , buildPythonApplication 3 3 , fetchFromGitHub 4 - , poetry-core 5 - , pythonRelaxDepsHook 6 4 , cmake-format 7 5 , pygls 8 6 , cmake 7 + , pdm-pep517 9 8 , pytest-datadir 10 9 , pytestCheckHook 11 10 }: 12 11 13 12 buildPythonApplication rec { 14 13 pname = "cmake-language-server"; 15 - version = "0.1.6"; 14 + version = "unstable-2023-01-08"; 16 15 format = "pyproject"; 17 16 18 17 src = fetchFromGitHub { 19 18 owner = "regen100"; 20 19 repo = pname; 21 - rev = "refs/tags/v${version}"; 22 - sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk="; 20 + rev = "60c376a5fda29835060687569cb212350a292116"; 21 + hash = "sha256-vNG43sZy2wMetY5mbgxIoei5jCCj1f8vWiovWtwzbPc="; 23 22 }; 23 + 24 + PDM_PEP517_SCM_VERSION = "2023.1"; 24 25 25 26 patches = [ 26 27 # Test timeouts occasionally cause the build to fail 27 28 ./disable-test-timeouts.patch 28 29 ]; 29 30 30 - pythonRelaxDeps = [ 31 - "pygls" 32 - ]; 33 - 34 31 nativeBuildInputs = [ 35 - poetry-core 36 - pythonRelaxDepsHook 32 + pdm-pep517 37 33 ]; 38 34 39 35 propagatedBuildInputs = [ ··· 49 45 ]; 50 46 51 47 dontUseCmakeConfigure = true; 52 - pythonImportsCheck = [ "cmake_language_server" ]; 48 + 49 + pythonImportsCheck = [ 50 + "cmake_language_server" 51 + ]; 53 52 54 53 meta = with lib; { 55 54 description = "CMake LSP Implementation";
+4
pkgs/top-level/python-packages.nix
··· 5538 5538 5539 5539 lsassy = callPackage ../development/python-modules/lsassy { }; 5540 5540 5541 + lsprotocol = callPackage ../development/python-modules/lsprotocol { }; 5542 + 5541 5543 luddite = callPackage ../development/python-modules/luddite { }; 5542 5544 5543 5545 ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; ··· 6159 6161 nanoleaf = callPackage ../development/python-modules/nanoleaf { }; 6160 6162 6161 6163 nomadnet = callPackage ../development/python-modules/nomadnet { }; 6164 + 6165 + nox = callPackage ../development/python-modules/nox { }; 6162 6166 6163 6167 nanomsg-python = callPackage ../development/python-modules/nanomsg-python { 6164 6168 inherit (pkgs) nanomsg;