From 2c2bc861647c9b9524899b0695523553b06a27ff Mon Sep 17 00:00:00 2001 From: Anthony Date: Sun, 19 Nov 2023 17:25:06 +0000 Subject: [PATCH 1/2] Fix failing build of xkcdpass due to non-dt test --- pkgs/development/python-modules/xkcdpass/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 0d11e9df8c1b..10eea5025117 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , installShellFiles , pytestCheckHook , pythonAtLeast @@ -19,6 +20,13 @@ buildPythonPackage rec { hash = "sha256-zEgC3tTQ6kwDovHPHRTvYndWVF79DpnAX454VDZiedE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/redacted/XKCD-password-generator/commit/72d174a82822af1934c94de1b66fd956230142f5.patch"; + hash = "sha256-GES40GHM0+Zx8bRceCy9/fOHJVlWZ7TCLfzhZczjfTE="; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; From 2ec633e8ae25da628a9bfb06dc1344c452408875 Mon Sep 17 00:00:00 2001 From: Anthony Date: Sun, 19 Nov 2023 23:01:30 +0400 Subject: [PATCH 2/2] Add pretty name for applied patch Co-authored-by: Robert Scott --- pkgs/development/python-modules/xkcdpass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 10eea5025117..5b253d3260a8 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { + name = "fix-non-deterministic-test.patch"; url = "https://github.com/redacted/XKCD-password-generator/commit/72d174a82822af1934c94de1b66fd956230142f5.patch"; hash = "sha256-GES40GHM0+Zx8bRceCy9/fOHJVlWZ7TCLfzhZczjfTE="; })