From b80a537cb9529b2f186519684901fe2be9e0a0f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Dec 2021 11:40:28 -0500 Subject: [PATCH] gnu: GnuPG: Update gnupg-2.2.32 to 2.2.33. * gnu/packages/gnupg.scm (gnupg-2.2.32): Replace with ... (gnupg-2.2.33): ... new variable. * gnu/packages/emacs-xyz.scm (emacs-pinentry)[propagated-inputs]: Use gnupg-2.2.33. --- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/gnupg.scm | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32915fb6ed..5ce07645ce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21238,7 +21238,7 @@ (define-public emacs-pinentry "1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik")))) (build-system emacs-build-system) (propagated-inputs - (list gnupg)) + (list gnupg-2.2.33)) (home-page "https://elpa.gnu.org/packages/pinentry.html") (synopsis "GnuPG Pinentry server implementation") (description diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 665e9e3021..fc7c1fbee0 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -347,24 +347,17 @@ (define-public gnupg (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gnupg"))))) -(define-public gnupg-2.2.32 +(define-public gnupg-2.2.33 (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))) - + (version "2.2.33") (source (origin (inherit (package-source gnupg)) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj")))))) + "1qz403080hwba8j8vpnfkvh7clg1dbg74kdn1d0p0g84iip87246")))))) (define-public gnupg-1 (package (inherit gnupg) -- 2.34.0