From 942d2798c595f4979b67bbbcc6a005c7735c9419 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Tue, 22 Sep 2015 13:08:42 +0800 Subject: [PATCH 1/2] nginx: bump lua module to fix build error (https://github.com/openresty/lua-nginx-module/pull/500) --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e988e8192fc6..580f12b30048 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -61,8 +61,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.12"; - sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4"; + rev = "v0.9.16"; + sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp"; }; in From 4ac4f2dcd95eface526b89cdfb9d26de424bff6b Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Tue, 22 Sep 2015 13:09:11 +0800 Subject: [PATCH 2/2] nginx: add an option to build the stream module --- pkgs/servers/http/nginx/unstable.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 580f12b30048..e71adba3e572 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -5,7 +5,8 @@ , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false }: +, ngx_lua ? false +, withStream ? false }: with stdenv.lib; @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { ++ optional moreheaders "--add-module=${moreheaders-ext}" ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" + ++ optional withStream "--with-stream" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";