From 128c4f1f95d1bd660f22b271b68efc47d7a389df Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 21 Aug 2026 23:50:36 +0200 Subject: [PATCH 1/2] python3Packages.jsonmerge: migrate to pyproject --- pkgs/development/python-modules/jsonmerge/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 1bcf41ccbcf7..bf8ddf3aefd0 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -4,20 +4,23 @@ fetchPypi, jsonschema, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "jsonmerge"; version = "1.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; - propagatedBuildInputs = [ jsonschema ]; + build-system = [ setuptools ]; + + dependencies = [ jsonschema ]; nativeCheckInputs = [ pytestCheckHook ]; From 2033be9e05e9945471c683d1eb5628a7b3ed71c6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 21 Aug 2026 23:51:37 +0200 Subject: [PATCH 2/2] python3Packages.jsonmerge: modernize --- pkgs/development/python-modules/jsonmerge/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index bf8ddf3aefd0..9a5494e6bb34 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,14 +7,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jsonmerge"; version = "1.9.2"; + __structuredAttrs = true; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; @@ -27,8 +28,8 @@ buildPythonPackage rec { meta = { description = "Merge a series of JSON documents"; homepage = "https://github.com/avian2/jsonmerge"; - changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; + changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${finalAttrs.version}/ChangeLog"; license = lib.licenses.mit; maintainers = [ ]; }; -} +})