nginxStable: 1.20.2 -> 1.22.0

This commit is contained in:
ajs124 2022-05-25 11:03:25 +02:00
parent 07fa14a338
commit 14ef375cf0
2 changed files with 4 additions and 10 deletions
pkgs
servers/http/nginx
top-level

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";
}

View file

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