diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
| commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
| tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/tools/networking/curl/default.nix | |
| parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
| parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
| download | nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip | |
Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/tools/networking/curl/default.nix')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4dcab442119d..028b672380cf 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.26.0"; + name = "curl-7.28.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0snj41knvy4xbfirr88l9gq5zjzz0mwlmq0mxbfgqszb2qpjdvgw"; + sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; meta = { + homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; - homepage = http://curl.haxx.se/; }; } |