From 786d31333e6170e67ebd88f90727b795b749e315 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 20 Jul 2026 01:29:56 +0200 Subject: [PATCH 1/3] python3Packages.datadiff: migrate to pyproject --- pkgs/development/python-modules/datadiff/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 9fe82d8d38ad..9204d31b8cce 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "datadiff"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws="; }; + build-system = [ setuptools ]; + # Tests are not part of the PyPI releases doCheck = false; From 88e634779efa527dcf649a71cc2a1f04d890958b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 20 Jul 2026 01:30:21 +0200 Subject: [PATCH 2/3] python3Packages.datadiff: use finalAttrs --- pkgs/development/python-modules/datadiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 9204d31b8cce..e9f552b738ed 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -5,13 +5,13 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datadiff"; version = "2.2.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 2e3b53b3a8ca1b8b8dcb3fe2d2ecbc9fac838e53 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 20 Jul 2026 01:32:40 +0200 Subject: [PATCH 3/3] python3Packages.datadiff: enable tests --- .../development/python-modules/datadiff/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index e9f552b738ed..5440f6ee8e34 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchPypi, setuptools, + pytestCheckHook, + six, }: buildPythonPackage (finalAttrs: { @@ -17,11 +19,18 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - # Tests are not part of the PyPI releases - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + six + ]; pythonImportsCheck = [ "datadiff" ]; + disabledTests = [ + # slice is an hashable type in recent python versions + "test_unhashable_type" + ]; + meta = { description = "Library to provide human-readable diffs of Python data structures"; homepage = "https://sourceforge.net/projects/datadiff/";