ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-02 18:47:58 +03:00
Code Issues Projects Releases Wiki Activity

curl: add support http3 protocol

Browse Source
This commit is contained in:
Izorkin 2021-11-14 18:19:55 +03:00
parent 851b12b691
commit 507301b357
No known key found for this signature in database
GPG Key ID: 1436C1B3F3679F09
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/curl/default.nix
View File

@ -14,6 +14,7 @@
!(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform)) !(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform))
), libkrb5 ? null ), libkrb5 ? null
, http2Support ? true, nghttp2 ? null , http2Support ? true, nghttp2 ? null
, http3Support ? false, nghttp3, ngtcp2 ? null
, idnSupport ? false, libidn2 ? null , idnSupport ? false, libidn2 ? null
, ldapSupport ? false, openldap ? null , ldapSupport ? false, openldap ? null
, opensslSupport ? zlibSupport, openssl ? null , opensslSupport ? zlibSupport, openssl ? null
@ -39,6 +40,8 @@ assert gnutlsSupport -> gnutls != null;
assert gsaslSupport -> gsasl != null; assert gsaslSupport -> gsasl != null;
assert gssSupport -> libkrb5 != null; assert gssSupport -> libkrb5 != null;
assert http2Support -> nghttp2 != null; assert http2Support -> nghttp2 != null;
assert http3Support -> nghttp3 != null;
assert http3Support -> ngtcp2 != null;
assert idnSupport -> libidn2 != null; assert idnSupport -> libidn2 != null;
assert ldapSupport -> openldap != null; assert ldapSupport -> openldap != null;
assert opensslSupport -> openssl != null; assert opensslSupport -> openssl != null;
@ -84,6 +87,7 @@ stdenv.mkDerivation rec {
optional gsaslSupport gsasl ++ optional gsaslSupport gsasl ++
optional gssSupport libkrb5 ++ optional gssSupport libkrb5 ++
optional http2Support nghttp2 ++ optional http2Support nghttp2 ++
optionals http3Support [ nghttp3 ngtcp2 ] ++
optional idnSupport libidn2 ++ optional idnSupport libidn2 ++
optional ldapSupport openldap ++ optional ldapSupport openldap ++
optional opensslSupport openssl ++ optional opensslSupport openssl ++
@ -112,6 +116,8 @@ stdenv.mkDerivation rec {
(lib.enableFeature ldapSupport "ldaps") (lib.enableFeature ldapSupport "ldaps")
# The build fails when using wolfssl with --with-ca-fallback # The build fails when using wolfssl with --with-ca-fallback
(lib.withFeature (!wolfsslSupport) "ca-fallback") (lib.withFeature (!wolfsslSupport) "ca-fallback")
(lib.withFeature http3Support "nghttp3")
(lib.withFeature http3Support "ngtcp2")
(lib.withFeature rtmpSupport "librtmp") (lib.withFeature rtmpSupport "librtmp")
(lib.withFeature zstdSupport "zstd") (lib.withFeature zstdSupport "zstd")
(lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))

5
pkgs/top-level/all-packages.nix
View File

@ -4405,6 +4405,11 @@ with pkgs;
pslSupport = true; pslSupport = true;
}; };
curlHTTP3 = curl.override {
openssl = quictls;
http3Support = true;
};
curl = curlMinimal.override ({ curl = curlMinimal.override ({
idnSupport = true; idnSupport = true;
zstdSupport = true; zstdSupport = true;