gnu: pius: Update to 2.2.2-0.891687c.

* gnu/packages/gnupg.scm (pius): Update to 2.2.2-0.891687c.
[inputs]: Change GNUPG-2.0 to GNUPG (2.1).

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Troy Sankey 2016-12-24 22:53:07 -05:00 committed by Ludovic Courtès
parent 987a29ba43
commit 0f391063d9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 41 additions and 31 deletions

View File

@ -10,6 +10,7 @@
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org> ;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,6 +49,7 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)) #:use-module (guix build-system python))
@ -460,35 +462,43 @@ and signature functionality from Python programs.")
(package-with-python2 python-gnupg)) (package-with-python2 python-gnupg))
(define-public pius (define-public pius
(package ;; pius 2.2.2 does not work with gpg-agent 2.1, so we take a newer
(name "pius") ;; commit. When a new pius (> 2.2.2) is released, update this package
(version "2.2.2") ;; and delete this message.
(source (origin ;; More info: https://github.com/jaymzh/pius/issues/46
(method url-fetch) (let ((commit "891687ccb3d232a1fc0e7da7d22572c0318644cb")
(uri (string-append (base-version "2.2.2")) ; i.e. there were no releases
"https://github.com/jaymzh/pius/releases/download/v" ; between BASE-VERSION and COMMIT
version "/pius-" version ".tar.bz2")) (package
(sha256 (name "pius")
(base32 (version (string-append base-version "-0."
"0k94mlr7l12mplph7pdgjbampqha47d8mfjq69n4xm80qwbn1rq1")))) (string-take commit 7)))
(build-system python-build-system) (source (origin
(inputs `(("perl" ,perl) ;for 'pius-party-worksheet' (method git-fetch)
("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0 (uri (git-reference
(arguments (url "https://github.com/jaymzh/pius.git")
`(#:tests? #f (commit commit)))
#:python ,python-2 ;uses the Python 2 'print' syntax (sha256
#:phases (base32
(modify-phases %standard-phases "0m2na4bnf1rv0zpf404l9ga6pwyf7ijldp4lw5irgh7gkmpllxr3"))))
(add-before (build-system python-build-system)
'build 'set-gpg-file-name (inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
(lambda* (#:key inputs outputs #:allow-other-keys) ("gpg" ,gnupg)))
(let* ((gpg (string-append (assoc-ref inputs "gpg") (arguments
"/bin/gpg"))) `(#:tests? #f
(substitute* "libpius/constants.py" #:python ,python-2 ;uses the Python 2 'print' syntax
(("/usr/bin/gpg2") gpg)))))))) #:phases
(synopsis "Programs to simplify GnuPG key signing") (modify-phases %standard-phases
(description (add-before
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning 'build 'set-gpg-file-name
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((gpg (string-append (assoc-ref inputs "gpg")
"/bin/gpg")))
(substitute* "libpius/constants.py"
(("/usr/bin/gpg2") gpg))))))))
(synopsis "Programs to simplify GnuPG key signing")
(description
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
parties. It is the main utility and makes it possible to quickly and easily parties. It is the main utility and makes it possible to quickly and easily
sign each UID on a set of PGP keys. It is designed to take the pain out of sign each UID on a set of PGP keys. It is designed to take the pain out of
the sign-all-the-keys part of PGP Keysigning Party while adding security the sign-all-the-keys part of PGP Keysigning Party while adding security
@ -496,8 +506,8 @@ to the process.
pius-keyring-mgr and pius-party-worksheet help organisers of pius-keyring-mgr and pius-party-worksheet help organisers of
PGP keysigning parties.") PGP keysigning parties.")
(license license:gpl2) (license license:gpl2)
(home-page "https://www.phildev.net/pius/index.shtml"))) (home-page "https://www.phildev.net/pius/index.shtml"))))
(define-public signing-party (define-public signing-party
(package (package