Merge pull request #223057 from Izorkin/update-http3-libs

Update http3 libraries
This commit is contained in:
Mario Rodas 2023-03-26 08:42:24 -05:00 committed by GitHub
commit f151733bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions

View File

@ -1,28 +1,28 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, file , cmake
, cunit, ncurses , cunit, ncurses
, curlHTTP3 , curlHTTP3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nghttp3"; pname = "nghttp3";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ngtcp2"; owner = "ngtcp2";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-N4wgk21D1I0tNrKoTGWBtq3neeamCI8axQnFxdT1Txg="; hash = "sha256-V0g/d1B9uMn7KZU6ShzyPGXOSAYCbz4ZubnhAwz+Qsc=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ autoreconfHook pkg-config file ]; nativeBuildInputs = [ cmake ];
nativeCheckInputs = [ cunit ncurses ]; nativeCheckInputs = [ cunit ncurses ];
preConfigure = '' cmakeFlags = [
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file "-DENABLE_STATIC_LIB=OFF"
''; ];
doCheck = true; doCheck = true;
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -1,27 +1,27 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, cmake , cmake
, libev, nghttp3, quictls
, cunit, ncurses , cunit, ncurses
, libev, nghttp3, quictls
, withJemalloc ? false, jemalloc , withJemalloc ? false, jemalloc
, curlHTTP3 , curlHTTP3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ngtcp2"; pname = "ngtcp2";
version = "0.13.1"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ngtcp2"; owner = "ngtcp2";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; hash = "sha256-6XHOMBsgKSVwpTwQlIt+H9tRPF8YBjfOLmHtdC/LVlE=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
nativeCheckInputs = [ cunit ncurses ]; nativeCheckInputs = [ cunit ncurses ];
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
cmakeFlags = [ cmakeFlags = [
"-DENABLE_STATIC_LIB=OFF" "-DENABLE_STATIC_LIB=OFF"