diff options
author | Hartmut Goebel <[email protected]> | 2016-11-29 19:06:27 +0100 |
---|---|---|
committer | Hartmut Goebel <[email protected]> | 2016-11-29 19:06:27 +0100 |
commit | 03e856ddf5d28bc61144effb1a393b73cb4a2d9f (patch) | |
tree | f477e079cbdb4b274130e4fcb6c6a5acb781eedf /gnu/packages/password-utils.scm | |
parent | 072f1e22cc6b1708fddedd1ac7ab12827284a785 (diff) | |
parent | 80983df357856fe4e65e384a655e466164e049a1 (diff) |
Merge branch 'python-build-system'.
Diffstat (limited to 'gnu/packages/password-utils.scm')
-rw-r--r-- | gnu/packages/password-utils.scm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 55c14762e9..cf030ecc82 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -250,8 +250,7 @@ random passwords that pass the checks.") (native-inputs `(("help2man" ,help2man))) (inputs - `(("python-setuptools" ,python2-setuptools) - ("python2-xdo" ,python2-xdo) + `(("python2-xdo" ,python2-xdo) ("python2-pygpgme" ,python2-pygpgme) ("python2-pygtk" ,python2-pygtk))) (propagated-inputs @@ -362,7 +361,7 @@ winner of the 2015 Password Hashing Competition.") (native-inputs `(("python-pycparser" ,python-pycparser) ("python-pytest" ,python-pytest))) - (inputs + (propagated-inputs `(("python-cffi" ,python-cffi) ("python-six" ,python-six))) (home-page "https://github.com/pyca/bcrypt/") @@ -376,8 +375,4 @@ Password Scheme\"} by Niels Provos and David Mazieres.") (license license:asl2.0))) (define-public python2-bcrypt - (let ((bcrypt (package-with-python2 python-bcrypt))) - (package (inherit bcrypt) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs bcrypt)))))) + (package-with-python2 python-bcrypt)) |