From 36c95f331dd69ddc198e35b2b1f6df5bdb290213 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 16 Aug 2020 10:36:58 +0300
Subject: nginxModules.cache-purge: 2.5 -> 2.5.1

---
 nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'nixos')

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 7a06c06fed1..7485a6e7c10 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -907,6 +907,11 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
      Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Nginx module <literal>nginxModules.fastcgi-cache-purge</literal> renamed to official name <literal>nginxModules.cache-purge</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
-- 
cgit 1.4.1


From 5c70c5eeaa275aae90e1d3e5b63a6fdcf29bc850 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 16 Aug 2020 15:40:38 +0300
Subject: nginxModules: renamed module ngx_aws_auth to aws-auth

---
 nixos/doc/manual/release-notes/rl-2009.xml |  1 +
 pkgs/servers/http/nginx/modules.nix        | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'nixos')

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 7485a6e7c10..5a180f7a760 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -910,6 +910,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
    <listitem>
     <para>
      Nginx module <literal>nginxModules.fastcgi-cache-purge</literal> renamed to official name <literal>nginxModules.cache-purge</literal>.
+     Nginx module <literal>nginxModules.ngx_aws_auth</literal> renamed to official name <literal>nginxModules.aws-auth</literal>.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index a14f500c62b..983e0f41ee9 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -20,6 +20,17 @@ in
 
 {
   fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge";
+  ngx_aws_auth = throw "fastcgi-cache-purge was renamed to aws-auth";
+
+  aws-auth = {
+    src = fetchFromGitHub {
+      name = "aws-auth";
+      owner = "anomalizer";
+      repo = "ngx_aws_auth";
+      rev = "2.1.1";
+      sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
+    };
+  };
 
   brotli = {
     src = let gitsrc = pkgs.fetchFromGitHub {
@@ -223,16 +234,6 @@ in
     } + "/naxsi_src";
   };
 
-  ngx_aws_auth = {
-    src = fetchFromGitHub {
-      name = "ngx_aws_auth";
-      owner = "anomalizer";
-      repo = "ngx_aws_auth";
-      rev = "2.1.1";
-      sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
-    };
-  };
-
   opentracing = {
     src =
       let src' = fetchFromGitHub {
-- 
cgit 1.4.1