nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215914 from marsam/update-tengine

Browse Source 
tengine: 2.3.4 -> 2.4.0
This commit is contained in:
Mario Rodas 2023-02-19 18:37:05 -05:00 committed by GitHub
commit aad47a0188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/http/tengine/check-resolv-conf.patch
View File

@ -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

4
pkgs/servers/http/tengine/default.nix
View File

@ -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 =