From ce8eb071d1c12554b2ddc16510c8809d1c75ff6d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 31 Mar 2021 23:31:47 +0300 Subject: [PATCH 1/4] nginx: replace zlib to zlib-ng --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55e57b74c9fa..0ed011fa565d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18698,6 +18698,7 @@ in nginx = nginxStable; nginxQuic = callPackage ../servers/http/nginx/quic.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 @@ -18707,6 +18708,7 @@ in }; nginxStable = callPackage ../servers/http/nginx/stable.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 @@ -18714,6 +18716,7 @@ in }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 From b36d55b67c6a9beb2226a1766466119f115794d6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 14 Apr 2021 16:16:48 +0300 Subject: [PATCH 2/4] nginxMainline: 1.19.9 -> 1.20.0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0409f6a26ea4..b7a11fc240d7 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.9"; - sha256 = "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f"; + version = "1.20.0"; + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; } From f4b6314e6041172da9ec011c59e4fa8fe88dc12f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 20 Apr 2021 23:55:56 +0300 Subject: [PATCH 3/4] nginxStable: 1.18.0 -> 1.20.0 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index c08615ef5125..5972177204fc 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.18.0"; - sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; + version = "1.20.0"; + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; } From 65ce0419ad75602f44fbb81461dfec7adc27880f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 21 Apr 2021 11:18:14 +0300 Subject: [PATCH 4/4] nginx: add release notes --- nixos/doc/manual/release-notes/rl-2105.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index e0552c25a856..68613b1e5616 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -94,6 +94,12 @@ been introduced. + + + Nginx has been updated to stable version 1.20.0. + Now nginx uses the zlib-ng library by default. + +