Skip to content

replace archive http-parser with llhttp #252068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mmsqe wants to merge 1 commit into from
Closed

replace archive http-parser with llhttp #252068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions pkgs/development/libraries/http-parser/build-shared.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions pkgs/development/libraries/http-parser/default.nix
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/development/web/nodejs/nodejs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, llhttp
, pkg-config, which, buildPackages
# for `.pkgs` attribute
, callPackage
Expand All @@ -21,7 +21,7 @@ let

useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";

sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });
sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit llhttp; });

sharedConfigureFlags = lib.concatMap (name: [
"--shared-${name}"
Expand Down Expand Up @@ -53,7 +53,7 @@ let
depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ];

buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
++ [ zlib libuv openssl http-parser icu ];
++ [ zlib libuv openssl llhttp icu ];

nativeBuildInputs = [ which pkg-config python ]
++ lib.optionals stdenv.isDarwin [ xcbuild ];
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22131,8 +22131,6 @@ with pkgs;

htmlcxx = callPackage ../development/libraries/htmlcxx { };

http-parser = callPackage ../development/libraries/http-parser { };

httpref = callPackage ../development/tools/misc/httpref { };

hubble = callPackage ../applications/networking/cluster/hubble { };
Expand Down