diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
| commit | 081850816f98c7f5d815ac7251c69bf2ada50cc0 (patch) | |
| tree | 609b7e9e9c267e8c382bdebf8295b9f45bab6cc4 /gnu/packages/curl.scm | |
| parent | 792d526a256773d1abe00b73c2a2131037148139 (diff) | |
| parent | 93f178b5a84a8cc5a0c552290191efd2310588b5 (diff) | |
| download | guix-081850816f98c7f5d815ac7251c69bf2ada50cc0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 456a18012d..9f2c27d623 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> @@ -48,6 +48,24 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web)) +;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. +;; <https://bugs.gnu.org/34927> +(define-public libssh2-1.8.0 + (hidden-package + (package + (inherit libssh2) + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.libssh2.org/download/libssh2-" + version ".tar.gz")) + (sha256 + (base32 + "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + (patches + (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) + (define-public curl (package (name "curl") @@ -66,7 +84,11 @@ (inputs `(("gnutls" ,gnutls) ("gss" ,gss) ("libidn" ,libidn) - ("libssh2" ,libssh2) + ;; TODO XXX <https://bugs.gnu.org/34927> + ;; Curl doesn't actually use or refer to libssh2 because the build + ;; is not configured with '--with-libssh2'. Remove this input when + ;; a mass rebuild is appropriate (e.g. core-updates). + ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) |