Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6399b103d84b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f4a3293b9c3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 8, 2018

  1. nginx: init ngx_aws_auth at 2.1.1

    @LnL7
    LnL7 committed Nov 8, 2018
    Copy the full SHA
    6d71316 View commit details

  2. Merge pull request #49933 from LnL7/ngx_aws_auth 

    nginx: init ngx_aws_auth at 2.1.1
    @LnL7
    LnL7 authored Nov 8, 2018
    Copy the full SHA
    1f4a329 View commit details
Showing with 11 additions and 4 deletions.
  1. +1 −3 pkgs/servers/http/nginx/generic.nix
  2. +10 −1 pkgs/servers/http/nginx/modules.nix
4 changes: 1 addition & 3 deletions pkgs/servers/http/nginx/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
11 changes: 10 additions & 1 deletion pkgs/servers/http/nginx/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {