diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-02-19 18:37:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 18:37:05 -0500 |
| commit | aad47a01885c348d9b549a02b7f70c5ad06e9631 (patch) | |
| tree | 6dae82639ec5822fbcd1c580389c38113dc7682c /pkgs/servers | |
| parent | 48b04ba1ed086d4beace5fe2a4b5fd7da34f7a00 (diff) | |
| parent | 37e3c5d085832c8fa44f2a5c397ab9f71f6b78cc (diff) | |
Merge pull request #215914 from marsam/update-tengine
tengine: 2.3.4 -> 2.4.0
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/tengine/check-resolv-conf.patch | 8 | ||||
| -rw-r--r-- | pkgs/servers/http/tengine/default.nix | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/servers/http/tengine/check-resolv-conf.patch b/pkgs/servers/http/tengine/check-resolv-conf.patch index c46482b301490..83b4e1cf8eb21 100644 --- a/pkgs/servers/http/tengine/check-resolv-conf.patch +++ b/pkgs/servers/http/tengine/check-resolv-conf.patch @@ -2,13 +2,11 @@ diff --git a/auto/unix b/auto/unix index a38c12dc..025a4899 100644 --- a/auto/unix +++ b/auto/unix -@@ -1072,9 +1072,7 @@ ngx_feature_test='int fd; +@@ -1072,7 +1072,5 @@ ngx_feature_test='int fd; - # Auto read nameserver from /etc/resolv.conf. + # Tengine: auto read nameserver from /etc/resolv.conf. - if [ -f "/etc/resolv.conf" ]; then - have=NGX_RESOLVER_FILE - value=\"/etc/resolv.conf\" - . auto/define + have=NGX_RESOLVER_FILE value="\"/etc/resolv.conf\"" . auto/define -fi diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 84faf2aa432cf..746552fc6222f 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - sha256 = "sha256-0xue5XDvK9U64+rka8GRNv2lX62zcrYA1Tz7DrsA0ts="; + hash = "sha256-h/eSa2wCPvnX29wdtDHNQh8r1No1/YGinZNYU2MnsTM="; }; buildInputs = |