2013-01-30 20:48:57 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2015-10-18 10:20:02 +00:00
|
|
|
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
2015-01-11 14:43:22 +00:00
|
|
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
2015-03-27 22:33:47 +00:00
|
|
|
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
2015-09-09 20:55:33 +00:00
|
|
|
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
2017-01-25 17:49:45 +00:00
|
|
|
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
2017-08-09 19:04:04 +00:00
|
|
|
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
2013-01-30 20:48:57 +00:00
|
|
|
;;;
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (gnu packages curl)
|
Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.
* gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm,
gnu/packages/backup.scm, gnu/packages/bittorrent.scm,
gnu/packages/boost.scm, gnu/packages/compression.scm,
gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm,
gnu/packages/ghostscript.scm, gnu/packages/gimp.scm,
gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm,
gnu/packages/indent.scm, gnu/packages/inkscape.scm,
gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm,
gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm,
gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm,
gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm,
gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm,
gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm,
guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm,
guix/build/python-build-system.scm, guix/download.scm: Replaces uses of
#:renamer and 'symbol-prefix-proc' with #:prefix.
2014-09-23 20:44:22 +00:00
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
2013-01-30 20:48:57 +00:00
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (guix download)
|
2017-12-29 20:39:31 +00:00
|
|
|
#:use-module (guix git-download)
|
2017-08-09 19:04:04 +00:00
|
|
|
#:use-module (guix utils)
|
2013-01-30 20:48:57 +00:00
|
|
|
#:use-module (guix build-system gnu)
|
2017-12-29 20:39:31 +00:00
|
|
|
#:use-module (guix build-system go)
|
2014-02-11 18:17:33 +00:00
|
|
|
#:use-module (gnu packages)
|
2013-01-30 20:48:57 +00:00
|
|
|
#:use-module (gnu packages compression)
|
2017-12-29 20:39:31 +00:00
|
|
|
#:use-module (gnu packages golang)
|
2013-01-30 20:48:57 +00:00
|
|
|
#:use-module (gnu packages groff)
|
|
|
|
#:use-module (gnu packages gsasl)
|
|
|
|
#:use-module (gnu packages libidn)
|
|
|
|
#:use-module (gnu packages openldap)
|
|
|
|
#:use-module (gnu packages perl)
|
|
|
|
#:use-module (gnu packages pkg-config)
|
2014-02-18 20:45:58 +00:00
|
|
|
#:use-module (gnu packages python)
|
gnu: Rename module gnutls to tls.
* gnu/packages/gnutls.scm: Rename to...
* gnu/packages/tls.scm: ... this. Change module name accordingly.
* gnu/packages/{admin.scm, cups.scm, curl.scm, dc.scm, dns.scm, emacs.scm,
ftp.scm, gnome.scm, gnunet.scm, gnupg.scm, gsasl.scm, lynx.scm,
mail.scm, messaging.scm, package-management.scm, shishi.scm,
task-management.scm, version-control.scm, video.scm, vpn.scm,
webkit.scm, weechat.scm, wget.scm, wine.scm, xml.scm}: Adapt module
import to new name.
* gnu-system.am (GNU_SYSTEM_MODULES): Rename gnutls module to tls.
2015-07-03 19:41:22 +00:00
|
|
|
#:use-module (gnu packages ssh)
|
|
|
|
#:use-module (gnu packages tls))
|
2013-01-30 20:48:57 +00:00
|
|
|
|
|
|
|
(define-public curl
|
|
|
|
(package
|
|
|
|
(name "curl")
|
2017-09-21 18:53:15 +00:00
|
|
|
(version "7.55.1")
|
2017-11-29 17:45:12 +00:00
|
|
|
(replacement curl-7.57.0)
|
2013-01-30 20:48:57 +00:00
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
2016-02-07 02:39:41 +00:00
|
|
|
(uri (string-append "https://curl.haxx.se/download/curl-"
|
2017-09-21 18:53:15 +00:00
|
|
|
version ".tar.xz"))
|
2013-01-30 20:48:57 +00:00
|
|
|
(sha256
|
|
|
|
(base32
|
2017-09-21 18:53:15 +00:00
|
|
|
"1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry"))))
|
2013-01-30 20:48:57 +00:00
|
|
|
(build-system gnu-build-system)
|
2015-09-09 20:55:33 +00:00
|
|
|
(outputs '("out"
|
|
|
|
"doc")) ;1.2 MiB of man3 pages
|
2013-01-30 20:48:57 +00:00
|
|
|
(inputs `(("gnutls" ,gnutls)
|
|
|
|
("gss" ,gss)
|
|
|
|
("libidn" ,libidn)
|
2016-02-27 02:55:52 +00:00
|
|
|
("libssh2" ,libssh2)
|
2013-01-30 20:48:57 +00:00
|
|
|
("openldap" ,openldap)
|
|
|
|
("zlib" ,zlib)))
|
gnu: Move numerous "inputs" which should be "native-inputs".
* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
gnu/packages/texlive.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
gnu/packages/zip.scm: Move some build-time dependencies from `inputs' to
`native-inputs'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2013-12-15 11:01:56 +00:00
|
|
|
(native-inputs
|
|
|
|
`(("perl" ,perl)
|
|
|
|
;; to enable the --manual option and make test 1026 pass
|
|
|
|
("groff" ,groff)
|
2014-02-18 20:45:58 +00:00
|
|
|
("pkg-config" ,pkg-config)
|
|
|
|
("python" ,python-2)))
|
2013-01-30 20:48:57 +00:00
|
|
|
(arguments
|
2014-02-18 20:45:58 +00:00
|
|
|
`(#:configure-flags '("--with-gnutls" "--with-gssapi")
|
|
|
|
;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
|
|
|
|
#:phases
|
2015-09-09 20:43:36 +00:00
|
|
|
(modify-phases %standard-phases
|
2015-09-09 20:55:33 +00:00
|
|
|
(add-after
|
|
|
|
'install 'move-man3-pages
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
;; Move section 3 man pages to "doc".
|
|
|
|
(let ((out (assoc-ref outputs "out"))
|
|
|
|
(doc (assoc-ref outputs "doc")))
|
|
|
|
(mkdir-p (string-append doc "/share/man"))
|
|
|
|
(rename-file (string-append out "/share/man/man3")
|
|
|
|
(string-append doc "/share/man/man3"))
|
|
|
|
#t)))
|
2015-09-09 20:43:36 +00:00
|
|
|
(replace
|
|
|
|
'check
|
|
|
|
(lambda _
|
|
|
|
(substitute* "tests/runtests.pl"
|
|
|
|
(("/bin/sh") (which "sh")))
|
2014-11-18 12:55:47 +00:00
|
|
|
|
2015-09-09 20:43:36 +00:00
|
|
|
;; XXX FIXME: Test #1510 seems to work on some machines and not
|
|
|
|
;; others, possibly based on the kernel version. It works on GuixSD
|
|
|
|
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
|
|
|
|
;; and x86_64 with the following error:
|
|
|
|
;;
|
|
|
|
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
|
|
|
|
;;
|
|
|
|
;; 1510: output (log/stderr1510) FAILED:
|
gnu: Adjust formatting as recommended by 'guix lint'.
* gnu/packages/aidc.scm (barcode, qrencode),
gnu/packages/bash.scm (bash, bash-completion),
gnu/packages/busybox.scm (busybox),
gnu/packages/cdrom.scm (cdparanoia),
gnu/packages/cmake.scm (cmake),
gnu/packages/conkeror.scm (conkeror),
gnu/packages/cook.scm (cook),
gnu/packages/curl.scm (curl),
gnu/packages/docbook.scm (docbook-xsl),
gnu/packages/enlightenment.scm (enlightenment),
gnu/packages/games.scm (abbaye),
gnu/packages/geeqie.scm (exiv2),
gnu/packages/gimp.scm (gegl),
gnu/packages/gl.scm (glu, freeglut, ftgl),
gnu/packages/glib.scm (glib),
gnu/packages/gnome.scm (orbit2, gconf, geocode-glib),
gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base),
gnu/packages/linux.scm (util-linux),
gnu/packages/lisp.scm (gcl, ecl),
gnu/packages/maths.scm (gnuplot, hdf5),
gnu/packages/ssh.scm (dropbear),
gnu/packages/web.scm (json-c): Remove tabulations and trailing
white spaces or reformat to fit within 80 columns.
* gnu/packages/audio.scm (aubio),
gnu/packages/emacs.scm (emacs-s),
gnu/packages/engineering.scm (geda-gaf),
gnu/packages/games.scm (dosbox),
gnu/packages/gnome.scm (gusb),
gnu/packages/gtk.scm (gtk+),
gnu/packages/guile.scm (guile-wisp),
gnu/packages/hurd.scm (hurd-headers),
gnu/packages/wm.scm (i3-wm): Adjust synopsis or description.
2015-11-13 14:50:36 +00:00
|
|
|
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
|
|
|
|
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
|
2015-09-09 20:43:36 +00:00
|
|
|
;; @@ -1,5 +1,5 @@
|
|
|
|
;; * Connection #0 to host server1.example.com left intact[LF]
|
|
|
|
;; * Connection #1 to host server2.example.com left intact[LF]
|
|
|
|
;; * Connection #2 to host server3.example.com left intact[LF]
|
|
|
|
;; -* Closing connection 0[LF]
|
|
|
|
;; +* Closing connection 1[LF]
|
|
|
|
;; * Connection #3 to host server4.example.com left intact[LF]
|
|
|
|
(delete-file "tests/data/test1510")
|
2015-06-27 23:48:47 +00:00
|
|
|
|
2015-09-09 20:43:36 +00:00
|
|
|
;; The top-level "make check" does "make -C tests quiet-test", which
|
|
|
|
;; is too quiet. Use the "test" target instead, which is more
|
|
|
|
;; verbose.
|
|
|
|
(zero? (system* "make" "-C" "tests" "test")))))))
|
gnu: Some cleanup based on lint checkers.
* gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm,
gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm,
gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm,
gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm,
gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm,
gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm,
gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm,
gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm,
gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm,
gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm,
gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm,
gnu/packages/libdaemon.scm, gnu/packages/libevent.scm,
gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm,
gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm,
gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm,
gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm,
gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm,
gnu/packages/pdf.scm, gnu/packages/pkg-config.scm,
gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm,
gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm,
gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm,
gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm,
gnu/packages/valgrind.scm, gnu/packages/version-control.scm,
gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm,
gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust
according to lint checkers.
* gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri.
* /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
2014-10-24 04:46:59 +00:00
|
|
|
(synopsis "Command line tool for transferring data with URL syntax")
|
2013-01-30 20:48:57 +00:00
|
|
|
(description
|
|
|
|
"curl is a command line tool for transferring data with URL syntax,
|
|
|
|
supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP,
|
|
|
|
LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP.
|
2015-07-16 09:14:13 +00:00
|
|
|
curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP
|
|
|
|
form based upload, proxies, cookies, file transfer resume, user+password
|
|
|
|
authentication (Basic, Digest, NTLM, Negotiate, kerberos...), proxy
|
|
|
|
tunneling, and so on.")
|
gnu: Update packages to use 'non-copyleft' instead of 'bsd-style'.
* gnu/packages/avr.scm, gnu/packages/compression.scm,
gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm,
gnu/packages/databases.scm, gnu/packages/firmware.scm,
gnu/packages/flex.scm, gnu/packages/fontutils.scm,
gnu/packages/gd.scm, gnu/packages/ghostscript.scm,
gnu/packages/gnunet.scm, gnu/packages/graphics.scm,
gnu/packages/hugs.scm, gnu/packages/image.scm,
gnu/packages/linux.scm, gnu/packages/mail.scm,
gnu/packages/maths.scm, gnu/packages/mit-krb5.scm,
gnu/packages/python.scm, gnu/packages/rdf.scm,
gnu/packages/ssh.scm, gnu/packages/tcl.scm,
gnu/packages/xdisorg.scm, gnu/packages/xiph.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm: Use 'non-copyleft'
instead of 'bsd-style'.
2015-03-14 18:26:34 +00:00
|
|
|
(license (license:non-copyleft "file://COPYING"
|
2015-07-16 09:14:13 +00:00
|
|
|
"See COPYING in the distribution."))
|
2016-12-23 14:24:55 +00:00
|
|
|
(home-page "https://curl.haxx.se/")))
|
2017-04-19 22:16:22 +00:00
|
|
|
|
2017-11-29 17:45:12 +00:00
|
|
|
(define-public curl-7.57.0
|
2017-04-19 22:16:22 +00:00
|
|
|
(package
|
|
|
|
(inherit curl)
|
2017-11-29 17:45:12 +00:00
|
|
|
(version "7.57.0")
|
2017-04-19 22:16:22 +00:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "https://curl.haxx.se/download/curl-"
|
2017-08-09 19:04:04 +00:00
|
|
|
version ".tar.xz"))
|
2017-04-19 22:16:22 +00:00
|
|
|
(sha256
|
|
|
|
(base32
|
2017-11-29 17:45:12 +00:00
|
|
|
"0y3qbjjcxhcvm1yawp3spfssjbskv0g6gyzld6ckif5pf8ygvxpm"))))))
|
2017-12-29 20:39:31 +00:00
|
|
|
|
|
|
|
(define-public kurly
|
|
|
|
(package
|
|
|
|
(name "kurly")
|
|
|
|
(version "1.1.0")
|
|
|
|
(source (origin
|
|
|
|
(method git-fetch)
|
|
|
|
(uri (git-reference
|
|
|
|
(url "https://github.com/davidjpeacock/kurly.git")
|
|
|
|
(commit (string-append "v" version))))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1q192f457sjypgvwq7grrf8gq8w272p3zf1d5ppc20mriqm0mbc3"))))
|
|
|
|
(build-system go-build-system)
|
|
|
|
(arguments
|
|
|
|
'(#:import-path "github.com/davidjpeacock/kurly"))
|
|
|
|
(inputs
|
|
|
|
`(("go-github-com-alsm-ioprogress" ,go-github-com-alsm-ioprogress)
|
|
|
|
("go-github-com-aki237-nscjar" ,go-github-com-aki237-nscjar)
|
|
|
|
("go-github-com-davidjpeacock-cli" ,go-github-com-davidjpeacock-cli)))
|
|
|
|
(synopsis "Command-line HTTP client")
|
|
|
|
(description "kurly is an alternative to the @code{curl} program written in
|
|
|
|
Go. kurly is designed to operate in a similar manner to curl, with select
|
|
|
|
features. Notably, kurly is not aiming for feature parity, but common flags and
|
|
|
|
mechanisms particularly within the HTTP(S) realm are to be expected. kurly does
|
|
|
|
not offer a replacement for libcurl.")
|
|
|
|
(home-page "https://github.com/davidjpeacock/kurly")
|
|
|
|
(license license:asl2.0)))
|