From fee1a41f9572de5c04d46e6c8e03a442d7f10d4c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:32 +0000 Subject: gnu: Remove python2-passlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python2-passlib): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index cec57f9fda..cbf563af42 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Justus Winter -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; @@ -171,9 +171,6 @@ (define-public python-passlib to providing full-strength password hashing for multi-user application.") (license license:bsd-3))) -(define-public python2-passlib - (package-with-python2 python-passlib)) - (define-public python-py-bcrypt (package (name "python-py-bcrypt") -- cgit v1.2.3 From 6d6b3a0c3ceeead480cfab398dd7515252e5a22a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:33 +0000 Subject: gnu: python-passlib: Use python-bcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit py-bcrypt is unmaintained and support will be dropped in passlib 1.8. The recommended option is bcrypt. * gnu/packages/python-crypto.scm (python-passlib)[propagated-inputs]: Remove python-py-bcrypt. Add python-bcrypt. [arguments]<#:phases>: Don't return #t. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index cbf563af42..bfc97e53b3 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -154,13 +154,13 @@ (define-public python-passlib (native-inputs `(("python-nose" ,python-nose))) (propagated-inputs - `(("python-py-bcrypt" ,python-py-bcrypt))) + `(("python-bcrypt" ,python-bcrypt))) (arguments `(#:phases (modify-phases %standard-phases (add-before 'check 'set-PYTHON_EGG_CACHE ;; Some tests require access to "$HOME/.cython". - (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) + (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp")))))) (home-page "https://bitbucket.org/ecollins/passlib") (synopsis "Comprehensive password hashing framework") (description -- cgit v1.2.3 From e29c3e1856b8d05cf98d652207df981ae7197d3a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 17 Sep 2021 17:55:34 +0000 Subject: gnu: Remove python-py-bcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python-py-bcrypt, python2-py-bcrypt): Remove variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bfc97e53b3..1cddc56f1b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -171,38 +171,6 @@ (define-public python-passlib to providing full-strength password hashing for multi-user application.") (license license:bsd-3))) -(define-public python-py-bcrypt - (package - (name "python-py-bcrypt") - (version "0.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "py-bcrypt" version)) - (sha256 - (base32 - "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az")))) - (build-system python-build-system) - (home-page "https://code.google.com/p/py-bcrypt") - (synopsis - "Bcrypt password hashing and key derivation") - (description - "A python wrapper of OpenBSD's Blowfish password hashing code. This -system hashes passwords using a version of Bruce Schneier's Blowfish block -cipher with modifications designed to raise the cost of off-line password -cracking and frustrate fast hardware implementation. The computation cost of -the algorithm is parametrised, so it can be increased as computers get faster. -The intent is to make a compromise of a password database less likely to -result in an attacker gaining knowledge of the plaintext passwords (e.g. using -John the Ripper).") - ;; "sha2.c" is under BSD-3; - ;; "blowfish.c" and "bcrypt.c" are under BSD-4; - ;; the rest is under ISC. - (license (list license:isc license:bsd-3 license:bsd-4)))) - -(define-public python2-py-bcrypt - (package-with-python2 python-py-bcrypt)) - (define-public python-pyblake2 (package (name "python-pyblake2") -- cgit v1.2.3