Merge pull request #118338 from Izorkin/update-nginx-zlib-ng

nginx: update to 1.20.0, replace zlib to zlib-ng

authored by ajs124 and committed by GitHub 39a51c99 bb80d578

+13 -4
+6
nixos/doc/manual/release-notes/rl-2105.xml
··· 94 94 been introduced. 95 95 </para> 96 96 </listitem> 97 + <listitem> 98 + <para> 99 + <link xlink:href="https://nginx.org">Nginx</link> has been updated to stable version 1.20.0. 100 + Now nginx uses the zlib-ng library by default. 101 + </para> 102 + </listitem> 97 103 </itemizedlist> 98 104 </section> 99 105
+2 -2
pkgs/servers/http/nginx/mainline.nix
··· 1 1 { callPackage, ... }@args: 2 2 3 3 callPackage ./generic.nix args { 4 - version = "1.19.9"; 5 - sha256 = "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f"; 4 + version = "1.20.0"; 5 + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; 6 6 }
+2 -2
pkgs/servers/http/nginx/stable.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix args { 4 - version = "1.18.0"; 5 - sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; 4 + version = "1.20.0"; 5 + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; 6 6 }
+3
pkgs/top-level/all-packages.nix
··· 18803 18803 nginx = nginxStable; 18804 18804 18805 18805 nginxQuic = callPackage ../servers/http/nginx/quic.nix { 18806 + zlib = zlib-ng.override { withZlibCompat = true; }; 18806 18807 withPerl = false; 18807 18808 # We don't use `with` statement here on purpose! 18808 18809 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 ··· 18812 18813 }; 18813 18814 18814 18815 nginxStable = callPackage ../servers/http/nginx/stable.nix { 18816 + zlib = zlib-ng.override { withZlibCompat = true; }; 18815 18817 withPerl = false; 18816 18818 # We don't use `with` statement here on purpose! 18817 18819 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 ··· 18819 18821 }; 18820 18822 18821 18823 nginxMainline = callPackage ../servers/http/nginx/mainline.nix { 18824 + zlib = zlib-ng.override { withZlibCompat = true; }; 18822 18825 withPerl = false; 18823 18826 # We don't use `with` statement here on purpose! 18824 18827 # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334