diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 09:47:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 09:47:09 +0200 |
| commit | 825c08e368947e775278a74d58d269bb38c60c8f (patch) | |
| tree | 85824b1d38f59fed3883e2762721b66c2253bfa1 | |
| parent | 51d6d27e90c81cccb2bd0c5e36699796f96bb4c3 (diff) | |
| parent | 9dee19030ba5102e50098f6944d1455cf6f370f8 (diff) | |
| download | nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar.gz nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar.bz2 nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar.lz nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar.xz nixlib-825c08e368947e775278a74d58d269bb38c60c8f.tar.zst nixlib-825c08e368947e775278a74d58d269bb38c60c8f.zip | |
Merge: nghttp2: 1.20.0 -> 1.24.0 (#28376)
Also --enable-app and use a $bin output.
| -rw-r--r-- | pkgs/development/libraries/nghttp2/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 3033c4301afe..d534cd59bd83 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -17,15 +17,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.20.0"; + version = "1.24.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 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; + sha256 = "18ys6p39yvm9wjjzhhlw35c9m8f5gf4dk9jbshibj19q4js1pnv9"; }; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "bin" "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libev zlib c-ares ] @@ -36,12 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ] ++ 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 = https://nghttp2.org/; description = "A C implementation of HTTP/2"; |