lol

Fix subuid/subgid generation

I don't think we need to filter users with an unset uid, because
mkSubuidEntry/mkSubgidEntry don't references the uid.

+3 -9
+3 -9
nixos/modules/config/users-groups.nix
··· 276 276 }; 277 277 }; 278 278 279 - filterNull = a: filter (x: hasAttr a x && getAttr a x != null); 280 - 281 - sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups)) 282 - sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)) 283 279 mkSubuidEntry = user: concatStrings ( 284 280 map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n") 285 - user.subUidRanges); 281 + user.subUidRanges); 286 282 287 - subuidFile = concatStrings (map mkSubuidEntry ( 288 - sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)))); 283 + subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers)); 289 284 290 285 mkSubgidEntry = user: concatStrings ( 291 286 map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") 292 287 user.subGidRanges); 293 288 294 - subgidFile = concatStrings (map mkSubgidEntry ( 295 - sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)))); 289 + subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers)); 296 290 297 291 idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: 298 292 let