From db7ab7aa6e2d44bc0b862d3bc768840a9c58a440 Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 31 Jul 2026 23:44:51 +0700 Subject: [PATCH 1/2] python3Packages.squarify: migrate to pyproject --- pkgs/development/python-modules/squarify/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix index 971c5d6b4a21..1d847a5cc261 100644 --- a/pkgs/development/python-modules/squarify/default.nix +++ b/pkgs/development/python-modules/squarify/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + setuptools, pytestCheckHook, matplotlib, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "squarify"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "laserson"; @@ -18,9 +19,11 @@ buildPythonPackage rec { hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ matplotlib ]; + dependencies = [ matplotlib ]; pythonImportsCheck = [ "squarify" ]; From 11509c54b925f821b97b468c4ce1fb9c1b2c8a13 Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 31 Jul 2026 23:46:44 +0700 Subject: [PATCH 2/2] python3Packages.squarify: modernize --- pkgs/development/python-modules/squarify/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix index 1d847a5cc261..4648e23435d1 100644 --- a/pkgs/development/python-modules/squarify/default.nix +++ b/pkgs/development/python-modules/squarify/default.nix @@ -7,15 +7,17 @@ matplotlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "squarify"; version = "0.4.3"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "laserson"; repo = "squarify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08="; }; @@ -33,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ veehaitch ]; }; -} +})