summary refs log tree commit diff
path: root/gnu/packages/gnupg.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-12-22 19:00:33 -0500
committerLeo Famulari <leo@famulari.name>2021-12-26 17:40:34 -0500
commitd03aa942def0037cb32ff1d0cc2ac5d13f1a63df (patch)
treeefebfecb4b2df30b6bfb9a05a0f5cd8e6395e72d /gnu/packages/gnupg.scm
parentbb59fec2356c6ee5b31e6cb0d76903ecc8ef25df (diff)
downloadguix-d03aa942def0037cb32ff1d0cc2ac5d13f1a63df.tar.gz
gnu: Make GnuPG 2.2.32 available for users.
Fixes <https://issues.guix.gnu.org/52483>.

* gnu/packages/gnupg.scm (gnupg-2.2.32)[properties]: Unhide this package.
[source]: Add 'gnupg-default-pinentry.patch'.
* gnu/packages/emacs-xyz.scm (emacs-pinentry)[propagated-inputs]: Replace gnupg
with gnupg-2.2.32.
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r--gnu/packages/gnupg.scm10
1 files changed, 3 insertions, 7 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index ea2d0a38e9..a0e3cd8e9c 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -347,21 +347,17 @@ libskba (working with X.509 certificates and CMS data).")
     (properties '((ftp-server . "ftp.gnupg.org")
                   (ftp-directory . "/gcrypt/gnupg")))))
 
+;; This package fixes <https://issues.guix.gnu.org/52483>, "GnuPG 2.2.30 cannot
+;; do symmetric encryption"
 (define-public gnupg-2.2.32
   (package
     (inherit gnupg)
     (version "2.2.32")
-
-    ;; Hide this version because packages like 'emacs-pinentry' propagate the
-    ;; default GnuPG and "guix install gnupg emacs-pinentry" would fail with a
-    ;; collision error.
-    (properties `((hidden? . #t)
-                  ,@(package-properties gnupg)))
-
     (source (origin
               (inherit (package-source gnupg))
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
+              (patches (search-patches "gnupg-default-pinentry.patch"))
               (sha256
                (base32
                 "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))))