nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175465 from NixOS/backport-174448-to-release-22.05

Browse Source 
[Backport release-22.05] nginxStable: 1.20.2 -> 1.22.0
This commit is contained in:
7c6f434c
2022-06-11 08:34:45 +00:00
committed by GitHub
parent cc5a426ba3 70fda42f22
commit 601d67acc0
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/nginx/default.nix
View File

@@ -932,7 +932,7 @@ in
# System Call Filtering
SystemCallArchitectures = "native";
SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ]
++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ];
++ optionals ((cfg.package != pkgs.tengine) && (cfg.package != pkgs.openresty) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ];
};
};

8
pkgs/servers/http/nginx/mainline.nix
View File

@@ -1,6 +1,6 @@
{ callPackage, openssl_3_0, ... }@args:
{ callPackage, ... }@args:
callPackage ./generic.nix (args // { openssl = openssl_3_0; }) {
version = "1.21.6";
sha256 = "1bh52jqqcaj5wlh2kvhxr00jhk2hnk8k97ki4pwyj4c8920p1p36";
callPackage ./generic.nix args {
version = "1.22.0";
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
}

4
pkgs/servers/http/nginx/quic.nix
View File

@@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
rev = "55b38514729b"; # branch=quic
sha256 = "sha256-EJ3Fuxb4Z43I5eSb3mzzIOBfppAZ4Adv1yVZWbVCv0A=";
rev = "5b1011b5702b"; # branch=quic
sha256 = "sha256-q1gsJ6CJ7SD1XLitygnRusJ+exFPFg+B3wdsN+NvuL8=";
};
preConfigure = ''

13
pkgs/servers/http/nginx/stable.nix
View File

@@ -1,13 +1,6 @@
{ callPackage, fetchpatch, ... } @ args:
{ callPackage, ... } @ args:
callPackage ./generic.nix args {
version = "1.20.2";
sha256 = "0hjsyjzd35qyw49w210f67g678kvzinw4kg1acb0l6c2fxspd24m";
extraPatches = [
(fetchpatch {
name = "CVE-2021-3618.patch";
url = "https://github.com/nginx/nginx/commit/173f16f736c10eae46cd15dd861b04b82d91a37a.patch";
sha256 = "0cnxmbkp6ip61w7y1ihhnvziiwzz3p3wi2vpi5c7yaj5m964k5db";
})
];
version = "1.22.0";
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
}

5
pkgs/top-level/all-packages.nix
View File

@@ -21994,6 +21994,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
@@ -22004,6 +22005,8 @@ 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
@@ -22012,6 +22015,8 @@ 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!