diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-21 22:33:42 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-21 22:33:42 +0200 |
| commit | 80fc46903159eaf00332e5043ada0bb602a4eba1 (patch) | |
| tree | fbf8f1a91308884499cfb176fe9711c774281f6e /pkgs/servers/http | |
| parent | bb96577b51766adcda5a1ad5c9d3310ae276cc47 (diff) | |
| parent | 13ecba54c3246c8458dc434a213df64477571f19 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/quic.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/stable.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ba84963a763c7..9b1ddf5da275a 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="; } diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 3d151a9f35009..de5eea45c46d2 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"; } diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 5d4db3a403b69..eb3c90aa7c6c3 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="; } |