gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-18 00:15:17 +00:00
committed by GitHub
parent 03e8920ce4 a1e822ab3b
commit 94e79f47bf
96 changed files with 2334 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/config/users-groups.nix
View File

@@ -96,8 +96,8 @@ let
only one of {option}`hashedPassword`, {option}`password`, or
{option}`hashedPasswordFile` will be set.
In a system where [](#opt-systemd.sysusers.enable) is `true`, typically
only one of {option}`initialPassword`, {option}`initialHashedPassword`,
In a system where [](#opt-systemd.sysusers.enable) or [](#opt-services.userborn.enable) is `true`,
typically only one of {option}`initialPassword`, {option}`initialHashedPassword`,
or {option}`hashedPasswordFile` will be set.
If the option {option}`users.mutableUsers` is true, the password defined
@@ -875,7 +875,7 @@ in
};
system.activationScripts.users =
if !config.systemd.sysusers.enable then
if !config.systemd.sysusers.enable && !config.services.userborn.enable then
{
supportsDryActivation = true;
text = ''
@@ -926,7 +926,7 @@ in
# This does not work when the users and groups are created by
# systemd-sysusers because the users are created too late then.
system.activationScripts.hashes =
if !config.systemd.sysusers.enable then
if !config.systemd.sysusers.enable && !config.services.userborn.enable then
{
deps = [ "users" ];
text = ''