summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-10-23 18:48:24 +0100
committerGitHub <noreply@github.com>2022-10-23 18:48:24 +0100
commit98f8316449f555fbceff787bb0ca8629da05db25 (patch)
tree9c7487d2f565210b538d49ba1e7a77ba8eb9f332
parentMerge pull request #197250 from NixOS/backport-196911-to-release-22.05 (diff)
parentnginxQuic: 3550b00d9dc8 -> 3be953161026 (diff)
downloadnixpkgs-98f8316449f555fbceff787bb0ca8629da05db25.tar.gz
Merge pull request #197049 from helsinki-systems/upd/nginx-22.05
[22.05]: nginx updates
-rw-r--r--pkgs/servers/http/nginx/mainline.nix4
-rw-r--r--pkgs/servers/http/nginx/quic.nix6
-rw-r--r--pkgs/servers/http/nginx/stable.nix4
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 227b4212e0ab..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.0";
- sha256 = "sha256-ggrKo1uScr6ennL23vpKXykhgkcJ+KpHcseKsx7ZTNE=";
+ version = "1.23.2";
+ sha256 = "sha256-qAzCctPXKq7nCqi1F7SGKmNcAlZ5BDTb/E1hipmbC0Y=";
}
diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix
index ec7982adf704..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 = "8d0753760546"; # branch=quic
- sha256 = "sha256-HcYkjbm3qfTU34ahseHCZhHYWNm1phfVph6oJBARMI8=";
+ rev = "3be953161026"; # branch=quic
+ sha256 = "sha256-maWQ0RPI2pe6L8QL7TQ1YJts5ZJHhiTYG9sdwINGMDA=";
};
preConfigure = ''
@@ -19,5 +19,5 @@ callPackage ./generic.nix args {
"--with-stream_quic_module"
];
- version = "1.23.0-quic";
+ version = "1.23.2-quic";
}
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=";
}