From 25bef2d8f91edfa80b86e1b777c520021a82131e Mon Sep 17 00:00:00 2001
From: Dominik Xaver Hörl <hoe.dom@gmx.de>
Date: Sun, 10 Jan 2021 20:08:30 +0100
Subject: treewide: simplify pkgs.stdenv.lib -> pkgs.lib

The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
---
 nixos/tests/nginx.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos/tests/nginx.nix')

diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 18822f09568..5686afcd043 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -6,7 +6,7 @@
 #   3. nginx doesn't restart on configuration changes (only reloads)
 import ./make-test-python.nix ({ pkgs, ... }: {
   name = "nginx";
-  meta = with pkgs.stdenv.lib.maintainers; {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [ mbbx6spp danbst ];
   };
 
-- 
cgit 1.4.1


From a86853501a339f95765a6763e9c409f374606faa Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sat, 5 Jun 2021 00:26:01 +0200
Subject: nixosTests.nginx*: nginxUnstable -> nginxMainline

Stop using the old `nginxUnstable` alias, which is invalid in tests
since 3edde6562e19698da69a499881e0a2e4f5a497a2.
---
 nixos/tests/nginx-variants.nix | 2 +-
 nixos/tests/nginx.nix          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nixos/tests/nginx.nix')

diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix
index ca4655391bc..a535030663b 100644
--- a/nixos/tests/nginx-variants.nix
+++ b/nixos/tests/nginx-variants.nix
@@ -29,5 +29,5 @@ builtins.listToAttrs (
         };
       }
     )
-    [ "nginxStable" "nginxUnstable" "nginxShibboleth" "openresty" "tengine" ]
+    [ "nginxStable" "nginxMainline" "nginxShibboleth" "openresty" "tengine" ]
 )
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 5686afcd043..d9d073822a1 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -56,11 +56,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
       };
 
       specialisation.reloadRestartSystem.configuration = {
-        services.nginx.package = pkgs.nginxUnstable;
+        services.nginx.package = pkgs.nginxMainline;
       };
 
       specialisation.reloadWithErrorsSystem.configuration = {
-        services.nginx.package = pkgs.nginxUnstable;
+        services.nginx.package = pkgs.nginxMainline;
         services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";
       };
     };
-- 
cgit 1.4.1