From e58e8550db63203bd3686e82758b961442a92d0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Feb 2016 10:37:32 +0100
Subject: Use users.users/users.groups instead of extra*

It has been renamed since months (NixOS/nixpkgs@14321ae) and
users.extra* are now just aliases to users.users and users.groups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/dnyarri.nix       | 2 +-
 machines/aszlig/kzerza.nix        | 4 ++--
 machines/aszlig/managed/haenk.nix | 2 +-
 machines/aszlig/managed/tyree.nix | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'machines/aszlig')

diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 5192e955..a041486e 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -109,7 +109,7 @@ with lib;
   # TODO: Try to avoid this, but as there is only a single user using audio on
   # this machine, it's okay for now. But remember that this will break heavily,
   # should there be another user accessing the audio devices.
-  users.extraUsers.aszlig.extraGroups = [ "audio" "vboxusers" ];
+  users.users.aszlig.extraGroups = [ "audio" "vboxusers" ];
 
   services.synergy.client.enable = true;
   services.synergy.client.serverAddress = "mmrnmhrm";
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index 91fbe09c..41b380b9 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -40,8 +40,8 @@ in {
   fileSystems."/tmp".fsType = "tmpfs";
   fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
-  users.extraGroups.grandpa.gid = 666;
-  users.extraUsers.grandpa = {
+  users.groups.grandpa.gid = 666;
+  users.users.grandpa = {
     uid = 666;
     description = "GrandPA User";
     group = "grandpa";
diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix
index 75730ff4..c7d83131 100644
--- a/machines/aszlig/managed/haenk.nix
+++ b/machines/aszlig/managed/haenk.nix
@@ -85,7 +85,7 @@
 
   time.timeZone = "Europe/Berlin";
 
-  users.extraUsers.bla = {
+  users.users.bla = {
     isNormalUser = true;
     uid = 1000;
     extraGroups = [ "video" "wheel" ];
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index c44f83b3..47f7eb47 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -68,7 +68,7 @@
 
   time.timeZone = "Europe/Berlin";
 
-  users.extraUsers.bla = {
+  users.users.bla = {
     isNormalUser = true;
     uid = 1000;
     extraGroups = [ "video" "wheel" ];
-- 
cgit 1.4.1