alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #28264: curl: 7.55.0 -> 7.55.1

Browse source
This commit is contained in:
Vladimír Čunát 2017-08-26 11:10:22 +02:00
parent 665d393919 135a841d91
commit 9eafe6706d
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/networking/curl/default.nix
View file

@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null; assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.55.0"; name = "curl-7.55.1";
src = fetchurl { src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2"; url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg"; sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5";
}; };
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@ -72,10 +72,6 @@ stdenv.mkDerivation rec {
CXXCPP = "g++ -E"; CXXCPP = "g++ -E";
postInstall = '' postInstall = ''
pushd docs/libcurl
make install
popd
moveToOutput bin/curl-config "$dev" moveToOutput bin/curl-config "$dev"
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport '' '' + stdenv.lib.optionalString gnutlsSupport ''