From 9ee7545cf9096e172d5397422ef2cc178aadc975 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 05:21:32 +0700 Subject: [PATCH 1/2] python3Packages.zxcvbn: migrate to pyproject --- pkgs/development/python-modules/zxcvbn/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index f6fbcb8945d8..be5abfe87852 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "zxcvbn"; version = "4.5.0"; - format = "setuptools"; + pyproject = true; # no tests included in PyPI tarball src = fetchFromGitHub { @@ -18,6 +19,8 @@ buildPythonPackage rec { hash = "sha256-0SVJkJMEMnZVMpamDVP02kMwWRSj5zGlrMYG9kn0aXQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { From 787d6a89b8a8f262dc47531b2284cbc467dc9bbe Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 13 Jun 2026 05:29:36 +0700 Subject: [PATCH 2/2] python3Packages.zxcvbn: modernize --- pkgs/development/python-modules/zxcvbn/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index be5abfe87852..f680dd2e100d 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -6,16 +6,18 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zxcvbn"; version = "4.5.0"; pyproject = true; + __structuredAttrs = true; + # no tests included in PyPI tarball src = fetchFromGitHub { owner = "dwolfhub"; repo = "zxcvbn-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0SVJkJMEMnZVMpamDVP02kMwWRSj5zGlrMYG9kn0aXQ="; }; @@ -23,6 +25,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "zxcvbn" ]; + meta = { description = "Python implementation of Dropbox's realistic password strength estimator"; mainProgram = "zxcvbn"; @@ -30,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +})