aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-11-18 22:21:31 +0100
committerLudovic Courtès <ludo@gnu.org>2021-11-18 22:21:31 +0100
commit8362046a06ff0ee16599e6041dd0129241b51878 (patch)
tree038ba78642607068221b0343fa8f7c117f8a68d5
parent98d864e31305e15e1aab37c46a2a34ff604e30ce (diff)
downloadguix-8362046a06ff0ee16599e6041dd0129241b51878.tar.gz
guix-8362046a06ff0ee16599e6041dd0129241b51878.zip
gnu: gnupg@2.2.32: Hide.
* gnu/packages/gnupg.scm (gnupg-2.2.32)[properties]: New field.
-rw-r--r--gnu/packages/gnupg.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index cd2455103a..ddfc6dee69 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -352,6 +352,13 @@ libskba (working with X.509 certificates and CMS data).")
(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
derivation): Add #:channel-metadata and pass it to 'compiled-guix'. * guix/channels.scm (build-from-source): Replace 'name', 'source', and 'commit' parameters with 'instance'. Pass #:channel-metadata to BUILD. (build-channel-instance): Adjust accordingly. * build-aux/build-self.scm (build-program): Add #:channel-metadata and pass it to 'guix-derivation'. (build): Add #:channel-metadata and pass it to 'build-program'. * guix/scripts/describe.scm (display-profile-info): Add optional 'channels' parameter. Pass it to 'display-profile-content'. (display-profile-content): Add optional 'channels' parameter and honor it. Iterate on CHANNELS rather than on the manifest entries of PROFILE. (guix-describe): When PROFILE is #f, call 'current-channels' and pass it to 'display-profile-info', unless it returns the empty list. 2021-02-01guix package: Add '--export-channels'.Ludovic Courtès * guix/channels.scm (sexp->channel): Export. * guix/describe.scm: Use (guix channels). (manifest-entry-provenance): New procedure. * guix/scripts/package.scm (channel=?, export-channels): New procedures. (show-help, %options): Add '--export-channels'. (process-query): Honor it. * build-aux/build-self.scm (build-program)[select?]: Exclude (guix channels) to account for the (guix describe) change above. * doc/guix.texi (Invoking guix package): Document it. 2020-09-19describe: Save the original value of (program-arguments).Ludovic Courtès Fixes <https://bugs.gnu.org/42688>. Reported by pkill9 <pkill9@runbox.com>. This ensures that 'guix repl -s SCRIPT' give SCRIPT the right value of (current-profile), which in turn ensures that (%package-module-path) is initialized with the right set of channels. * guix/describe.scm (initial-program-arguments): New variable. (current-profile): Use it. * guix/scripts/repl.scm (guix-repl): Call 'current-profile' before 'set-program-arguments'.