nixos/users-groups: fix assertion

2025-10-23 04:05:01 +02:00
parent 4e6b410068
commit 0a3b3a9dee
1 changed files with 12 additions and 7 deletions
@@ -1083,14 +1083,19 @@ in
            -> !cfg.allowNoPasswordLogin
            -> any id (
              mapAttrsToList (
-                name: cfg:
-                (name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups)
+                name: user:
+                (
+                  name == "root"
+                  || user.group == "wheel"
+                  || elem "wheel" user.extraGroups
+                  || elem name (cfg.groups.wheel.members or [ ])
+                )
                && (
-                  allowsLogin cfg.hashedPassword
-                  || cfg.password != null
-                  || cfg.hashedPasswordFile != null
-                  || cfg.openssh.authorizedKeys.keys != [ ]
-                  || cfg.openssh.authorizedKeys.keyFiles != [ ]
+                  allowsLogin user.hashedPassword
+                  || user.password != null
+                  || user.hashedPasswordFile != null
+                  || user.openssh.authorizedKeys.keys != [ ]
+                  || user.openssh.authorizedKeys.keyFiles != [ ]
                )
              ) cfg.users
              ++ [