From 06b9024cc001fe8b1d4306808bc93432ba0a6cd8 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 14 Nov 2024 15:07:36 -0500 Subject: [PATCH 1/2] nginx: upgrade pcre to pcre2 Nginx builds with pcre2 by default as of version 1.21.5. --- pkgs/servers/http/nginx/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 266c09755ab0a..a9346c8e0fa2b 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -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 , nixosTests @@ -66,7 +66,7 @@ stdenv.mkDerivation { removeReferencesTo ] ++ nativeBuildInputs; - buildInputs = [ openssl zlib pcre libxml2 libxslt perl ] + buildInputs = [ openssl zlib pcre2 libxml2 libxslt perl ] ++ buildInputs ++ mapModules "inputs" ++ lib.optional withGeoIP geoip From 84a3cd93612f924674b40a0f6e667d18b43507ce Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Mon, 18 Nov 2024 16:51:30 -0500 Subject: [PATCH 2/2] openresty: 1.25.3.2 -> 1.27.1.1 --- pkgs/servers/http/openresty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index c684b83633abf..65191c6d713aa 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -10,12 +10,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.25.3"; - version = "${nginxVersion}.2"; + nginxVersion = "1.27.1"; + version = "${nginxVersion}.1"; src = fetchurl { 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.