[PATCH] gnu: pius: Update to 2.2.3.

[PATCH] gnu: pius: Update to 2.2.3.

[Troy Sankey]

[-- Attachment #1.1: Type: text/plain, Size: 225 bytes --]

The previous pius version in Guix pulled a specific git commit to
address a bug, but now there is a new release (2.2.3) containing the
bugfix so this patch switches the package back to using the release
tarballs.

Troy

[-- Attachment #1.2: 0001-gnu-pius-Update-to-2.2.3.patch --]
[-- Type: text/x-diff, Size: 4302 bytes --]

From b328649a8892ea9888b45f656123fbcaeb7f2825 Mon Sep 17 00:00:00 2001
From: Troy Sankey <sankeytms@gmail.com>
Date: Thu, 26 Jan 2017 18:16:43 -0500
Subject: [PATCH] gnu: pius: Update to 2.2.3.

* gnu/packages/gnupg.scm (pius): Update to 2.2.3.
[source]: Switch back to using the tarball release.
---
 gnu/packages/gnupg.scm | 70 ++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index df9eb4cba..ba4f3b9ca 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -496,43 +496,35 @@ and signature functionality from Python programs.")
   (package-with-python2 python-gnupg))
 
 (define-public pius
-  ;; pius 2.2.2 does not work with gpg-agent 2.1, so we take a newer
-  ;; commit.  When a new pius (> 2.2.2) is released, update this package
-  ;; and delete this message.
-  ;; More info: https://github.com/jaymzh/pius/issues/46
-  (let ((commit "891687ccb3d232a1fc0e7da7d22572c0318644cb")
-        (base-version "2.2.2"))     ; i.e. there were no releases
-                                    ; between BASE-VERSION and COMMIT
-    (package
-     (name "pius")
-     (version (string-append base-version "-0."
-                             (string-take commit 7)))
-     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/jaymzh/pius.git")
-                    (commit commit)))
-              (sha256
-               (base32
-                "0m2na4bnf1rv0zpf404l9ga6pwyf7ijldp4lw5irgh7gkmpllxr3"))))
-     (build-system python-build-system)
-     (inputs `(("perl" ,perl)                ;for 'pius-party-worksheet'
-               ("gpg" ,gnupg)))
-     (arguments
-      `(#:tests? #f
-        #:python ,python-2                     ;uses the Python 2 'print' syntax
-        #:phases
-        (modify-phases %standard-phases
-          (add-before
-           '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
+  (package
+   (name "pius")
+   (version "2.2.3")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://github.com/jaymzh/pius/releases/download/v"
+                  version "/pius-" version ".tar.bz2"))
+            (sha256
+             (base32
+              "0iy0gnms6lv9hpvk29313kc495a2f7pq2mg6ljxhy233vxsmjsk6"))))
+   (build-system python-build-system)
+   (inputs `(("perl" ,perl)                ;for 'pius-party-worksheet'
+             ("gpg" ,gnupg)))
+   (arguments
+    `(#:tests? #f
+      #:python ,python-2                     ;uses the Python 2 'print' syntax
+      #:phases
+      (modify-phases %standard-phases
+        (add-before
+         '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
 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
@@ -540,8 +532,8 @@ to the process.
 
 pius-keyring-mgr and pius-party-worksheet help organisers of
 PGP keysigning parties.")
-     (license license:gpl2)
-     (home-page "https://www.phildev.net/pius/index.shtml"))))
+   (license license:gpl2)
+   (home-page "https://www.phildev.net/pius/index.shtml")))
 
 (define-public signing-party
   (package
-- 
2.11.0


[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE0zLJ6STd4Cp+CgbIgs677ofYV8IFAliKhfEACgkQgs677ofY
V8KvbRAAuggq4xNHBmhWHe9vCb9T4X88UR0b7uVvhSn122y4bs6pl93f9CafkrR7
6NVhdiOHx8l70RDWKmvR0Izq0EWPmITSVxZopKCL3WkeisJO32YKLmiQsldT+4hk
ZZpsmItKJXh+6Q03FoDHX4K3p/pVHu6vqtTN6v4qxRA/rNSBhYhASPCeJP/4HeBL
oIFItHq3PTDNcblgHPZEY2I/QAhqm6QtnaRYSKyHp65h0GcE+ORU2CCwXSw3/WwI
vLLMAEU6mCCgspiQr0plNpe9dimyo7i/M+pWkVo5kS6eIvrmKM91ruZS5xmuo7MX
72YoBW/a3mGuPUjLwUpFTZMguZGtKFYJmyoIBGRKQxdQZuprcM3dv5cZN5WTvfll
7dR6TlNUhVIpKaT4ketHHKhFzjHJZqWQuzPme6CIfarMkBx6eY8yMSgg2bp3Hxue
NAh6D8Hx3tKh2Q9beiVgQrfOwh3pTdZP/nDMv/GesAdJQ2MqXkbuYa3Ub32wGG7s
As6ut2jpFcdVRLj1DJIHcrLAeufz3cbUoIftF42owaG+TDIPgUZJfEzg6ESaYhWa
NEYhDvt49FzHFP9SIOfyZ+xvAGQPqCLjBopgMEuiG5qRQuCJkvRHkhuAoSELJnb1
4ePRnqnws5wyKvqNwUacRdBqgQ9tlLA4KlSquaNeUeA/8PQjVtU=
=wbHD
-----END PGP SIGNATURE-----

Re: [PATCH] gnu: pius: Update to 2.2.3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

Troy Sankey <sankeytms@gmail.com> writes:

> The previous pius version in Guix pulled a specific git commit to
> address a bug, but now there is a new release (2.2.3) containing the
> bugfix so this patch switches the package back to using the release
> tarballs.

Applied, thanks! I took the opportunity to add a bug-fix in the
arguments. :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]