unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [PATCH 5/5] gnu: assword: Update to 0.10.
Date: Mon,  2 Jan 2017 20:39:55 -0500	[thread overview]
Message-ID: <f401ba46db30d2808d6bb6fdc288e7883120074c.1483407593.git.leo@famulari.name> (raw)
In-Reply-To: <ade1ad506bebf6e00ba7bc02889a9572e9737bec.1483407593.git.leo@famulari.name>
In-Reply-To: <ade1ad506bebf6e00ba7bc02889a9572e9737bec.1483407593.git.leo@famulari.name>

* 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]: Use $PYTHONPATH in the 'manpage' phase.
---
 gnu/packages/password-utils.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index c0d8d39a6..f8111b2ab 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,8 +34,8 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
@@ -216,7 +217,7 @@ random passwords that pass the checks.")
 (define-public assword
   (package
     (name "assword")
-    (version "0.8")
+    (version "0.10")
     (source (origin
               (method url-fetch)
               (uri (list
@@ -225,10 +226,9 @@ random passwords that pass the checks.")
                      "assword_" version ".orig.tar.gz")))
               (sha256
                (base32
-                "0dl4wizbi0r21wxzykm8s445xbvqim5nabi799dmpkdnnh8i546i"))))
+                "0l6170y6my1gprqkazvzabgjkrkr9v2q7z48vjflna4r323yqira"))))
     (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
        ;;    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
@@ -242,17 +242,21 @@ random passwords that pass the checks.")
          (add-after 'install 'manpage
            (lambda* (#:key outputs #:allow-other-keys)
              (and
+              ;; Without this substitution, it fails with
+              ;; ImportError: No module named 'gpg'
+              (substitute* "Makefile"
+                (("PYTHONPATH=.") ""))
               (zero? (system* "make" "assword.1"))
               (install-file
                "assword.1"
                (string-append (assoc-ref outputs "out") "/share/man/man1"))))))))
     (build-system python-build-system)
     (native-inputs
-     `(("help2man" ,help2man)))
+     `(("txt2man" ,txt2man)))
     (inputs
-     `(("python2-xdo" ,python2-xdo)
-       ("python2-pygpgme" ,python2-pygpgme)
-       ("python2-pygtk" ,python2-pygtk)))
+     `(("python-xdo" ,python-xdo)
+       ("python-gpg" ,python-gpg)
+       ("python-pygobject" ,python-pygobject)))
     (propagated-inputs
      `(("xclip" ,xclip)))
     (home-page "https://finestructure.net/assword/")
-- 
2.11.0

  parent reply	other threads:[~2017-01-03  1:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-03  1:39 [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Leo Famulari
2017-01-03  1:39 ` [PATCH 2/5] gnu: Add python-gpg Leo Famulari
2017-01-03  1:44   ` Leo Famulari
2017-01-03 12:39   ` Ludovic Courtès
2017-01-03  1:39 ` [PATCH 3/5] gnu: python2-xdo: Update to 0.3 Leo Famulari
2017-01-03 12:40   ` Ludovic Courtès
2017-01-03  1:39 ` [PATCH 4/5] gnu: Add python-xdo Leo Famulari
2017-01-03 12:39   ` Ludovic Courtès
2017-01-03  1:39 ` Leo Famulari [this message]
2017-01-03 12:41   ` [PATCH 5/5] gnu: assword: Update to 0.10 Ludovic Courtès
2017-01-03 17:36     ` Leo Famulari
2017-01-03 12:38 ` [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f401ba46db30d2808d6bb6fdc288e7883120074c.1483407593.git.leo@famulari.name \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).