Author: eelco
Date: Sat Nov 5 01:55:53 2011
New Revision: 30243
URL: https://nixos.org/websvn/nix/?rev=30243&sc=1
Log:
* curl updated to 7.22.0. Dropped the connect timeout patch because
it doesn't seem necessary anymore.
Deleted:
nixpkgs/trunk/pkgs/tools/networking/curl/connect-timeout.patch
Modified:
nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Sat Nov 5
01:44:56 2011 (r30242)
+++ nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Sat Nov 5
01:55:53 2011 (r30243)
@@ -10,11 +10,11 @@
assert scpSupport -> libssh2 != null;
stdenv.mkDerivation rec {
- name = "curl-7.21.0";
+ name = "curl-7.22.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";;
- sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
+ sha256 = "04ji7v06f33y6plvikwj283ad6fxxxjpm7as9xw25c924f3dm85x";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -59,17 +59,6 @@
substituteInPlace configure --replace /usr/bin /no-such-path
'';
- patches = [
- /* Fixes broken retry support when a timeout is used. The
- select() system call (used to wait for the connection to come
- up) can return slightly before the computed deadline (a few
- milliseconds). Curl will think the problem is something else,
- proceed with the next IP address (which usually doesn't exist),
- then barf with a CURLE_COULDNT_CONNECT error, which is
- considered non-transient so it won't retry. */
- ./connect-timeout.patch
- ];
-
meta = {
description = "A command line tool for transferring files with URL syntax";
homepage = http://curl.haxx.se/;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
