diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 14:28:08 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 14:28:08 +0100 |
commit | 1d3bff25db1987ab7824f483ba0d6b316d8965b2 (patch) | |
tree | b482c2a9d9d75db4e2571abe12af3596cea2660b /pkgs/servers/http | |
parent | 5955c5113a39be8facd831ad86f03ed665d1655f (diff) | |
parent | 02bf0e589653d34dc919b32a1d3c67b0d0bb2335 (diff) | |
download | nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.gz nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.bz2 nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.lz nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.xz nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.tar.zst nixpkgs-1d3bff25db1987ab7824f483ba0d6b316d8965b2.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 643e7ed719a..25ff20635af 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation { inherit sha256; }; - - buildInputs = - [ openssl zlib pcre libxml2 libxslt gd geoip ] + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ concatMap (mod: mod.inputs or []) modules; configureFlags = [ diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 15822a0387b..6b4510bfe82 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -131,6 +131,15 @@ }; }; + ngx_aws_auth = { + src = fetchFromGitHub { + owner = "anomalizer"; + repo = "ngx_aws_auth"; + rev = "2.1.1"; + sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; + }; + }; + opentracing = { src = let src' = fetchFromGitHub { @@ -226,7 +235,7 @@ rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; }; - }; + }; statsd = { src = fetchFromGitHub { |