diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
| commit | 50a93adc05b611836e740c4b55571890f4c6770a (patch) | |
| tree | db8dfcb8f1d07405a0b546672af116bf1b47a1ee /gnu/packages/tls.scm | |
| parent | 722ac64cd7dc1f09fb77e2ae780427fa13c03110 (diff) | |
| parent | 69fb26d4f51e9d22111cb1360e2941192afee5b9 (diff) | |
| download | guix-50a93adc05b611836e740c4b55571890f4c6770a.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b398d6f8c5..fab0e72278 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -164,7 +164,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.5.18") + (version "3.6.5") (source (origin (method url-fetch) (uri @@ -173,12 +173,19 @@ 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")) + (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0d02x28fwkkx7xzn7807nww6idchizzq3plx8sfcyiw7wzclh8mf")))) + "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7")) + (modules '((guix build utils))) + (snippet + '(begin + ;; XXX: The generated configure script in GnuTLS 3.6.5 + ;; apparently does not know about Guile 2.2. + (substitute* "configure" + (("guile_versions_to_search=\"2\\.0 1\\.8\"") + "guile_versions_to_search=\"2.2 2.0 1.8\"")) + #t)))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. |