diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
| commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
| tree | c12187a787b934fb79d159046a4a5516e5d39f97 /gnu/packages/gnupg.scm | |
| parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
| parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) | |
| download | gnu-guix-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar gnu-guix-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5724bc8348..2044ef0501 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -190,14 +190,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4")))) + "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) |