From 5b7735b9a699614e83ab2e301ec47368fd209c7d Mon Sep 17 00:00:00 2001 From: confus Date: Fri, 20 Feb 2026 01:26:37 +0100 Subject: [PATCH 1/4] devpi-server: add confus as maintainer --- pkgs/development/tools/devpi-server/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 7e14bf57d680..7185abbb45b6 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -123,7 +123,7 @@ buildPythonApplication rec { }; }; - # devpi uses a monorepo for server,common,client and web + # devpi uses a monorepo for server, common, client and web passthru.updateScript = gitUpdater { rev-prefix = "server-"; }; @@ -133,6 +133,9 @@ buildPythonApplication rec { description = "Github-style pypi index server and packaging meta tool"; changelog = "https://github.com/devpi/devpi/blob/${src.rev}/server/CHANGELOG"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ makefu ]; + maintainers = with lib.maintainers; [ + confus + makefu + ]; }; } From 4ed17b73ce4220465ed5947e0f74aab54f580f24 Mon Sep 17 00:00:00 2001 From: confus Date: Fri, 20 Feb 2026 01:47:56 +0100 Subject: [PATCH 2/4] devpi-server: 6.15.0 -> 6.19.1 --- .../development/tools/devpi-server/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 7185abbb45b6..5727b1927352 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -22,6 +22,7 @@ pytestCheckHook, repoze-lru, setuptools, + setuptools-changelog-shortener, strictyaml, waitress, webtest, @@ -32,25 +33,21 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.15.0"; + version = "6.19.1"; pyproject = true; src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-tKR1xZju5bDbFu8t3SunTM8FlaXodSm/OjJ3Jfl7Dzk="; + hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE="; }; sourceRoot = "${src.name}/server"; - postPatch = '' - substituteInPlace tox.ini \ - --replace "--flake8" "" - ''; - nativeBuildInputs = [ setuptools + setuptools-changelog-shortener ]; propagatedBuildInputs = [ @@ -102,12 +99,7 @@ buildPythonApplication rec { "test_devpi_server/test_streaming_replica_nginx.py" ]; disabledTests = [ - "root_passwd_hash_option" - "TestMirrorIndexThings" - "test_auth_mirror_url_no_hash" - "test_auth_mirror_url_with_hash" - "test_auth_mirror_url_hidden_in_logs" - "test_simplelinks_timeout" + "test_fetch_later_deleted" # incompatible with newer pytest ]; __darwinAllowLocalNetworking = true; From dc91536b405a23288316ab3bb7d7e278f397bdf1 Mon Sep 17 00:00:00 2001 From: confus Date: Fri, 20 Feb 2026 01:51:57 +0100 Subject: [PATCH 3/4] devpi-server: switch rec to finalAttrs --- pkgs/development/tools/devpi-server/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 5727b1927352..4463adc31f87 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -31,7 +31,7 @@ nixosTests, }: -buildPythonApplication rec { +buildPythonApplication (finalAttrs: { pname = "devpi-server"; version = "6.19.1"; pyproject = true; @@ -39,18 +39,18 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; - rev = "server-${version}"; + tag = "server-${finalAttrs.version}"; hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE="; }; - sourceRoot = "${src.name}/server"; + sourceRoot = "${finalAttrs.src.name}/server"; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-changelog-shortener ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp appdirs defusedxml @@ -123,11 +123,11 @@ buildPythonApplication rec { meta = { homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; - changelog = "https://github.com/devpi/devpi/blob/${src.rev}/server/CHANGELOG"; + changelog = "https://github.com/devpi/devpi/blob/${finalAttrs.src.tag}/server/CHANGELOG"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ confus makefu ]; }; -} +}) From 58e1d5c3720df7db63aacddf46dc5333c92d8b9f Mon Sep 17 00:00:00 2001 From: confus Date: Fri, 20 Feb 2026 12:01:58 +0100 Subject: [PATCH 4/4] devpi-ldap: disable for Python 3.14 --- pkgs/development/python-modules/devpi-ldap/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix index 3112bc4fd52f..cbb78585c1da 100644 --- a/pkgs/development/python-modules/devpi-ldap/default.nix +++ b/pkgs/development/python-modules/devpi-ldap/default.nix @@ -9,6 +9,7 @@ pytest-flake8, pytestCheckHook, pythonOlder, + pythonAtLeast, pyyaml, setuptools, webtest, @@ -19,7 +20,8 @@ buildPythonPackage { version = "2.1.1-unstable-2023-11-28"; pyproject = true; - disabled = pythonOlder "3.13"; + # build-system broken for 3.14, package incompatible <3.13 + disabled = pythonOlder "3.13" || pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "devpi";