From 32dbdc4388bf10e6939da4e5877dfbb93d0cdda8 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 27 Feb 2022 16:30:46 +0100 Subject: [PATCH] nghttp2: 1.43.0 -> 1.47.0 Refactor of the feature switches as there was some invalid combinations. {c-ares,libev,openssl,zlib} are all strictly needed if we want to build the applications but are unnecessary when building the lib alone. Accordingly the overrides in `fetchurl` and `pythonPackages.nghttp2` are updated to use `enableApp = false` as they only want libnghttp2. fetchurl bootstrapping just got lighter. :) Also enable the checks whenever possible. To run them we need to set TZDATA environment variable and the `CUnit` tool. Those tests are made optionals as we don't want to scope `cunit` and `tzdata` when bootstrapping `fetchurl`. Also install the Bash completions for h2load, nghttp, nghttpd and nghttpx. Finally, add `c0bw3b` as maintainer. --- .../development/libraries/nghttp2/default.nix | 102 +++++++++++------- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 66 insertions(+), 45 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index bd639ec3041a..4f22047c5a99 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,90 +1,110 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, installShellFiles +, pkg-config -# Optional Dependencies -, openssl ? null, zlib ? null -, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null -, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null -, enableHpack ? false, jansson ? null +# Optional dependencies +, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic +, c-ares ? null, libev ? null, openssl ? null, zlib ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null +, enableHpack ? false, jansson ? null , enableJemalloc ? false, jemalloc ? null -, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null +# Unit tests ; on Darwin CUnit brings an additional dependency on ncurses which is inconvenient here +, enableTests ? (!stdenv.isDarwin), cunit ? null, tzdata ? null + # downstream dependencies, for testing , curl , libsoup }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. +# Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! +# All mutable patches (generated by GitHub or cgit) that are needed here +# should be included directly in Nixpkgs as files. -assert enableHpack -> jansson != null; +assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null; assert enableAsioLib -> boost != null; -assert enableGetAssets -> libxml2 != null; -assert enableJemalloc -> jemalloc != null; +assert enableGetAssets -> enableApp == true && libxml2 != null; +assert enableHpack -> enableApp == true && jansson != null; +assert enableJemalloc -> enableApp == true && jemalloc != null; assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; - -let inherit (lib) optional optionals optionalString; in +assert enableTests -> cunit != null && tzdata != null; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.43.0"; + version = "1.47.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0qhgyphzdv72dgdfxin2xbk9623za3jwbcvhhaxixiwp6djj8vsm"; + sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07"; }; outputs = [ "bin" "out" "dev" "lib" ] - ++ optional enablePython "python"; + ++ lib.optionals (enablePython) [ "python" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ optional enableLibEv libev - ++ [ zlib ] - ++ optional enableCAres c-ares - ++ optional enableHpack jansson - ++ optional enableAsioLib boost - ++ optional enableGetAssets libxml2 - ++ optional enableJemalloc jemalloc - ++ optionals enablePython [ python ncurses setuptools ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals (enableApp) [ installShellFiles ] + ++ lib.optionals (enablePython) [ cython ]; + + buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ] + ++ lib.optionals (enableAsioLib) [ boost ] + ++ lib.optionals (enableGetAssets) [ libxml2 ] + ++ lib.optionals (enableHpack) [ jansson ] + ++ lib.optionals (enableJemalloc) [ jemalloc ] + ++ lib.optionals (enablePython) [ python ncurses setuptools ]; enableParallelBuilding = true; configureFlags = [ - "--with-spdylay=no" "--disable-examples" (lib.enableFeature enableApp "app") - ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" - ++ (if enablePython then [ - "--with-cython=${cython}/bin/cython" - ] else [ - "--disable-python-bindings" - ]); + ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] + ++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ]; - preInstall = optionalString enablePython '' + # Unit tests require CUnit and setting TZDIR environment variable + doCheck = enableTests; + checkInputs = lib.optionals (enableTests) [ cunit tzdata ]; + preCheck = lib.optionalString (enableTests) '' + export TZDIR=${tzdata}/share/zoneinfo + ''; + + preInstall = lib.optionalString (enablePython) '' mkdir -p $out/${python.sitePackages} # convince installer it's ok to install here export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" ''; - postInstall = optionalString enablePython '' + postInstall = lib.optionalString (enablePython) '' mkdir -p $python/${python.sitePackages} mv $out/${python.sitePackages}/* $python/${python.sitePackages} + rm -r $out/lib + '' + lib.optionalString (enableApp) '' + installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} ''; - #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - passthru.tests = { inherit curl libsoup; }; meta = with lib; { + description = "HTTP/2 C library and tools"; + longDescription = '' + nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C. + The framing layer of HTTP/2 is implemented as a reusable C library. On top of that, + we have implemented an HTTP/2 client, server and proxy. We have also developed + load test and benchmarking tools for HTTP/2. + An HPACK encoder and decoder are available as a public API. + We have Python bindings of this library, but we do not have full code coverage yet. + An experimental high level C++ library is also available. + ''; + homepage = "https://nghttp2.org/"; - description = "A C implementation of HTTP/2"; + changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}"; + # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/ license = licenses.mit; + maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c02073b649f8..f9438574770f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -652,9 +652,9 @@ with pkgs; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkg-config openssl; - c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; - libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + inherit pkg-config; + enableApp = false; # curl just needs libnghttp2 + enableTests = false; # avoids bringing `cunit` and `tzdata` into scope }; }); }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18198e5595a5..95a451ec6d86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5473,7 +5473,8 @@ in { nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; - enablePython = true; + enableApp = false; # build only libnghttp2 ... + enablePython = true; # ... and its Python bindings })).python; nibabel = callPackage ../development/python-modules/nibabel { };