about summary refs log tree commit diff
path: root/nixos/modules/security
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/security
parent89d5d191b48c502c84a4ed459ef3c9adc77a012a (diff)
downloadnixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.gz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.bz2
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.lz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.xz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.zst
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.zip
nixos/modules: users.(extraUsers|extraGroup->users|group)
Diffstat (limited to 'nixos/modules/security')
-rw-r--r--nixos/modules/security/pam_mount.nix2
-rw-r--r--nixos/modules/security/polkit.nix2
-rw-r--r--nixos/modules/security/rtkit.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index a5299728348d..8b131c54a2a5 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -40,7 +40,7 @@ in
       target = "security/pam_mount.conf.xml";
       source =
         let
-          extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers;
+          extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users;
           userVolumeEntry = user: "<volume user=\"${user.name}\" path=\"${user.cryptHomeLuks}\" mountpoint=\"${user.home}\" />\n";
         in
          pkgs.writeText "pam_mount.conf.xml" ''
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 7e59408a5b0b..04685f2c9ea1 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -94,7 +94,7 @@ in
         rm -rf /var/lib/{polkit-1,PolicyKit}
       '';
 
-    users.extraUsers.polkituser = {
+    users.users.polkituser = {
       description = "PolKit daemon";
       uid = config.ids.uids.polkituser;
     };
diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index afe93f24273d..f6dda21c6006 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -34,7 +34,7 @@ with lib;
 
     services.dbus.packages = [ pkgs.rtkit ];
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "rtkit";
         uid = config.ids.uids.rtkit;
         description = "RealtimeKit daemon";