diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-02-11 04:20:00 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-02-19 23:37:41 +0000 |
| commit | 5ddd6359052d480813a96f2f27ed65b7d6de4dfa (patch) | |
| tree | 183b38f9696920b92f0b16c38ceb04afef91dbe1 | |
| parent | Merge pull request #217121 from NixOS/backport-216463-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-215914-to-release-22.11.tar.gz | |
tengine: 2.3.4 -> 2.4.0origin/backport-215914-to-release-22.11
https://github.com/alibaba/tengine/releases/tag/2.4.0
(cherry picked from commit 37e3c5d085832c8fa44f2a5c397ab9f71f6b78cc)
| -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 c46482b30149..83b4e1cf8eb2 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 84faf2aa432c..746552fc6222 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 = |