diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
| commit | 7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df (patch) | |
| tree | 504a250d235a3bc39571e6af1c755077390a371f /gnu/packages/tls.scm | |
| parent | f20d1cfb51ed14f325da000406807076323f70bc (diff) | |
| parent | b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 (diff) | |
| download | guix-patches-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.tar guix-patches-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..ec401416ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -165,7 +165,8 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (replacement gnutls-3.6.13) + ;; XXX Unversion openconnect's "gnutls" input when ungrafting. + (replacement gnutls-3.6.14) (version "3.6.12") (source (origin (method url-fetch) @@ -253,20 +254,20 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls-3.6.13 +(define-public gnutls-3.6.14 (package (inherit gnutls) - (version "3.6.13") + (version "3.6.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) - "/gnutls-3.6.13.tar.xz")) + "/gnutls-" version ".tar.xz")) (patches (search-patches "gnutls-skip-trust-store-test.patch" "gnutls-cross.patch")) (sha256 (base32 - "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))) + "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n")))) (native-inputs `(,@(if (%current-target-system) ;for cross-build `(("guile" ,guile-3.0)) ;to create .go files |