From 1a0c0c9599da83e49a39b6459a9609cbf59b0b70 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:05:06 +0300 Subject: [PATCH 1/5] nginxStable: 1.22.0 -> 1.22.1 (cherry picked from commit 2392241c0b54fba32d02ecac8cdfa8bcca7d2376) --- 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 5d4db3a403b6..eb3c90aa7c6c 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.22.0"; - sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk"; + version = "1.22.1"; + sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE="; } From 11139690f0eec1b8330752f574ab4ef28f9cfdbf Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 29 Jul 2022 12:51:33 +0300 Subject: [PATCH 2/5] nginxMainline: 1.23.0 -> 1.23.1 (cherry picked from commit ba7d7192f544b9833629d9af742b9ac7402b0f78) --- 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 227b4212e0ab..ba84963a763c 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.23.0"; - sha256 = "sha256-ggrKo1uScr6ennL23vpKXykhgkcJ+KpHcseKsx7ZTNE="; + version = "1.23.1"; + sha256 = "sha256-Xu4b0cI+O5R3pFUy8fNq5heLQ9VxqWB+aVPO8m1d8eI="; } From 197651064b5b397f6abfbc68478b5032e938462b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:07:08 +0300 Subject: [PATCH 3/5] nginxMainline: 1.23.1 -> 1.23.2 (cherry picked from commit a9cbc65ad0ad7c3059730cffde59cc4322267b07) --- 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 ba84963a763c..9b1ddf5da275 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.23.1"; - sha256 = "sha256-Xu4b0cI+O5R3pFUy8fNq5heLQ9VxqWB+aVPO8m1d8eI="; + version = "1.23.2"; + sha256 = "sha256-qAzCctPXKq7nCqi1F7SGKmNcAlZ5BDTb/E1hipmbC0Y="; } From 06a9c87f714fc0936aff00793b05766fbb78259a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 29 Jul 2022 12:48:36 +0300 Subject: [PATCH 4/5] nginxQuic: 8d0753760546 -> 3550b00d9dc8 (cherry picked from commit a09d4826e122178bc22d32df4a39871e7878097b) --- pkgs/servers/http/nginx/quic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index ec7982adf704..3d151a9f3500 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "8d0753760546"; # branch=quic - sha256 = "sha256-HcYkjbm3qfTU34ahseHCZhHYWNm1phfVph6oJBARMI8="; + rev = "3550b00d9dc8"; # branch=quic + sha256 = "sha256-JtE5FO4FHlDuqXd4UTXXPIFAdyyhQbOSMTT0NXh2iH4="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.23.0-quic"; + version = "1.23.1-quic"; } From 6e9b2d606227aa135e9f395c8db66d8cffecb3e0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:10:09 +0300 Subject: [PATCH 5/5] nginxQuic: 3550b00d9dc8 -> 3be953161026 (cherry picked from commit 9d676cb01d8254197d85f4771f924065d14149e5) --- pkgs/servers/http/nginx/quic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 3d151a9f3500..de5eea45c46d 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "3550b00d9dc8"; # branch=quic - sha256 = "sha256-JtE5FO4FHlDuqXd4UTXXPIFAdyyhQbOSMTT0NXh2iH4="; + rev = "3be953161026"; # branch=quic + sha256 = "sha256-maWQ0RPI2pe6L8QL7TQ1YJts5ZJHhiTYG9sdwINGMDA="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.23.1-quic"; + version = "1.23.2-quic"; }