diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-10 23:54:17 +0100 |
commit | e06f7865e2630494a522ac32b9c0a0311be3e1e2 (patch) | |
tree | 1a547ad3a2e4c1b98a67845a9de0dfc798227b5f /gnu/packages/gnupg.scm | |
parent | ff3c0c1b805453990a42f690f148b41b9dff382a (diff) | |
parent | c9c88118a12b0e22b7369b1dc6b0e2f9db894986 (diff) | |
download | guix-e06f7865e2630494a522ac32b9c0a0311be3e1e2.tar guix-e06f7865e2630494a522ac32b9c0a0311be3e1e2.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r-- | gnu/packages/gnupg.scm | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e06865d196..16ca8ae661 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -209,6 +210,31 @@ components), libgpg-error (centralized GnuPG error values), and libskba (working with X.509 certificates and CMS data).") (license gpl3+))) +(define-public gnupg-1 + (package (inherit gnupg) + (version "1.4.16") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnupg/gnupg-" version + ".tar.bz2")) + (sha256 + (base32 + "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv")))) + (inputs + `(("zlib" ,guix:zlib) + ("bzip2" ,guix:bzip2) + ("curl" ,curl) + ("readline" ,readline) + ("libgpg-error" ,libgpg-error))) + (arguments + `(#:phases (alist-cons-after + 'unpack 'patch-check-sh + (lambda _ + (substitute* "checks/Makefile.in" + (("/bin/sh") (which "bash")))) + %standard-phases))))) + (define-public gpgme (package (name "gpgme") |