gnu: gpgme: Update to 1.11.1.

* gnu/packages/gnupg.scm (libgpg-error-1.31): New public variable.
(gpgme): Update to 1.11.1.
[propagated-inputs]: Change LIBGPG-ERROR to LIBGPG-ERROR-1.31.
This commit is contained in:
Marius Bakke 2018-05-06 14:20:13 +02:00
parent 296551a2e9
commit df9f628991
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -14,6 +14,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -90,6 +91,20 @@ (define-public libgpg-error
(properties '((ftp-server . "ftp.gnupg.org") (properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/libgpg-error"))))) (ftp-directory . "/gcrypt/libgpg-error")))))
;; Some packages (e.g. GPGME) require a newer libgpg-error to deal with
;; error codes from recent GnuPG. Remove this in the next rebuild cycle.
(define-public libgpg-error-1.31
(package
(inherit libgpg-error)
(version "1.31")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
version ".tar.bz2"))
(sha256
(base32
"1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20"))))))
(define-public libgcrypt (define-public libgcrypt
(package (package
(name "libgcrypt") (name "libgcrypt")
@ -359,7 +374,7 @@ (define-public gnupg-1
(define-public gpgme (define-public gpgme
(package (package
(name "gpgme") (name "gpgme")
(version "1.10.0") (version "1.11.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -367,13 +382,13 @@ (define-public gpgme
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs")))) "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gnupg" ,gnupg))) `(("gnupg" ,gnupg)))
(propagated-inputs (propagated-inputs
;; Needs to be propagated because gpgme.h includes gpg-error.h. ;; Needs to be propagated because gpgme.h includes gpg-error.h.
`(("libgpg-error" ,libgpg-error))) `(("libgpg-error" ,libgpg-error-1.31)))
(inputs (inputs
`(("libassuan" ,libassuan))) `(("libassuan" ,libassuan)))
(home-page "https://www.gnupg.org/related_software/gpgme/") (home-page "https://www.gnupg.org/related_software/gpgme/")