summaryrefslogtreecommitdiff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-09-25 14:46:03 +0200
committerLudovic Courtès <ludo@gnu.org>2020-09-25 14:50:02 +0200
commit0e54d63dfa60bb729a844a182001631967e8a8c3 (patch)
treeb9263f68ebb8ff495ff985a3329a6e87d78e1804 /gnu/packages/tls.scm
parenta83860cd22ec68d3910c3d4ab05107452b080858 (diff)
gnu: gnutls: Update to 3.6.15.
* gnu/packages/tls.scm (gnutls): Update to 3.6.15. [replacement]: Remove. (gnutls-3.6.14): Remove. * gnu/packages/vpn.scm (openconnect)[inputs]: Adjust accordingly. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Likewise.
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm26
1 files changed, 2 insertions, 24 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c5f25aaa55..8e2fc13c77 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -167,9 +167,7 @@ living in the same process.")
(define-public gnutls
(package
(name "gnutls")
- ;; XXX Unversion openconnect's "gnutls" input when ungrafting.
- (replacement gnutls-3.6.14)
- (version "3.6.12")
+ (version "3.6.15")
(source (origin
(method url-fetch)
(uri
@@ -181,7 +179,7 @@ living in the same process.")
(patches (search-patches "gnutls-skip-trust-store-test.patch"))
(sha256
(base32
- "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"))))
+ "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"))))
(build-system gnu-build-system)
(arguments
`(#:tests? ,(not (hurd-target?))
@@ -269,26 +267,6 @@ required structures.")
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
-(define-public gnutls-3.6.14
- (package
- (inherit gnutls)
- (version "3.6.14")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/gnutls/v"
- (version-major+minor version)
- "/gnutls-" version ".tar.xz"))
- (patches (search-patches "gnutls-skip-trust-store-test.patch"
- "gnutls-cross.patch"))
- (sha256
- (base32
- "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n"))))
- (native-inputs
- `(,@(if (%current-target-system) ;for cross-build
- `(("guile" ,guile-3.0)) ;to create .go files
- '())
- ,@(package-native-inputs gnutls)))))
-
(define-public gnutls/guile-2.0
;; GnuTLS for Guile 2.0.
(package/inherit gnutls