mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-13 21:56:29 +01:00
python3Packages.devpi-{server,ldap,common,client}: fixes (#494912)
This commit is contained in:
commit
de451eacad
7 changed files with 75 additions and 43 deletions
|
|
@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
|||
++ (with python3.pkgs; [
|
||||
mercurial
|
||||
mock
|
||||
packaging-legacy
|
||||
pypitoken
|
||||
pytestCheckHook
|
||||
sphinx
|
||||
|
|
|
|||
4
pkgs/by-name/de/devpi-server/package.nix
Normal file
4
pkgs/by-name/de/devpi-server/package.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{ python3Packages }:
|
||||
|
||||
with python3Packages;
|
||||
toPythonApplication devpi-server
|
||||
|
|
@ -2,14 +2,18 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
lazy,
|
||||
requests,
|
||||
tomli,
|
||||
|
||||
# tests
|
||||
packaging-legacy,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
setuptools-changelog-shortener,
|
||||
setuptools,
|
||||
tomli,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
|
|
@ -24,26 +28,30 @@ buildPythonPackage (finalAttrs: {
|
|||
hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools_changelog_shortener",' ""
|
||||
'';
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/common";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-changelog-shortener
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
lazy
|
||||
packaging-legacy
|
||||
requests
|
||||
tomli
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
packaging-legacy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "devpi_common" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/devpi/devpi";
|
||||
description = "Utilities jointly used by devpi-server and devpi-client";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
devpi-server,
|
||||
fetchFromGitHub,
|
||||
ldap3,
|
||||
mock,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonAtLeast,
|
||||
pyyaml,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-changelog-shortener,
|
||||
|
||||
# dependencies
|
||||
devpi-server,
|
||||
ldap3,
|
||||
pyyaml,
|
||||
|
||||
# tests
|
||||
packaging-legacy,
|
||||
pytest-cov-stub,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
webtest,
|
||||
}:
|
||||
|
||||
|
|
@ -20,9 +24,6 @@ buildPythonPackage (finalAttrs: {
|
|||
version = "2.1.1-unstable-2026-01-22";
|
||||
pyproject = true;
|
||||
|
||||
# build-system broken for 3.14, package incompatible <3.13
|
||||
disabled = pythonOlder "3.13" || pythonAtLeast "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devpi";
|
||||
repo = "devpi-ldap";
|
||||
|
|
@ -30,27 +31,33 @@ buildPythonPackage (finalAttrs: {
|
|||
hash = "sha256-2LpreWmG6WMRrc5L7ylSej5Ce6VhfNDAW2eoJ76D49o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools_changelog_shortener",' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-changelog-shortener
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
devpi-server
|
||||
pyyaml
|
||||
ldap3
|
||||
pyyaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
devpi-server
|
||||
mock
|
||||
packaging-legacy
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
webtest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "devpi_ldap" ];
|
||||
|
||||
passthru.skipBulkUpdate = true; # avoid reversion to previous stable version
|
||||
|
||||
meta = {
|
||||
description = "LDAP authentication for devpi-server";
|
||||
homepage = "https://github.com/devpi/devpi-ldap";
|
||||
|
|
|
|||
|
|
@ -1,37 +1,45 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
gitUpdater,
|
||||
buildPythonPackage,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
appdirs,
|
||||
beautifulsoup4,
|
||||
defusedxml,
|
||||
devpi-common,
|
||||
execnet,
|
||||
httpx,
|
||||
itsdangerous,
|
||||
nginx,
|
||||
packaging,
|
||||
passlib,
|
||||
platformdirs,
|
||||
pluggy,
|
||||
py,
|
||||
httpx,
|
||||
pyramid,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
repoze-lru,
|
||||
setuptools,
|
||||
setuptools-changelog-shortener,
|
||||
strictyaml,
|
||||
waitress,
|
||||
|
||||
# tests
|
||||
beautifulsoup4,
|
||||
nginx,
|
||||
packaging-legacy,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
webtest,
|
||||
testers,
|
||||
|
||||
# passthru
|
||||
devpi-server,
|
||||
gitUpdater,
|
||||
nixosTests,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildPythonApplication (finalAttrs: {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "devpi-server";
|
||||
version = "6.19.1";
|
||||
pyproject = true;
|
||||
|
|
@ -43,11 +51,15 @@ buildPythonApplication (finalAttrs: {
|
|||
hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools_changelog_shortener",' ""
|
||||
'';
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/server";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-changelog-shortener
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
|
@ -56,25 +68,25 @@ buildPythonApplication (finalAttrs: {
|
|||
defusedxml
|
||||
devpi-common
|
||||
execnet
|
||||
httpx
|
||||
itsdangerous
|
||||
packaging
|
||||
passlib
|
||||
platformdirs
|
||||
pluggy
|
||||
py
|
||||
pyramid
|
||||
repoze-lru
|
||||
setuptools
|
||||
strictyaml
|
||||
waitress
|
||||
py
|
||||
httpx
|
||||
]
|
||||
++ passlib.optional-dependencies.argon2;
|
||||
|
||||
nativeCheckInputs = [
|
||||
beautifulsoup4
|
||||
nginx
|
||||
py
|
||||
packaging-legacy
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
webtest
|
||||
|
|
@ -3820,8 +3820,6 @@ with pkgs;
|
|||
llvmPackages = crystal.llvmPackages;
|
||||
};
|
||||
|
||||
devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
|
||||
|
||||
dprint-plugins = recurseIntoAttrs (callPackage ../by-name/dp/dprint/plugins { });
|
||||
|
||||
reaction-plugins = reaction.passthru.plugins;
|
||||
|
|
|
|||
|
|
@ -3870,6 +3870,8 @@ self: super: with self; {
|
|||
|
||||
devpi-ldap = callPackage ../development/python-modules/devpi-ldap { };
|
||||
|
||||
devpi-server = callPackage ../development/python-modules/devpi-server { };
|
||||
|
||||
devtools = callPackage ../development/python-modules/devtools { };
|
||||
|
||||
dfdiskcache = callPackage ../development/python-modules/dfdiskcache { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue