diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-03 19:15:17 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-03 19:15:17 +0100 |
| commit | 99f63f011df2aab38e98d7ee4608a8c70bf74c4d (patch) | |
| tree | 3f224028f30c60f2ed7b9846365ad926192fc7e9 /gnu/packages/curl.scm | |
| parent | e9a8b603337802a77ff2d68f0d30dc0e67721e3a (diff) | |
| parent | 4f03aa23e805bd653de774e1d74ed2f50826899b (diff) | |
| download | guix-99f63f011df2aab38e98d7ee4608a8c70bf74c4d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1907d2dc3d..61313af7d2 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,15 @@ (define-public curl (package (name "curl") - (version "7.59.0") - (replacement curl-7.61.0) + (version "7.61.1") + (replacement curl-7.62.0) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1z310hrjm2vmbcpkyp81dcmj9rk127zkjyawpy2pah0nz6yslkp4")))) + "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -85,7 +85,8 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi") + `(#:configure-flags '("--with-gnutls" "--with-gssapi" + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases @@ -141,10 +142,10 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.0 +(define-public curl-7.62.0 (package (inherit curl) - (version "7.61.0") + (version "7.62.0") (source (origin (method url-fetch) @@ -152,7 +153,7 @@ tunneling, and so on.") version ".tar.xz")) (sha256 (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))))) + "1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs")))))) (define-public kurly (package |