diff options
Diffstat (limited to 'pkgs/tools/networking/curl/default.nix')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 85a9ab957d6..a429e1c9514 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -4,17 +4,21 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; stdenv.mkDerivation { - name = "curl-7.17.1"; + name = "curl-7.18.1"; + src = fetchurl { - url = http://curl.haxx.se/download/curl-7.17.1.tar.bz2; - sha256 = "0yz50r75jhfr2ya6wqi6n90bn4ij30299pjglmlckzq6jp28wrkz"; + url = http://curl.haxx.se/download/curl-7.18.1.tar.bz2; + sha256 = "0v5fpr4bsdlg262nsgrijlfhp3vgr1ypir1rrkmhxcsnpv4frw6c"; }; + buildInputs = stdenv.lib.optional zlibSupport zlib ++ stdenv.lib.optional sslSupport openssl; - configureFlags = " + + configureFlags = '' ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} - "; + ''; + CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; CXX = "g++"; CXXCPP = "g++ -E"; @@ -37,4 +41,9 @@ stdenv.mkDerivation { 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/; + }; } |