From d332e23d908bfe6477082dc2dc92dad9ede5f4f1 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Sat, 6 Jun 2026 19:18:21 +0200 Subject: [PATCH 1/4] python3Packages.whichcraft: use finalAttrs --- pkgs/development/python-modules/whichcraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index b237513ef0f5..a8e78bc8ab45 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -6,13 +6,13 @@ glibcLocales, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whichcraft"; version = "0.6.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc"; }; @@ -30,4 +30,4 @@ buildPythonPackage rec { description = "Cross-platform cross-python shutil.which functionality"; license = lib.licenses.bsd3; }; -} +}) From 8bd5bfeceb3880ba7b850ce6f9cb2e8855bcd806 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Sat, 6 Jun 2026 19:19:33 +0200 Subject: [PATCH 2/4] python3Packages.whichcraft: cleanup unused glibcLocales Removing this causes now changes apart from the store path changing --- pkgs/development/python-modules/whichcraft/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index a8e78bc8ab45..407c431512af 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytest, - glibcLocales, }: buildPythonPackage (finalAttrs: { @@ -16,9 +15,6 @@ buildPythonPackage (finalAttrs: { sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc"; }; - env.LC_ALL = "en_US.utf-8"; - buildInputs = [ glibcLocales ]; - nativeCheckInputs = [ pytest ]; checkPhase = '' From 296e40d75f02a676e09e4ed752ce2cd1042c0c2f Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Sat, 6 Jun 2026 19:21:58 +0200 Subject: [PATCH 3/4] python3Packages.whichcraft: migrate to pyproject --- pkgs/development/python-modules/whichcraft/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 407c431512af..bc48ee9a5155 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -2,19 +2,22 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pytest, }: buildPythonPackage (finalAttrs: { pname = "whichcraft"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' From ea0b42ff401558f6743bcab05aec28a948da5b99 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Sat, 6 Jun 2026 19:23:53 +0200 Subject: [PATCH 4/4] python3Packages.whichcraft: add changelog --- pkgs/development/python-modules/whichcraft/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index bc48ee9a5155..56b0c55356d9 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -27,6 +27,7 @@ buildPythonPackage (finalAttrs: { meta = { homepage = "https://github.com/pydanny/whichcraft"; description = "Cross-platform cross-python shutil.which functionality"; + changelog = "https://github.com/cookiecutter/whichcraft/blob/${finalAttrs.version}/HISTORY.rst"; license = lib.licenses.bsd3; }; })