diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2017-03-16 00:55:13 +0100 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2017-03-16 22:38:19 +0100 |
commit | 5f89c9e92df754c108a57c5b691e7a00bfd37482 (patch) | |
tree | e6206176782a6dbd38a3b31de52306e8fcd5055e /pkgs/development/libraries/nghttp2 | |
parent | da6619cffed4aae4da168a11ae46473ad397b07e (diff) | |
download | nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar.gz nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar.bz2 nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar.lz nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar.xz nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.tar.zst nixpkgs-5f89c9e92df754c108a57c5b691e7a00bfd37482.zip |
nghttp2: 1.19.0 -> 1.20.0
Corrected c-ares attribute name Full changelog : https://nghttp2.org/blog/2017/02/26/nghttp2-v1-20-0/
Diffstat (limited to 'pkgs/development/libraries/nghttp2')
-rw-r--r-- | pkgs/development/libraries/nghttp2/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index aee0b3d7116..5fb9cc36e96 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, libcares ? null +, openssl ? null, libev ? null, zlib ? null, c-ares ? null , enableHpack ? false, jansson ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null @@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; }; stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.19.0"; + version = "1.20.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a"; + sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib libcares ] + buildInputs = [ openssl libev zlib c-ares ] ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 @@ -36,8 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + + #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + + meta = with stdenv.lib; { - homepage = http://nghttp2.org/; + homepage = https://nghttp2.org/; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; |