diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
commit | 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7 (patch) | |
tree | 0fd70c0cb82d7980a7ff82500dec7bfd0d535d3f /gnu/packages/tls.scm | |
parent | fcd75bdbfa99d14363b905afbf914eec20e69df8 (diff) | |
parent | 84b60a7cdfca1421a478894e279104a0c18a7c6d (diff) | |
download | patches-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar patches-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r-- | gnu/packages/tls.scm | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 49d4c318fd..4a81250339 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1,10 +1,11 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> @@ -45,7 +46,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages texinfo) - #:use-module (gnu packages base)) + #:use-module (gnu packages base) + #:use-module (srfi srfi-1)) (define-public libtasn1 (package @@ -211,6 +213,19 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +(define-public gnutls/guile-2.2 + ;; GnuTLS for Guile 2.2. This is supported by GnuTLS >= 3.5.5. + (package + (inherit gnutls) + (name "guile2.2-gnutls") + (arguments + ;; Remove '--with-guile-site-dir=…/2.0'. + (substitute-keyword-arguments (package-arguments gnutls) + ((#:configure-flags flags) + `(cdr ,flags)))) + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs gnutls)))))) + (define-public openssl (package (name "openssl") @@ -454,13 +469,13 @@ security, and applying best practice development processes.") (define-public python-acme (package (name "python-acme") - (version "0.9.3") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 - (base32 - "16a02bb0apnk1bm68bcabdmmwd6rnvnjzanrmcb46bpbapwz3vx6")))) + (base32 + "04d2464klbhvrsrlmca10qxyd968qz7xizdppr53cihnlfq2y77m")))) (build-system python-build-system) (arguments `(#:phases @@ -503,13 +518,13 @@ security, and applying best practice development processes.") (define-public certbot (package (name "certbot") - (version "0.9.3") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1c7k4lfq5j78d1rvrwrb9082ngwibz92cwkf4kazaa9b76w9q538")))) + "0hx71ba7w8kf8hpg1wy5zf8ggczb57g3kcsdg83kxjpqnfnrkmp0")))) (build-system python-build-system) (arguments `(#:python ,python-2 |