b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nghttp2: 1.51.0 -> 1.54.0

Browse source
This commit is contained in:
Izorkin 2023-05-28 22:35:45 +03:00
parent f8aa1a896e
commit 830db0d715
No known key found for this signature in database
GPG key ID: 1436C1B3F3679F09
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/development/libraries/nghttp2/default.nix
View file

@ -7,11 +7,11 @@
# Optional dependencies # Optional dependencies
, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
, c-aresMinimal, libev, openssl, zlib , c-aresMinimal, libev, openssl, zlib
, enableAsioLib ? false, boost
, enableGetAssets ? false, libxml2 , enableGetAssets ? false, libxml2
, enableHpack ? false, jansson , enableHpack ? false, jansson
, enableHttp3 ? false, ngtcp2, nghttp3, quictls
, enableJemalloc ? false, jemalloc , enableJemalloc ? false, jemalloc
, enablePython ? false, python3Packages, ncurses , enablePython ? false, python3, ncurses
# Unit tests ; we have to set TZDIR, which is a GNUism. # Unit tests ; we have to set TZDIR, which is a GNUism.
, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata , enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata
@ -27,41 +27,38 @@
assert enableGetAssets -> enableApp; assert enableGetAssets -> enableApp;
assert enableHpack -> enableApp; assert enableHpack -> enableApp;
assert enableHttp3 -> enableApp;
assert enableJemalloc -> enableApp; assert enableJemalloc -> enableApp;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nghttp2"; pname = "nghttp2";
version = "1.51.0"; version = "1.54.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA="; sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0=";
}; };
outputs = [ "bin" "out" "dev" "lib" ] outputs = [ "out" "dev" "lib" "doc" "man" ];
++ lib.optionals (enablePython) [ "python" ];
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ lib.optionals (enableApp) [ installShellFiles ] ++ lib.optionals (enableApp) [ installShellFiles ];
++ lib.optionals (enablePython) [ python3Packages.cython ];
buildInputs = lib.optionals enableApp [ c-aresMinimal libev openssl zlib ] buildInputs = lib.optionals enableApp [ c-aresMinimal libev zlib ]
++ lib.optionals (enableAsioLib) [ boost ] ++ lib.optionals (enableApp && !enableHttp3) [ openssl ]
++ lib.optionals (enableGetAssets) [ libxml2 ] ++ lib.optionals (enableGetAssets) [ libxml2 ]
++ lib.optionals (enableHpack) [ jansson ] ++ lib.optionals (enableHpack) [ jansson ]
++ lib.optionals (enableJemalloc) [ jemalloc ] ++ lib.optionals (enableJemalloc) [ jemalloc ]
++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ]; ++ lib.optionals (enableHttp3) [ ngtcp2 nghttp3 quictls ]
++ lib.optionals (enablePython) [ python3 ];
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--disable-examples" "--disable-examples"
(lib.enableFeature enableApp "app") (lib.enableFeature enableApp "app")
] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] (lib.enableFeature enableHttp3 "http3")
++ lib.optionals (enablePython) [ ];
"--enable-python-bindings"
"--with-cython=${python3Packages.cython}/bin/cython"
];
# Unit tests require CUnit and setting TZDIR environment variable # Unit tests require CUnit and setting TZDIR environment variable
doCheck = enableTests; doCheck = enableTests;
@ -70,22 +67,18 @@ stdenv.mkDerivation rec {
export TZDIR=${tzdata}/share/zoneinfo export TZDIR=${tzdata}/share/zoneinfo
''; '';
preInstall = lib.optionalString (enablePython) '' postInstall = lib.optionalString (enableApp) ''
mkdir -p $out/${python3Packages.python.sitePackages}
# convince installer it's ok to install here
export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}"
'';
postInstall = lib.optionalString (enablePython) ''
mkdir -p $python/${python3Packages.python.sitePackages}
mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages}
rm -r $out/lib
'' + lib.optionalString (enableApp) ''
installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx}
'' + lib.optionalString (!enableApp) ''
rm -r $out/bin
'' + lib.optionalString (enablePython) ''
patchShebangs $out/share/nghttp2
'' + lib.optionalString (!enablePython) ''
rm -r $out/share
''; '';
passthru.tests = { passthru.tests = {
inherit curl libsoup; inherit curl libsoup;
python-nghttp2 = python3Packages.nghttp2;
}; };
meta = with lib; { meta = with lib; {