From 36040bb2438a4a27d94b31524381faa60a18ad8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Sep 2025 10:09:08 +0200 Subject: [PATCH 1/2] python313Packages.amazon-ion: use pytest_7 --- pkgs/development/python-modules/amazon-ion/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index a7569cd5d06a..f4819606c9c7 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, jsonconversion, pytestCheckHook, + pytest_7, pythonOlder, setuptools, six, @@ -43,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cbor2 docopt - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) tabulate ]; From 0fb1590db0a4223b1f9b3d37bad69169cf8a7847 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Sep 2025 10:09:53 +0200 Subject: [PATCH 2/2] python313Packages.amazon-ion: modernize --- pkgs/development/python-modules/amazon-ion/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index f4819606c9c7..0d4a9bd1578b 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -7,7 +7,6 @@ jsonconversion, pytestCheckHook, pytest_7, - pythonOlder, setuptools, six, tabulate, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "amazon-ion"; repo = "ion-python"; @@ -34,9 +31,9 @@ buildPythonPackage rec { --replace "'pytest-runner'," "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jsonconversion six ];