diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
commit | 7716ccd59c0c17f9399d73abec05001b775d100b (patch) | |
tree | 17a3f8cc7201f9deed0b3de8d5d597b892aaede3 /gnu/packages/gnunet.scm | |
parent | 86edcc53382c66be06165c62a3934d60ae7aabd8 (diff) | |
parent | a35532f52df3ba3bc360346938aa90806cad493e (diff) | |
download | guix-7716ccd59c0c17f9399d73abec05001b775d100b.tar guix-7716ccd59c0c17f9399d73abec05001b775d100b.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnunet.scm')
-rw-r--r-- | gnu/packages/gnunet.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 82702e4e84..9a2713e66a 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -155,7 +155,7 @@ tool to extract metadata from a file and print the results.") (build-system gnu-build-system) (inputs `(("curl" ,curl) - ("gnutls" ,gnutls) + ("gnutls" ,gnutls/dane) ("libgcrypt" ,libgcrypt) ("openssl" ,openssl) ("zlib" ,zlib))) @@ -197,7 +197,7 @@ and support for SSL3 and TLS.") (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages - (inputs `(("gnutls" ,gnutls) + (inputs `(("gnutls" ,gnutls/dane) ("libidn" ,libidn) ("zlib" ,zlib))) (native-inputs @@ -271,7 +271,7 @@ supports HTTP, HTTPS and GnuTLS.") ("gnurl" ,gnurl) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gnutls" ,gnutls) + ("gnutls" ,gnutls/dane) ("libextractor" ,libextractor) ("libgcrypt" ,libgcrypt) ("libidn" ,libidn) |