gnu: assword: Update to 0.10.

* gnu/packages/password-utils.scm (assword): Update to 0.10.
[arguments]: Use Python 3 instead of Python 2.
[inputs]: Use Python 3 variants of inputs. Replace python2-pygpgme with
python-gpg. Remove python2-pygtk. Add python-pygobject.
[native-inputs]: Replace help2man with txt2man.
[arguments]: Remove PYTHONPATH from 'Makefile' in the 'manpage' phase.
This commit is contained in:
Leo Famulari 2017-01-02 19:24:33 -05:00
parent 7637de2313
commit f339f2773d
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 13 additions and 9 deletions

View File

@ -7,6 +7,7 @@
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,8 +34,8 @@
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages man) #:use-module (gnu packages man)
@ -216,7 +217,7 @@ random passwords that pass the checks.")
(define-public assword (define-public assword
(package (package
(name "assword") (name "assword")
(version "0.8") (version "0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
@ -225,10 +226,9 @@ random passwords that pass the checks.")
"assword_" version ".orig.tar.gz"))) "assword_" version ".orig.tar.gz")))
(sha256 (sha256
(base32 (base32
"0dl4wizbi0r21wxzykm8s445xbvqim5nabi799dmpkdnnh8i546i")))) "0l6170y6my1gprqkazvzabgjkrkr9v2q7z48vjflna4r323yqira"))))
(arguments (arguments
`(#:python ,python-2 `(;; irritatingly, tests do run but not there are two problems:
;; irritatingly, tests do run but not there are two problems:
;; - "import gtk" fails for unknown reasons here despite it the ;; - "import gtk" fails for unknown reasons here despite it the
;; program working (indeed, I've found I have to do a logout and log ;; program working (indeed, I've found I have to do a logout and log
;; back in in after an install order for some mumbo jumbo environment ;; back in in after an install order for some mumbo jumbo environment
@ -242,17 +242,21 @@ random passwords that pass the checks.")
(add-after 'install 'manpage (add-after 'install 'manpage
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(and (and
;; Without this substitution, it fails with
;; ImportError: No module named 'gpg'
(substitute* "Makefile"
(("PYTHONPATH=.") ""))
(zero? (system* "make" "assword.1")) (zero? (system* "make" "assword.1"))
(install-file (install-file
"assword.1" "assword.1"
(string-append (assoc-ref outputs "out") "/share/man/man1")))))))) (string-append (assoc-ref outputs "out") "/share/man/man1"))))))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("help2man" ,help2man))) `(("txt2man" ,txt2man)))
(inputs (inputs
`(("python2-xdo" ,python2-xdo) `(("python-xdo" ,python-xdo)
("python2-pygpgme" ,python2-pygpgme) ("python-gpg" ,python-gpg)
("python2-pygtk" ,python2-pygtk))) ("python-pygobject" ,python-pygobject)))
(propagated-inputs (propagated-inputs
`(("xclip" ,xclip))) `(("xclip" ,xclip)))
(home-page "https://finestructure.net/assword/") (home-page "https://finestructure.net/assword/")