dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nginx: upgrade pcre to pcre2 (#355989)

Browse Source
This commit is contained in:
Emily 2024-11-19 15:28:49 +00:00 committed by GitHub
commit fc1a0e3323
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 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, pcre, libxml2, libxslt outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre2, libxml2, libxslt
, nginx-doc , nginx-doc
, nixosTests , nixosTests
@ -66,7 +66,7 @@ stdenv.mkDerivation {
removeReferencesTo removeReferencesTo
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;
buildInputs = [ openssl zlib pcre libxml2 libxslt perl ] buildInputs = [ openssl zlib pcre2 libxml2 libxslt perl ]
++ buildInputs ++ buildInputs
++ mapModules "inputs" ++ mapModules "inputs"
++ lib.optional withGeoIP geoip ++ lib.optional withGeoIP geoip

6
pkgs/servers/http/openresty/default.nix
View File

@ -10,12 +10,12 @@
callPackage ../nginx/generic.nix args rec { callPackage ../nginx/generic.nix args rec {
pname = "openresty"; pname = "openresty";
nginxVersion = "1.25.3"; nginxVersion = "1.27.1";
version = "${nginxVersion}.2"; version = "${nginxVersion}.1";
src = fetchurl { src = fetchurl {
url = "https://openresty.org/download/openresty-${version}.tar.gz"; url = "https://openresty.org/download/openresty-${version}.tar.gz";
sha256 = "sha256-LVZAIrBuM7Rfflz68eXcVx041hgDr5+idU3/81PCjZw="; sha256 = "sha256-ebBx4nvcFD1fQB0Nv1BN5EIAcNhnU4xe3CVG0DUf1cA=";
}; };
# generic.nix applies fixPatch on top of every patch defined there. # generic.nix applies fixPatch on top of every patch defined there.