diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
| commit | 3820d3973982048e5b93ad08d619c893bc50de14 (patch) | |
| tree | 159a3ea785647fb8bb5e4b754f5c0f98d86e29d5 /gnu/packages/gnupg.scm | |
| parent | 751be9a056114d353bac12510bea33e8d5577f49 (diff) | |
| parent | afff9058a0a9a3f3d633f563bb8a1a7d9e503165 (diff) | |
| download | guix-3820d3973982048e5b93ad08d619c893bc50de14.tar guix-3820d3973982048e5b93ad08d619c893bc50de14.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/gnupg.scm
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 63756a7925..b920f83c93 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> @@ -231,14 +231,14 @@ libskba (working with X.509 certificates and CMS data).") (define-public gnupg-2.0 (package (inherit gnupg) - (version "2.0.26") + (version "2.0.27") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p")))) + "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p")))) (inputs `(("bzip2" ,guix:bzip2) ("curl" ,curl) @@ -261,14 +261,14 @@ libskba (working with X.509 certificates and CMS data).") (define-public gnupg-1 (package (inherit gnupg) - (version "1.4.18") + (version "1.4.19") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp")))) + "11pxx26sfilh0vswylh9mhiifw5yffw7nn733zknw3sb0jfk22bz")))) (inputs `(("zlib" ,guix:zlib) ("bzip2" ,guix:bzip2) |