From beb1406137fdac272ea1c646a5307c37dfb7653a Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 19:54:37 +0200 Subject: [PATCH 1/3] python3Packages.pyscss: use finalAttrs --- pkgs/development/python-modules/pyscss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index c3731ea6d970..188606347524 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -6,7 +6,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscss"; version = "1.4.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyScss"; owner = "Kronuz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 07ea04d9a8505f27b3084ab0a99ee0ba6c2b3f0c Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 19:56:11 +0200 Subject: [PATCH 2/3] python3Packages.pyscss: enable __structuredAttrs --- pkgs/development/python-modules/pyscss/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 188606347524..26e9bdec6d3f 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -11,6 +11,8 @@ buildPythonPackage (finalAttrs: { version = "1.4.0"; format = "setuptools"; + __structuredAttrs = true; + src = fetchFromGitHub { repo = "pyScss"; owner = "Kronuz"; From db9fe4c23f3044f8db22a64e526653b99c6cc64c Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 10 Jun 2026 20:00:21 +0200 Subject: [PATCH 3/3] python3Packages.pyscss: migrate to pyproject --- pkgs/development/python-modules/pyscss/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 26e9bdec6d3f..278aa7b1c247 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, six, }: buildPythonPackage (finalAttrs: { pname = "pyscss"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -20,9 +21,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; # Test suite is broken. # See https://github.com/Kronuz/pyScss/issues/415