From ec822034d9fb0cb97be04342bed399489bef1b0a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 21:49:16 -0400 Subject: gnu: john-the-ripper-jumbo: Use Python 3. * gnu/packages/password-utils.scm (john-the-ripper-jumbot): [inputs]: Use new style and replace python-2 by python-wrapper. [phases]{install}: Delete trailing #t. --- gnu/packages/password-utils.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 348afb5af4..127cfdf7aa 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 David Dashyan +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -951,13 +952,13 @@ between hosts and entries in the password store.") (native-inputs (list perl)) (inputs - `(("gmp" ,gmp) - ("libpcap" ,libpcap) - ("nss" ,nss) - ("openssl" ,openssl) - ("python" ,python-2) ; For "python" and "python2" shebangs - ("ruby" ,ruby) ; For genincstats.rb - ("zlib" ,zlib))) + (list gmp + libpcap + nss + openssl + python-wrapper + ruby ; For genincstats.rb + zlib)) (arguments `(#:configure-flags (list "--with-systemwide" @@ -1018,8 +1019,7 @@ between hosts and entries in the password store.") (find-files "." "(.*\\.chr|.*\\.lst)") (find-files "." ".*\\.conf"))) (copy-recursively "rules" (string-append datadir "/rules"))) - (copy-recursively "../doc" docdir) - #t))) + (copy-recursively "../doc" docdir)))) (delete 'check) ; Tests need installed .conf files; move after install (add-after 'install 'check (lambda args -- cgit v1.2.3