nixos/hadoop: Replace users.extra{Users,Groups}

In fff5923686c21dd147bde62d08e9f1042deadb4f all occurences of
users.extraUsers and users.extraGroups have been changed tree-wide to
users.users and users.group. In the meantime the hadoop modules were
introduced via #41381 (060a98e9f4ad879492e48d63e887b0b6db26299e).

Unfortunately those modules still use users.extraUsers, which has been
renamed a long time ago (14321ae2431e33f5ed81f1ee43eddd29c7e9d01d, about
three years from now), so let's actually rename it accordingly as well.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @aespinosa

aszlig 6e471172 dcc1013f

Changed files
+5 -5
nixos
modules
services
cluster
+3 -3
nixos/modules/services/cluster/hadoop/default.nix
···
config = mkMerge [
-
(mkIf (builtins.hasAttr "yarn" config.users.extraUsers ||
-
builtins.hasAttr "hdfs" config.users.extraUsers ) {
-
users.extraGroups.hadoop = {
gid = config.ids.gids.hadoop;
};
})
···
config = mkMerge [
+
(mkIf (builtins.hasAttr "yarn" config.users.users ||
+
builtins.hasAttr "hdfs" config.users.users) {
+
users.groups.hadoop = {
gid = config.ids.gids.hadoop;
};
})
+1 -1
nixos/modules/services/cluster/hadoop/hdfs.nix
···
(mkIf (
cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled
) {
-
users.extraUsers.hdfs = {
description = "Hadoop HDFS user";
group = "hadoop";
uid = config.ids.uids.hdfs;
···
(mkIf (
cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled
) {
+
users.users.hdfs = {
description = "Hadoop HDFS user";
group = "hadoop";
uid = config.ids.uids.hdfs;
+1 -1
nixos/modules/services/cluster/hadoop/yarn.nix
···
cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled
) {
-
users.extraUsers.yarn = {
description = "Hadoop YARN user";
group = "hadoop";
uid = config.ids.uids.yarn;
···
cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled
) {
+
users.users.yarn = {
description = "Hadoop YARN user";
group = "hadoop";
uid = config.ids.uids.yarn;