From 95cd511142b3fad224e8d14760f0fcc9b43aa5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Sep 2025 08:06:10 -0700 Subject: [PATCH] python3Packages.approvaltests: 15.0.0 -> 15.3.2 Diff: https://github.com/approvals/ApprovalTests.Python/compare/v15.0.0...v15.3.2 Changelog: https://github.com/approvals/ApprovalTests.Python/releases/tag/v15.3.2 --- .../python-modules/approval-utilities/default.nix | 8 +++----- .../python-modules/approvaltests/default.nix | 13 +++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix index e0081554dedd..4d5da8a1c5c3 100644 --- a/pkgs/development/python-modules/approval-utilities/default.nix +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, approvaltests, - pythonOlder, setuptools, typing-extensions, }: @@ -10,16 +9,15 @@ buildPythonPackage { pname = "approval-utilities"; inherit (approvaltests) version src; - disabled = pythonOlder "3.7"; pyproject = true; - postPatch = '' + postPatch = approvaltests.postPatch or "" + '' mv setup.approval_utilities.py setup.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # used in approval_utilities/utilities/time_utilities.py typing-extensions ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index f089156fa44a..dac819f912b2 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -12,6 +12,7 @@ pytest, pytest-asyncio, pytestCheckHook, + pyyaml, setuptools, testfixtures, typing-extensions, @@ -19,16 +20,23 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "15.0.0"; + version = "15.3.2"; pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8="; + hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y="; }; + postPatch = '' + echo 'version_number = "${version}"' > version.py + mv .github approvaltests approval_utilities tests setup + cd setup + rm setup.cfg + ''; + build-system = [ setuptools ]; dependencies = [ @@ -47,6 +55,7 @@ buildPythonPackage rec { numpy pytest-asyncio pytestCheckHook + pyyaml ]; disabledTests = [