;;; 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>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
(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)))
(("/bin/sh") (which "sh")))
;; XXX FIXME: Test #1510 seems to work on some machines and not
- ;; others, possibly based on the kernel version. It works on GuixSD
+ ;; others, possibly based on the kernel version. It works on Guix System
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
;; and x86_64 with the following error:
;;
(define-public guile-curl
(package
(name "guile-curl")
- (version "0.5")
+ (version "0.6")
(source (origin
(method url-fetch)
- (uri (string-append
- "http://www.lonelycactus.com/tarball/guile-curl-"
- version ".tar.gz"))
+ (uri (string-append "http://www.lonelycactus.com/tarball/"
+ "guile_curl-" version ".tar.gz"))
(sha256
(base32
- "1846rxgc0ylh8768lr79irc7nwjichzb7qb7lzs2k42m0i53sc46"))))
+ "1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append