diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
| commit | a9db7d10b6e4e86fb2b87a4161db3b1f202002fd (patch) | |
| tree | 4a22481ab65447d8bc1cc307a76a884a7e7bbee9 /gnu/packages/gnupg.scm | |
| parent | e33d9d6f09874f83bb5a03f49cb969a84588e10e (diff) | |
| parent | 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 (diff) | |
| download | gnu-guix-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar gnu-guix-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/autotools.scm
gnu/packages/guile.scm
gnu/packages/python.scm
gnu/packages/shishi.scm
guix/gnu-maintenance.scm
guix/scripts/build.scm
guix/scripts/gc.scm
guix/scripts/package.scm
guix/scripts/substitute-binary.scm
guix/ui.scm
nix/nix-daemon/guix-daemon.cc
test-env.in
tests/nar.scm
tests/store.scm
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1810b65fe8..2a610af2ed 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -57,20 +57,19 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "09z5zbxhvg6c7n8qcm8h9ygr28qli2n83hfq1f69jsg711cb37md")))) + "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error" ,libgpg-error))) (home-page "http://gnupg.org/") - (synopsis - "GNU Libgcrypt, a general-pupose cryptographic library") + (synopsis "Cryptographic function library") (description "GNU Libgcrypt is a general purpose cryptographic library based on the code from GnuPG. It provides functions for all @@ -166,8 +165,7 @@ specifications are building blocks of S/MIME and TLS.") (apply configure args))) %standard-phases))) (home-page "http://gnupg.org/") - (synopsis - "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard") + (synopsis "GNU Privacy Guard") (description "GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880. GnuPG allows to |