From 5b8358aea82bee2241fbdbba1a064b94cc8c1817 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 12:59:44 +0200 Subject: [PATCH 1/5] python3Packages.fuzzywuzzy: use finalAttrs --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index bd28e2afa990..b1a1508d7e44 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -8,13 +8,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fuzzywuzzy"; version = "0.18.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) version; + pname = "fuzzywuzzy"; sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; @@ -31,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ erikarvstedt ]; }; -} +}) From 0359617a6a813b6273bbeb4d63d3f84979587fee Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:02:09 +0200 Subject: [PATCH 2/5] python3Packages.fuzzywuzzy: enable __structuredAttrs --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index b1a1508d7e44..03faeaf38a80 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -13,6 +13,8 @@ buildPythonPackage (finalAttrs: { version = "0.18.0"; format = "setuptools"; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) version; pname = "fuzzywuzzy"; From ad6ca3966bdfd626cc8ea1caa7d36ec2a094a3fd Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:04:58 +0200 Subject: [PATCH 3/5] python3Packages.fuzzywuzzy: migrate to pyproject --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 03faeaf38a80..b6181f23f9af 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, levenshtein, pycodestyle, hypothesis, @@ -11,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "fuzzywuzzy"; version = "0.18.0"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -21,7 +22,10 @@ buildPythonPackage (finalAttrs: { sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; - propagatedBuildInputs = [ levenshtein ]; + build-system = [ setuptools ]; + + dependencies = [ levenshtein ]; + nativeCheckInputs = [ pycodestyle hypothesis From 0149e7ce8bb9c0a80d608f5e738a00db34f79192 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:11:18 +0200 Subject: [PATCH 4/5] python3Packages.fuzzywuzzy: enable tests --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index b6181f23f9af..28dad040f86b 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchPypi, + pytestCheckHook, setuptools, levenshtein, pycodestyle, - hypothesis, - pytest, }: buildPythonPackage (finalAttrs: { @@ -27,9 +26,12 @@ buildPythonPackage (finalAttrs: { dependencies = [ levenshtein ]; nativeCheckInputs = [ + pytestCheckHook pycodestyle - hypothesis - pytest + ]; + + pythonImportsCheck = [ + "fuzzywuzzy" ]; meta = { From 87ce5e1f34d2ec0fee11415daf49357dba6a4273 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Fri, 3 Jul 2026 13:42:27 +0200 Subject: [PATCH 5/5] python3Packages.fuzzywuzzy: disambiguate license --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 28dad040f86b..12708a956184 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Fuzzy string matching for Python"; homepage = "https://github.com/seatgeek/fuzzywuzzy"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ erikarvstedt ]; }; })