guix_mirror_bot pushed a commit to branch ruby-team
in repository guix.
commit 8604fce3ca50e1a7ab9c1b885ea7f7722501a862
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Aug 18 13:52:57 2026 +0200
gnu: gnupg: Revert to using tarballs as source.
This effectively reverts commits b6e750acb81debe75c5b844bcb80751a51f5bebc
and 397c4847e3a1108cd7afebc4ff5524ca054ee4bd .
* gnu/packages/gnupg.scm (gnupg): Copy-paste the package definition of
commit e660026a1625db74f844bbd96a6681ca0fe922b3 .
Fixes: guix/guix#10622
Fixes: guix/guix#10773
---
gnu/packages/gnupg.scm | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 70e0a562b2..ebad0636f3 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -339,22 +339,19 @@ compatible to GNU Pth.")
;; <https://gnupg.org/download/index.html> for how to pick the right
;; version.
(version "2.5.20")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/gpg/gnupg")
- (commit (string-append "gnupg-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1jjp1yv919b9l9qhgsmbray7g0k8mzmwldp38pm381i8nazr66hw"))))
+ (source (origin
+ ;; Use tarballs instead of git, see the discussion at
+ ;; https://codeberg.org/guix/guix/issues/10622 .
+ (method url-fetch)
+ (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+ ".tar.bz2"))
+ (patches (search-patches "gnupg-default-pinentry.patch"))
+ (sha256
+ (base32
+ "1ipzi64i748hjmjvv2a5dh9i9hjldlsnrgls6yd42263k5p2cqb4"))))
(build-system gnu-build-system)
(native-inputs
- (list autoconf
- automake
- gettext-minimal
- pkg-config))
+ (list pkg-config))
(inputs
(list gnutls
libassuan
@@ -391,10 +388,6 @@ compatible to GNU Pth.")
"--with-npth-prefix="
#$(this-package-input "npth")))
#~())
- ;; TODO: There is a dependency cycle with fig2dev; remove when
- ;; fixed.
- "--disable-doc"
- "--enable-maintainer-mode" ;see README.GIT
;; Otherwise, the test suite looks for the `gpg`
;; executable in its installation directory in
;; /gnu/store before it has been installed.