Merge pull request #262733 from kalekseev/pygls-bump
python311Packages.pygls: 1.0.2 -> 1.1.1
This commit is contained in:
commit
e6726841be
4 changed files with 27 additions and 21 deletions
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jedi-language-server";
|
pname = "jedi-language-server";
|
||||||
version = "0.41.0";
|
version = "0.41.1-unstable-2023-10-04";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -24,8 +24,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pappasam";
|
owner = "pappasam";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "c4c470cff67e54593a626b22d1b6b05e56fde3a3";
|
||||||
hash = "sha256-1ujEhoxWcCM1g640aLE60YGiNQLB+G7t7oLVZXW8AMM=";
|
hash = "sha256-qFBni97B/GkabbznnZtWTG4dCHFkOx5UQjuevxq+Uvo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|
|
@ -3,19 +3,17 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, setuptools-scm
|
|
||||||
, lsprotocol
|
, lsprotocol
|
||||||
, toml
|
|
||||||
, typeguard
|
, typeguard
|
||||||
, mock
|
, poetry-core
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pygls";
|
pname = "pygls";
|
||||||
version = "1.0.2";
|
version = "1.1.1";
|
||||||
format = "setuptools";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
@ -23,13 +21,11 @@ buildPythonPackage rec {
|
||||||
owner = "openlawlibrary";
|
owner = "openlawlibrary";
|
||||||
repo = "pygls";
|
repo = "pygls";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-z673NRlnudFyDjKoM+xCbMRTFwh+tjUf4BaNtjwvKx8=";
|
hash = "sha256-FOuBS/UJpkYbuIu193vkSpN/77gf+UWiS5f/t8BpAk4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
setuptools-scm
|
poetry-core
|
||||||
toml
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -38,7 +34,6 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
mock
|
|
||||||
pytest-asyncio
|
pytest-asyncio
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ruff-lsp";
|
pname = "ruff-lsp";
|
||||||
version = "0.0.40";
|
version = "0.0.42";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||||
owner = "astral-sh";
|
owner = "astral-sh";
|
||||||
repo = "ruff-lsp";
|
repo = "ruff-lsp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-CQ4SDIGhUTn7fdvoGag+XM7HcY+qJyp9McyzpoTQ0tM=";
|
hash = "sha256-Dn/xPjYCyJYlDNMUfl61L/tWq5mRJ8WD0G5qZH9OepY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -4,32 +4,33 @@
|
||||||
, cmake-format
|
, cmake-format
|
||||||
, pygls
|
, pygls
|
||||||
, cmake
|
, cmake
|
||||||
, pdm-pep517
|
, pdm-backend
|
||||||
, pytest-datadir
|
, pytest-datadir
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "cmake-language-server";
|
pname = "cmake-language-server";
|
||||||
version = "0.1.7";
|
version = "0.1.8";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "regen100";
|
owner = "regen100";
|
||||||
repo = "cmake-language-server";
|
repo = "cmake-language-server";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-ExEAi47hxxEJeoT3FCwpRwJrf3URnI47/5FDL7fS5sY=";
|
hash = "sha256-7AlF+FqhZR+6lLsR1dxAGHd/GU+mB3ojYLDXVm7Il4M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
PDM_PEP517_SCM_VERSION = version;
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Test timeouts occasionally cause the build to fail
|
# Test timeouts occasionally cause the build to fail
|
||||||
./disable-test-timeouts.patch
|
./disable-test-timeouts.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pdm-pep517
|
pdm-backend
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -44,6 +45,16 @@ buildPythonApplication rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# version.py generated by pdm, no idea why it's not present in test phase
|
||||||
|
# https://github.com/regen100/cmake-language-server/blob/68bbc8187b6110a75f498647af7c44df790ffa87/pyproject.toml#L35-L36
|
||||||
|
preCheck = ''
|
||||||
|
echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py
|
||||||
|
'';
|
||||||
|
|
||||||
|
postCheck = ''
|
||||||
|
rm cmake_language_server/version.py
|
||||||
|
'';
|
||||||
|
|
||||||
dontUseCmakeConfigure = true;
|
dontUseCmakeConfigure = true;
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
|
Loading…
Reference in a new issue