diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:01:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:05:27 +0200 |
| commit | 79355ae3e84359716f5135cc7083e72246bc8bf9 (patch) | |
| tree | 6b61851e2153581578bb78ef0f177b8841ee5db7 /guix/gnupg.scm | |
| parent | 39d6b9c99f297e14fc4f47f002be3d40556726be (diff) | |
| parent | 86d8f6d3efb8300a3354735cbf06be6c01e23243 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/gnupg.scm')
| -rw-r--r-- | guix/gnupg.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/gnupg.scm b/guix/gnupg.scm index d1d8b377e1..ef8f9000dc 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2010, 2011, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; ;;; This file is part of GNU Guix. @@ -40,7 +40,7 @@ (define %gpg-command ;; The GnuPG 2.x command-line program name. - (make-parameter "gpg2")) + (make-parameter (or (getenv "GUIX_GPG_COMMAND") "gpg"))) (define %openpgp-key-server ;; The default key server. Note that keys.gnupg.net appears to be |