Merge #22534: nghttp2: 1.17.0 -> 1.19.0

This commit is contained in:
Vladimír Čunát 2017-02-11 11:12:09 +01:00
commit 205376e226
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
# Optional Dependencies # Optional Dependencies
, openssl ? null, libev ? null, zlib ? null , openssl ? null, libev ? null, zlib ? null, libcares ? null
, enableHpack ? false, jansson ? null , enableHpack ? false, jansson ? null
, enableAsioLib ? false, boost ? null , enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null , enableGetAssets ? false, libxml2 ? null
@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nghttp2-${version}"; name = "nghttp2-${version}";
version = "1.17.0"; version = "1.19.0";
# Don't use fetchFromGitHub since this needs a bootstrap curl # Don't use fetchFromGitHub since this needs a bootstrap curl
src = fetchurl { src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a"; sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";
}; };
outputs = [ "out" "dev" "lib" ]; outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libev zlib ] buildInputs = [ openssl libev zlib libcares ]
++ optional enableHpack jansson ++ optional enableHpack jansson
++ optional enableAsioLib boost ++ optional enableAsioLib boost
++ optional enableGetAssets libxml2 ++ optional enableGetAssets libxml2