From 4864ab4099e1a966d4098219f80b0f41380ab7ae Mon Sep 17 00:00:00 2001
From: Jamie McClymont <jamie@kwiius.com>
Date: Wed, 13 Aug 2025 22:23:54 +1000
Subject: [PATCH] nixos/tests/nginx-variants: bring back handling of duplicate
 package names

Partially reverts 86efccfa45b058d51c429105dc2108e2ad1da005

Package names are non-unique, so tests were being silently dropped
from the attrset
---
 nixos/tests/nginx-variants.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix
index c5bc6b1ab062..0e845b3414d4 100644
--- a/nixos/tests/nginx-variants.nix
+++ b/nixos/tests/nginx-variants.nix
@@ -1,10 +1,10 @@
 { pkgs, runTest, ... }:
 builtins.listToAttrs (
   builtins.map
-    (nginxPackage: {
-      name = pkgs.lib.getName nginxPackage;
+    (packageName: {
+      name = packageName;
       value = runTest {
-        name = "nginx-variant-${pkgs.lib.getName nginxPackage}";
+        name = "nginx-variant-${packageName}";
 
         nodes.machine =
           { pkgs, ... }:
@@ -12,7 +12,7 @@ builtins.listToAttrs (
             services.nginx = {
               enable = true;
               virtualHosts.localhost.locations."/".return = "200 'foo'";
-              package = nginxPackage;
+              package = pkgs.${packageName};
             };
           };
 
@@ -24,13 +24,13 @@ builtins.listToAttrs (
       };
     })
     [
-      pkgs.angie
-      pkgs.angieQuic
-      pkgs.nginxStable
-      pkgs.nginxMainline
-      pkgs.nginxQuic
-      pkgs.nginxShibboleth
-      pkgs.openresty
-      pkgs.tengine
+      "angie"
+      "angieQuic"
+      "nginxStable"
+      "nginxMainline"
+      "nginxQuic"
+      "nginxShibboleth"
+      "openresty"
+      "tengine"
     ]
 )