From a675a23d9dc8ccfc61a26abc779b9d1bbca87b3f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 Jul 2026 01:11:33 +0200 Subject: [PATCH 1/3] python3Packages.extras: migrate to pyproject --- pkgs/development/python-modules/extras/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index d73a0c050ea7..42693161bad6 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "extras"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; }; + build-system = [ setuptools ]; + # error: invalid command 'test' doCheck = false; From 40a34c7ed42de1975f5ef48923031041f6407ff6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 Jul 2026 01:12:48 +0200 Subject: [PATCH 2/3] python3Packages.extras: use finalAttrs --- pkgs/development/python-modules/extras/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index 42693161bad6..eea0fcc57049 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -5,14 +5,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extras"; version = "1.0.0"; pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; + inherit (finalAttrs) pname version; + hash = "sha256-Ey423hC5yR1dTMYgFgpHbgRoqI8WyUMYF6ZylhGoG04="; }; build-system = [ setuptools ]; @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/extras"; license = lib.licenses.mit; }; -} +}) From 9d499eb9c263d7083fe46cc271c8d6b6cac28266 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 Jul 2026 01:13:22 +0200 Subject: [PATCH 3/3] python3Packages.extras: enable tests --- pkgs/development/python-modules/extras/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index eea0fcc57049..a7fd5bbdb958 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchPypi, setuptools, + pytestCheckHook, + testtools, }: buildPythonPackage (finalAttrs: { @@ -17,8 +19,15 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - # error: invalid command 'test' - doCheck = false; + preCheck = '' + substituteInPlace extras/tests/test_extras.py \ + --replace-fail "assertEquals(" "assertEqual(" + ''; + + nativeCheckInputs = [ + pytestCheckHook + testtools + ]; meta = { description = "Useful extra bits for Python - things that should be in the standard library";