alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nginx(Stable|Mainline|Quic): use pcre2

Browse source
This commit is contained in:
ajs124 2022-05-25 21:34:21 +02:00
parent 893214cd0e
commit b484952330
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/http/nginx/generic.nix
View file

@ -1,4 +1,4 @@
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre2, libxml2, libxslt
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, nginx-doc
, nixosTests
@ -53,7 +53,7 @@ stdenv.mkDerivation {
inherit sha256;
};
buildInputs = [ openssl zlib pcre2 libxml2 libxslt gd geoip perl ]
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]
++ buildInputs
++ mapModules "inputs";

3
pkgs/top-level/all-packages.nix
View file

@ -22045,6 +22045,7 @@ with pkgs;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@ -22056,6 +22057,7 @@ with pkgs;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3_0;
pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@ -22065,6 +22067,7 @@ with pkgs;
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3_0;
pcre = pcre2;
withKTLS = true;
withPerl = false;
# We don't use `with` statement here on purpose!