summary refs log tree commit diff
path: root/nixos/modules/services/system
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2018-06-30 01:58:35 +0200
committerFlorian Klink <flokli@flokli.de>2018-06-30 03:02:58 +0200
commitfff5923686c21dd147bde62d08e9f1042deadb4f (patch)
treeb5d25982df0045672be210e75dd923ce432cf8de /nixos/modules/services/system
parent89d5d191b48c502c84a4ed459ef3c9adc77a012a (diff)
downloadnixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.gz
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.bz2
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.lz
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.xz
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.zst
nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.zip
nixos/modules: users.(extraUsers|extraGroup->users|group)
Diffstat (limited to 'nixos/modules/services/system')
-rw-r--r--nixos/modules/services/system/dbus.nix4
-rw-r--r--nixos/modules/services/system/nscd.nix2
-rw-r--r--nixos/modules/services/system/uptimed.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 248df7351a8..e0458021844 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -71,14 +71,14 @@ in
         target = "dbus-1";
       };
 
-    users.extraUsers.messagebus = {
+    users.users.messagebus = {
       uid = config.ids.uids.messagebus;
       description = "D-Bus system message bus daemon user";
       home = homeDir;
       group = "messagebus";
     };
 
-    users.extraGroups.messagebus.gid = config.ids.gids.messagebus;
+    users.groups.messagebus.gid = config.ids.gids.messagebus;
 
     systemd.packages = [ pkgs.dbus.daemon ];
 
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index eb4b5281c7c..11a30ea81ba 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -41,7 +41,7 @@ in
   config = mkIf cfg.enable {
     environment.etc."nscd.conf".text = cfg.config;
 
-    users.extraUsers.nscd =
+    users.users.nscd =
       { isSystemUser = true;
         description = "Name service cache daemon user";
       };
diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index b20d6096803..3c9978ab226 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -20,7 +20,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.uptimed = {
+    users.users.uptimed = {
       description = "Uptimed daemon user";
       home        = stateDir;
       createHome  = true;