From a86853501a339f95765a6763e9c409f374606faa Mon Sep 17 00:00:00 2001 From: talyz 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') diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix index ca4655391bc59..a535030663bdb 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 5686afcd043e8..d9d073822a145 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