*: set isSystemUser or isNormalUser

This is a requirement for nixpkgs 21.05, or else evaluation will fail
with:

Exactly one of users.users.${name}.isSystemUser and users.users.${name}.isNormalUser must be set.
This commit is contained in:
tv 2021-06-02 00:11:38 +02:00
parent b7f6bab7ae
commit f558f1bc0c
5 changed files with 6 additions and 0 deletions

View File

@ -78,6 +78,7 @@ in {
inherit (cfg.user) home name uid; inherit (cfg.user) home name uid;
createHome = true; createHome = true;
group = cfg.group.name; group = cfg.group.name;
isSystemUser = true;
}; };
}; };
}; };

View File

@ -366,6 +366,7 @@ let
# To allow running cgit-clear-cache via hooks. # To allow running cgit-clear-cache via hooks.
cfg.cgit.fcgiwrap.group.name cfg.cgit.fcgiwrap.group.name
]; ];
isSystemUser = true;
shell = "/bin/sh"; shell = "/bin/sh";
openssh.authorizedKeys.keys = openssh.authorizedKeys.keys =
unique unique
@ -384,6 +385,7 @@ let
users.${cfg.cgit.fcgiwrap.user.name} = { users.${cfg.cgit.fcgiwrap.user.name} = {
inherit (cfg.cgit.fcgiwrap.user) home name uid; inherit (cfg.cgit.fcgiwrap.user) home name uid;
group = cfg.cgit.fcgiwrap.group.name; group = cfg.cgit.fcgiwrap.group.name;
isSystemUser = true;
}; };
}; };

View File

@ -66,6 +66,7 @@ let
nameValuePair htgen.user.name { nameValuePair htgen.user.name {
inherit (htgen.user) home name uid; inherit (htgen.user) home name uid;
createHome = true; createHome = true;
isSystemUser = true;
} }
) cfg; ) cfg;

View File

@ -236,6 +236,7 @@ let
nameValuePair "${netname}" { nameValuePair "${netname}" {
inherit (cfg.user) home name uid; inherit (cfg.user) home name uid;
createHome = true; createHome = true;
isSystemUser = true;
} }
) config.krebs.tinc; ) config.krebs.tinc;

View File

@ -116,6 +116,7 @@ in
group = "pulse"; group = "pulse";
extraGroups = [ "audio" ]; extraGroups = [ "audio" ];
home = "${runDir}/home"; home = "${runDir}/home";
isSystemUser = true;
}; };
}; };
} }