diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
| commit | 5bace4c8ad981b66b5c0769b885d0bb0db91a029 (patch) | |
| tree | 0f2fb95c23d7990d26aeed71590bb94a3f2e17fe /gnu/packages/tls.scm | |
| parent | 653569e878f39345b05110b998f10db3b520ccfe (diff) | |
| parent | 20d87dfb453cf27f95c5ef3858e8d096278e1702 (diff) | |
| download | patches-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar patches-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 17cb2ac939..e36a02a6cc 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.5.10") + (version "3.5.13") (source (origin (method url-fetch) (uri @@ -142,9 +143,12 @@ living in the same process.") (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) "/gnutls-" version ".tar.xz")) + (patches + (search-patches "gnutls-skip-trust-store-test.patch" + "gnutls-skip-pkgconfig-test.patch")) (sha256 (base32 - "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g")))) + "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr")))) (build-system gnu-build-system) (arguments '(#:configure-flags |