diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:48:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:48:27 +0200 |
| commit | c0eeccbc2486572de1ef88249c63bc71c28dfef6 (patch) | |
| tree | a265eb0b77b3b876844662da5bc9b32c549209e0 /gnu/packages/gnupg.scm | |
| parent | 56501d3b1727cbafed25be4268c4e6c9387088d9 (diff) | |
| parent | a1b484654af07303813a215d4e04c0e4e7b199e5 (diff) | |
| download | gnu-guix-c0eeccbc2486572de1ef88249c63bc71c28dfef6.tar gnu-guix-c0eeccbc2486572de1ef88249c63bc71c28dfef6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index dd9519bf84..2ef241036a 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -209,14 +209,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.1.12") + (version "2.1.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c")))) + "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -612,7 +612,7 @@ passphrase when @code{gpg} or @code{gpg2} is run and needs it."))) (inherit pinentry-tty) (name "pinentry-qt") (inputs - `(("qt" ,qt) + `(("qtbase" ,qtbase) ,@(package-inputs pinentry-tty))) (description "Pinentry provides a console and a Qt GUI that allows users to enter a |