From c6a270fcbcb892d33c8fdcde128230d35f9075fc Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 27 Feb 2026 09:43:42 -0800 Subject: [PATCH] devpi-ldap: fix build --- .../python-modules/devpi-ldap/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix index d5cb45aa8995..b70a21907067 100644 --- a/pkgs/development/python-modules/devpi-ldap/default.nix +++ b/pkgs/development/python-modules/devpi-ldap/default.nix @@ -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";