diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
| commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
| tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/tools/networking/curl | |
| parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
| parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
| download | nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip | |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/tools/networking/curl')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4fd30cc1fa1e..713fe40c1891 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.41.0"; + name = "curl-7.42.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1slbbxp2k8m34mdzrl5qhafr5zhhcv7fgjhs2mcxjmswvimm92wz"; + sha256 = "13yhcqfksy2vwc4sjv97nv3cbd2pb2a8lnvv8g46qp1gail7sm9j"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains |