diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-26 11:10:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-26 11:10:22 +0200 |
commit | 9eafe6706d119d124d2ef5b34876e8e54e8a7559 (patch) | |
tree | cfcb905f5ba5f72ad5c441971f06e165f779bcc3 /pkgs | |
parent | 665d3939192e8c44207dcb1ee95f25addd4c3d38 (diff) | |
parent | 135a841d9124f0c27750ee909d02a84bff23b44e (diff) | |
download | nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar.gz nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar.bz2 nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar.lz nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar.xz nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.tar.zst nixlib-9eafe6706d119d124d2ef5b34876e8e54e8a7559.zip |
Merge #28264: curl: 7.55.0 -> 7.55.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4d292abc9acf..4ec79af66516 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.55.0"; + name = "curl-7.55.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg"; + sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -72,10 +72,6 @@ stdenv.mkDerivation rec { CXXCPP = "g++ -E"; postInstall = '' - pushd docs/libcurl - make install - popd - moveToOutput bin/curl-config "$dev" sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' |