Merge branch 'staging-next' into staging

2019-02-01 09:42:53 +01:00
parent d00ca4476c 5effa4e0f9
commit 8ba516664b
458 changed files with 9823 additions and 5655 deletions
@@ -87,6 +87,8 @@ stdenv.mkDerivation {
    mv $out/sbin $out/bin
  '';

+  passthru.modules = modules;
+
  meta = {
    description = "A reverse proxy and lightweight webserver";
    homepage    = http://nginx.org;