* [PATCH 2/5] gnu: Add python-gpg.
2017-01-03 1:39 [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Leo Famulari
@ 2017-01-03 1:39 ` 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
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Leo Famulari @ 2017-01-03 1:39 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnupg.scm (python-gpg, python2-gpg): New variable.
---
gnu/packages/gnupg.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 4a7b323b4..5eef3678a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -46,6 +47,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages security-token)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages tls)
#:use-module (guix packages)
#:use-module (guix download)
@@ -382,6 +384,31 @@ instead. This way bug fixes or improvements can be done at a central place
and every application benefits from this.")
(license license:lgpl2.1+)))
+(define-public python-gpg
+ (package
+ (name "python-gpg")
+ (version (package-version gpgme))
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "gpg" version))
+ (sha256
+ (base32
+ "1x74i6q713c0bckls7rdm8kgsmllf9qvy9x62jghszlhgjkyh9nd"))))
+ (build-system python-build-system)
+ (inputs
+ `(("gpgme" ,gpgme)))
+ (native-inputs
+ `(("swig" ,swig)))
+ (home-page (package-home-page gpgme))
+ (synopsis "Python bindings for GPGME GnuPG cryptography library")
+ (description "This package provides Python bindings to the GPGME GnuPG
+cryptographic library. It is developed in the GPGME source code, and then
+distributed separately.")
+ (license license:lgpl2.1+)))
+
+(define-public python2-gpg
+ (package-with-python2 python-gpg))
+
(define-public python-pygpgme
(package
(name "python-pygpgme")
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/5] gnu: python2-xdo: Update to 0.3.
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:39 ` Leo Famulari
2017-01-03 12:40 ` Ludovic Courtès
2017-01-03 1:39 ` [PATCH 4/5] gnu: Add python-xdo Leo Famulari
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Leo Famulari @ 2017-01-03 1:39 UTC (permalink / raw)
To: guix-devel
* gnu/packages/python.scm (python2-xdo): Update to 0.3.
---
gnu/packages/python.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fce62175b..4d5018bf3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8770,7 +8770,7 @@ normally the case.")
(define-public python2-xdo
(package
(name "python2-xdo")
- (version "0.2")
+ (version "0.3")
(source (origin
(method url-fetch)
(uri (string-append
@@ -8778,7 +8778,7 @@ normally the case.")
"python-xdo_" version ".orig.tar.gz"))
(sha256
(base32
- "1kl5c1p0dyxf62plnk6fl77ycfb4whwjms16r14dxx8kn90hlqz4"))))
+ "1vqh1n5yy5dhnq312kwrl90fnck4v26is3lq3lxdvcn60vv19da0"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/5] gnu: Add python-xdo.
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:39 ` [PATCH 3/5] gnu: python2-xdo: Update to 0.3 Leo Famulari
@ 2017-01-03 1:39 ` Leo Famulari
2017-01-03 12:39 ` Ludovic Courtès
2017-01-03 1:39 ` [PATCH 5/5] gnu: assword: Update to 0.10 Leo Famulari
2017-01-03 12:38 ` [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Ludovic Courtès
4 siblings, 1 reply; 12+ messages in thread
From: Leo Famulari @ 2017-01-03 1:39 UTC (permalink / raw)
To: guix-devel
* gnu/packages/python.scm (python-xdo): New variable.
(python2-xdo): Use package-with-python2.
---
gnu/packages/python.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4d5018bf3..f0eb5e01f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
-;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
@@ -8767,9 +8767,9 @@ normally the case.")
(define-public python2-pytest-subtesthack
(package-with-python2 python-pytest-subtesthack))
-(define-public python2-xdo
+(define-public python-xdo
(package
- (name "python2-xdo")
+ (name "python-xdo")
(version "0.3")
(source (origin
(method url-fetch)
@@ -8781,8 +8781,7 @@ normally the case.")
"1vqh1n5yy5dhnq312kwrl90fnck4v26is3lq3lxdvcn60vv19da0"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
- #:tests? #f)) ; no tests provided
+ `(#:tests? #f)) ; no tests provided
(inputs
`(("xdotool" ,xdotool)
("libX11" ,libx11)))
@@ -8793,6 +8792,9 @@ input. (Note that this is mostly a legacy library; you may wish to look at
python-xdo for newer bindings.)")
(license license:bsd-3)))
+(define-public python2-xdo
+ (package-with-python2 python-xdo))
+
(define-public python-wtforms
(package
(name "python-wtforms")
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/5] gnu: assword: Update to 0.10.
2017-01-03 1:39 [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Leo Famulari
` (2 preceding siblings ...)
2017-01-03 1:39 ` [PATCH 4/5] gnu: Add python-xdo Leo Famulari
@ 2017-01-03 1:39 ` Leo Famulari
2017-01-03 12:41 ` Ludovic Courtès
2017-01-03 12:38 ` [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Ludovic Courtès
4 siblings, 1 reply; 12+ messages in thread
From: Leo Famulari @ 2017-01-03 1:39 UTC (permalink / raw)
To: guix-devel
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 5/5] gnu: assword: Update to 0.10.
2017-01-03 1:39 ` [PATCH 5/5] gnu: assword: Update to 0.10 Leo Famulari
@ 2017-01-03 12:41 ` Ludovic Courtès
2017-01-03 17:36 ` Leo Famulari
0 siblings, 1 reply; 12+ messages in thread
From: Ludovic Courtès @ 2017-01-03 12:41 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari <leo@famulari.name> skribis:
> * 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.
Or “Remove PYTHONPATH from 'Makefile' in the 'manpage' phase.”
Otherwise LGTM, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] gnu: assword: Update to 0.10.
2017-01-03 12:41 ` Ludovic Courtès
@ 2017-01-03 17:36 ` Leo Famulari
0 siblings, 0 replies; 12+ messages in thread
From: Leo Famulari @ 2017-01-03 17:36 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
On Tue, Jan 03, 2017 at 01:41:15PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
>
> > * 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.
>
> Or “Remove PYTHONPATH from 'Makefile' in the 'manpage' phase.”
That's better, thanks!
> Otherwise LGTM, thank you!
Pushed!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] gnu: gpgme: Update to 1.8.0.
2017-01-03 1:39 [PATCH 1/5] gnu: gpgme: Update to 1.8.0 Leo Famulari
` (3 preceding siblings ...)
2017-01-03 1:39 ` [PATCH 5/5] gnu: assword: Update to 0.10 Leo Famulari
@ 2017-01-03 12:38 ` Ludovic Courtès
4 siblings, 0 replies; 12+ messages in thread
From: Ludovic Courtès @ 2017-01-03 12:38 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari <leo@famulari.name> skribis:
> * gnu/packages/gnupg.scm (gpgme): Update to 1.8.0.
> [arguments]: Don't set 'GPG=gpg2' in #:configure-flags. GnuPG-2.x is
> installed as 'gpg' on Guix.
LGTM, thanks!
^ permalink raw reply [flat|nested] 12+ messages in thread