mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
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
This commit is contained in:
commit
22a9086877
|
@ -1,15 +1,17 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, docstring-to-markdown
|
||||
, fetchFromGitHub
|
||||
, jedi
|
||||
, lsprotocol
|
||||
, poetry-core
|
||||
, pygls
|
||||
, pytestCheckHook
|
||||
, pydantic
|
||||
, pyhamcrest
|
||||
, pytestCheckHook
|
||||
, python-jsonrpc-server
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -17,11 +19,13 @@ buildPythonPackage rec {
|
|||
version = "0.40.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pappasam";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8=";
|
||||
hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -36,6 +40,8 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
docstring-to-markdown
|
||||
jedi
|
||||
lsprotocol
|
||||
pydantic
|
||||
pygls
|
||||
];
|
||||
|
||||
|
@ -54,9 +60,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pappasam/jedi-language-server";
|
||||
changelog = "https://github.com/pappasam/jedi-language-server/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "A Language Server for the latest version(s) of Jedi";
|
||||
homepage = "https://github.com/pappasam/jedi-language-server";
|
||||
changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
|
|
66
pkgs/development/python-modules/lsprotocol/default.nix
Normal file
66
pkgs/development/python-modules/lsprotocol/default.nix
Normal file
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, cattrs
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, jsonschema
|
||||
, nox
|
||||
, pyhamcrest
|
||||
, pytest
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lsprotocol";
|
||||
version = "2022.0.0a9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6XecPKuBhwtkmZrGozzO+VEryI5wwy9hlvWE1oV6ajk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
nox
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
cattrs
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jsonschema
|
||||
pyhamcrest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
sed -i "/^ _install_requirements/d" noxfile.py
|
||||
nox --session tests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"lsprotocol"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/microsoft/lsprotocol";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar fab ];
|
||||
};
|
||||
}
|
78
pkgs/development/python-modules/nox/default.nix
Normal file
78
pkgs/development/python-modules/nox/default.nix
Normal file
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, argcomplete
|
||||
, buildPythonPackage
|
||||
, colorlog
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, importlib-metadata
|
||||
, jinja2
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tox
|
||||
, typing-extensions
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nox";
|
||||
version = "2022.11.21";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wntrblm";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677
|
||||
(fetchpatch {
|
||||
name = "remove-py-pyth.patch";
|
||||
url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch";
|
||||
hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argcomplete
|
||||
colorlog
|
||||
packaging
|
||||
virtualenv
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
|
||||
checkInputs = [
|
||||
jinja2
|
||||
tox
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nox"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AttributeError: module 'tox.config' has...
|
||||
"tests/test_tox_to_nox.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flexible test automation for Python";
|
||||
homepage = "https://nox.thea.codes/";
|
||||
changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ doronbehar fab ];
|
||||
};
|
||||
}
|
|
@ -3,7 +3,7 @@
|
|||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pydantic
|
||||
, lsprotocol
|
||||
, toml
|
||||
, typeguard
|
||||
, mock
|
||||
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "0.13.0";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "openlawlibrary";
|
||||
repo = "pygls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-guwOnB4EEUpucfprNLLr49Yn8EdOpRzzG+cT4NCn0rA=";
|
||||
hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pydantic
|
||||
lsprotocol
|
||||
typeguard
|
||||
];
|
||||
|
||||
|
|
|
@ -1,39 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, cmake-format
|
||||
, pygls
|
||||
, cmake
|
||||
, pdm-pep517
|
||||
, pytest-datadir
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cmake-language-server";
|
||||
version = "0.1.6";
|
||||
version = "unstable-2023-01-08";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regen100";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk=";
|
||||
rev = "60c376a5fda29835060687569cb212350a292116";
|
||||
hash = "sha256-vNG43sZy2wMetY5mbgxIoei5jCCj1f8vWiovWtwzbPc=";
|
||||
};
|
||||
|
||||
PDM_PEP517_SCM_VERSION = "2023.1";
|
||||
|
||||
patches = [
|
||||
# Test timeouts occasionally cause the build to fail
|
||||
./disable-test-timeouts.patch
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pygls"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
pdm-pep517
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -49,7 +45,10 @@ buildPythonApplication rec {
|
|||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
pythonImportsCheck = [ "cmake_language_server" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cmake_language_server"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CMake LSP Implementation";
|
||||
|
|
|
@ -5538,6 +5538,8 @@ self: super: with self; {
|
|||
|
||||
lsassy = callPackage ../development/python-modules/lsassy { };
|
||||
|
||||
lsprotocol = callPackage ../development/python-modules/lsprotocol { };
|
||||
|
||||
luddite = callPackage ../development/python-modules/luddite { };
|
||||
|
||||
ludios_wpull = callPackage ../development/python-modules/ludios_wpull { };
|
||||
|
@ -6160,6 +6162,8 @@ self: super: with self; {
|
|||
|
||||
nomadnet = callPackage ../development/python-modules/nomadnet { };
|
||||
|
||||
nox = callPackage ../development/python-modules/nox { };
|
||||
|
||||
nanomsg-python = callPackage ../development/python-modules/nanomsg-python {
|
||||
inherit (pkgs) nanomsg;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue