nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 18:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179055 from Izorkin/update-nginx

Browse Source 
update nginx
This commit is contained in:
7c6f434c 2022-07-03 06:43:26 +00:00 committed by GitHub
commit d77afe094c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/tests/nginx-http3.nix
View File

@ -70,6 +70,9 @@ in
testScript = ''
start_all()
server.wait_for_unit("nginx")
server.wait_for_open_port(443)
# Check http connections
client.succeed("curl --verbose --http3 https://acme.test | grep 'Hello World!'")

4
pkgs/servers/http/nginx/mainline.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.22.0";
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
version = "1.23.0";
sha256 = "sha256-ggrKo1uScr6ennL23vpKXykhgkcJ+KpHcseKsx7ZTNE=";
}

4
pkgs/servers/http/nginx/modules.nix
View File

@ -264,8 +264,8 @@ in
name = "moreheaders";
owner = "openresty";
repo = "headers-more-nginx-module";
rev = "v0.33";
sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53";
rev = "e536bc595d8b490dbc9cf5999ec48fca3f488632";
sha256 = "sha256-gxLgs07XdFLcV4lv4JpiG2WGeLhBk13FRyzI0FOUjyA=";
};
};

6
pkgs/servers/http/nginx/quic.nix
View File

@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
rev = "5b1011b5702b"; # branch=quic
sha256 = "sha256-q1gsJ6CJ7SD1XLitygnRusJ+exFPFg+B3wdsN+NvuL8=";
rev = "8d0753760546"; # branch=quic
sha256 = "sha256-HcYkjbm3qfTU34ahseHCZhHYWNm1phfVph6oJBARMI8=";
};
preConfigure = ''
@ -19,5 +19,5 @@ callPackage ./generic.nix args {
"--with-stream_quic_module"
];
version = "1.21.7-quic";
version = "1.23.0-quic";
}

3
pkgs/top-level/all-packages.nix
View File

@ -22381,7 +22381,6 @@ with pkgs;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@ -22393,7 +22392,6 @@ with pkgs;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3;
pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@ -22403,7 +22401,6 @@ with pkgs;
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3;
pcre = pcre2;
withKTLS = true;
withPerl = false;
# We don't use `with` statement here on purpose!