From 905da8fe31fb40a71415601d02cd83d14ff41e93 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 15:24:02 +0200 Subject: [PATCH 1/4] python3Packages.demjson3: use finalAttrs --- pkgs/development/python-modules/demjson3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix index 6a46dc56adee..6171bc3281c8 100644 --- a/pkgs/development/python-modules/demjson3/default.nix +++ b/pkgs/development/python-modules/demjson3/default.nix @@ -5,13 +5,13 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "demjson3"; version = "3.0.6"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w="; }; @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 45515764f3b0ba54ad4e0b2b2b7a1e037b8d7fe3 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 15:25:56 +0200 Subject: [PATCH 2/4] python3Packages.demjson3: enable __structuredAttrs --- pkgs/development/python-modules/demjson3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix index 6171bc3281c8..d365f9e95a2c 100644 --- a/pkgs/development/python-modules/demjson3/default.nix +++ b/pkgs/development/python-modules/demjson3/default.nix @@ -10,6 +10,8 @@ buildPythonPackage (finalAttrs: { version = "3.0.6"; format = "setuptools"; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w="; From 43ce110e69ba8cbf79344e28300433bbb0c6b458 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 15:27:05 +0200 Subject: [PATCH 3/4] python3Packages.demjson3: use pytestCheckHook --- pkgs/development/python-modules/demjson3/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix index d365f9e95a2c..1b5b48755912 100644 --- a/pkgs/development/python-modules/demjson3/default.nix +++ b/pkgs/development/python-modules/demjson3/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - python, + pytestCheckHook, }: buildPythonPackage (finalAttrs: { @@ -17,9 +17,7 @@ buildPythonPackage (finalAttrs: { hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w="; }; - checkPhase = '' - ${python.interpreter} test/test_demjson3.py - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "demjson3" ]; From 43281640444498baa127b47ea337776fa2a7d12e Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 15:28:36 +0200 Subject: [PATCH 4/4] python3Packages.demjson3: migrate to pyproject --- pkgs/development/python-modules/demjson3/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix index 1b5b48755912..2c6101fa4d3b 100644 --- a/pkgs/development/python-modules/demjson3/default.nix +++ b/pkgs/development/python-modules/demjson3/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + setuptools, }: buildPythonPackage (finalAttrs: { pname = "demjson3"; version = "3.0.6"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -17,6 +18,8 @@ buildPythonPackage (finalAttrs: { hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "demjson3" ];