diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-11-30 11:19:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-30 11:19:15 +0000 |
commit | f57e1a4dab4d7a9f350232db85f4ed4883d6a784 (patch) | |
tree | f5d8087eb01d1802c478a2f6814a90957e3ff4cb | |
parent | 716815ce2a1fcb135843c7441648a59d62fb6eb6 (diff) | |
parent | 89dd3384d1e011916130961c6499f1f90ad3d8a2 (diff) | |
download | nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar.gz nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar.bz2 nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar.lz nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar.xz nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.tar.zst nixpkgs-f57e1a4dab4d7a9f350232db85f4ed4883d6a784.zip |
Merge pull request #147359 from Izorkin/update-curl-libs
Init http3 libraries
-rw-r--r-- | pkgs/development/libraries/nghttp3/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/libraries/ngtcp2/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/quictls/default.nix | 170 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 246 insertions, 0 deletions
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix new file mode 100644 index 00000000000..85a66f94065 --- /dev/null +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, cunit, file +}: + +stdenv.mkDerivation rec { + pname = "nghttp3"; + version = "unstable-2021-11-10"; + + src = fetchFromGitHub { + owner = "ngtcp2"; + repo = pname; + rev = "270e75447ed9e2a05b78ba89d0699d076230ea60"; + sha256 = "01cla03cv8nd2rf5p77h0xzvn9f8sfwn8pp3r2jshvqp9ipa8065"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + + preConfigure = '' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; + + outputs = [ "out" "dev" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/ngtcp2/nghttp3"; + description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix new file mode 100644 index 00000000000..0d4002ca10d --- /dev/null +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, cunit, file +, jemalloc, libev, nghttp3, quictls +}: + +stdenv.mkDerivation rec { + pname = "ngtcp2"; + version = "unstable-2021-11-10"; + + src = fetchFromGitHub { + owner = "ngtcp2"; + repo = pname; + rev = "7039808c044152c14b44046468bd16249b4d7048"; + sha256 = "1cjsky24f6fazw9b1r6w9cgp09vi8wp99sv76gg2b1r8ic3hgq23"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + buildInputs = [ jemalloc libev nghttp3 quictls ]; + + preConfigure = '' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; + + outputs = [ "out" "dev" ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/ngtcp2/ngtcp2"; + description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix new file mode 100644 index 00000000000..a91015e1b8a --- /dev/null +++ b/pkgs/development/libraries/quictls/default.nix @@ -0,0 +1,170 @@ +{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, fetchFromGitHub +, withCryptodev ? false, cryptodev +, enableSSL2 ? false +, enableSSL3 ? false +, static ? stdenv.hostPlatform.isStatic +# Used to avoid cross compiling perl, for example, in darwin bootstrap tools. +# This will cause c_rehash to refer to perl via the environment, but otherwise +# will produce a perfectly functional openssl binary and library. +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +}: + +assert ( + lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) + "withPerl should not be disabled unless cross compiling" +); + +stdenv.mkDerivation rec { + pname = "quictls"; + version = "3.0.0+quick_unstable-2021-11.02"; + + src = fetchFromGitHub { + owner = "quictls"; + repo = "openssl"; + rev = "62d4de00abfa82fc01efa2eba1982a86c4864f39"; + sha256 = "11mi4bkkyy4qd2wml6p7xcsbps0mabk3bp537rp7n43qnhwyg1g3"; + }; + + patches = [ + ../openssl/3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ../openssl/3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ../openssl/use-etc-ssl-certs-darwin.patch + else ../openssl/use-etc-ssl-certs.patch) + ]; + + postPatch = '' + patchShebangs Configure + '' + # config is a configure script which is not installed. + + '' + substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + ''; + + outputs = [ "bin" "dev" "out" "man" "doc" ]; + setOutputFlags = false; + separateDebugInfo = + !stdenv.hostPlatform.isDarwin && + !(stdenv.hostPlatform.useLLVM or false) && + stdenv.cc.isGNU; + + nativeBuildInputs = [ perl ]; + buildInputs = lib.optional withCryptodev cryptodev + # perl is included to allow the interpreter path fixup hook to set the + # correct interpreter in c_rehash. + ++ lib.optional withPerl perl; + + # TODO(@Ericson2314): Improve with mass rebuild + configurePlatforms = []; + configureScript = { + armv5tel-linux = "./Configure linux-armv4 -march=armv5te"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + aarch64-darwin = "./Configure darwin64-arm64-cc"; + x86_64-linux = "./Configure linux-x86_64"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + riscv64-linux = "./Configure linux64-riscv64"; + }.${stdenv.hostPlatform.system} or ( + if stdenv.hostPlatform == stdenv.buildPlatform + then "./config" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 + then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else if stdenv.hostPlatform.isBSD + then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + else if stdenv.hostPlatform.isMinGW + then "./Configure mingw${lib.optionalString + (stdenv.hostPlatform.parsed.cpu.bits != 32) + (toString stdenv.hostPlatform.parsed.cpu.bits)}" + else if stdenv.hostPlatform.isLinux + then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + else if stdenv.hostPlatform.isiOS + then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" + else + throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}" + ); + + # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. + dontAddStaticConfigureFlags = true; + configureFlags = [ + "shared" # "shared" builds both shared and static libraries + "--libdir=lib" + "--openssldir=etc/ssl" + "enable-ktls" + ] ++ lib.optionals withCryptodev [ + "-DHAVE_CRYPTODEV" + "-DUSE_CRYPTODEV_DIGESTS" + ] ++ lib.optional enableSSL2 "enable-ssl2" + ++ lib.optional enableSSL3 "enable-ssl3" + ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" + # OpenSSL needs a specific `no-shared` configure flag. + # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options + # for a comprehensive list of configuration options. + ++ lib.optional static "no-shared"; + + makeFlags = [ + "MANDIR=$(man)/share/man" + # This avoids conflicts between man pages of openssl subcommands (for + # example 'ts' and 'err') man pages and their equivalent top-level + # command in other packages (respectively man-pages and moreutils). + # This is done in ubuntu and archlinux, and possiibly many other distros. + "MANSUFFIX=ssl" + ]; + + enableParallelBuilding = true; + + postInstall = lib.optionalString (!static) '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then + rm "$out/lib/"*.a + fi + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + # Fix bin/c_rehash's perl interpreter line + # + # - openssl 1_0_2: embeds a reference to buildPackages.perl + # - openssl 1_1: emits "#!/usr/bin/env perl" + # + # In the case of openssl_1_0_2, reset the invalid reference and let the + # interpreter hook take care of it. + # + # In both cases, if withPerl = false, the intepreter line is expected be + # "#!/usr/bin/env perl" + '' + substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl" + '' + '' + mkdir -p $bin + mv $out/bin $bin/bin + mkdir $dev + mv $out/include $dev/ + # remove dependency on Perl at runtime + rm -r $out/etc/ssl/misc + rmdir $out/etc/ssl/{certs,private} + ''; + + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' + # Check to make sure the main output doesn't depend on perl + if grep -r '${buildPackages.perl}' $out; then + echo "Found an erroneous dependency on perl ^^^" >&2 + exit 1 + fi + ''; + + meta = with lib; { + homepage = "https://quictls.github.io/openssl/"; + description = "TLS/SSL and crypto library with QUIC APIs"; + license = licenses.openssl; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a28e666f08d..5df9d009bf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8954,6 +8954,8 @@ with pkgs; quickserve = callPackage ../tools/networking/quickserve { }; + quictls = callPackage ../development/libraries/quictls { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; @@ -18833,6 +18835,10 @@ with pkgs; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; + nghttp3 = callPackage ../development/libraries/nghttp3 { }; + + ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; |