lol

Merge pull request #132836 from Infinisil/populate-members

nixos/users: Populate group members option

authored by

Silvan Mosberger and committed by
GitHub
1ad73dad 4ffe91a2

+6 -7
+6 -7
nixos/modules/config/users-groups.nix
··· 324 324 325 325 }; 326 326 327 - groupOpts = { name, ... }: { 327 + groupOpts = { name, config, ... }: { 328 328 329 329 options = { 330 330 ··· 358 358 359 359 config = { 360 360 name = mkDefault name; 361 + 362 + members = mapAttrsToList (n: u: u.name) ( 363 + filterAttrs (n: u: elem config.name u.extraGroups) cfg.users 364 + ); 361 365 }; 362 366 363 367 }; ··· 419 423 initialPassword initialHashedPassword; 420 424 shell = utils.toShellPath u.shell; 421 425 }) cfg.users; 422 - groups = mapAttrsToList (n: g: 423 - { inherit (g) name gid; 424 - members = g.members ++ (mapAttrsToList (n: u: u.name) ( 425 - filterAttrs (n: u: elem g.name u.extraGroups) cfg.users 426 - )); 427 - }) cfg.groups; 426 + groups = attrValues cfg.groups; 428 427 }); 429 428 430 429 systemShells =