summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 11:42:09 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 11:42:09 +0200
commit585983bc954d043d40a14b29c0bddca42bb9cdfb (patch)
treef64c271969e6fa21b7e3e49da7653a92f2d6face /nixos/tests
parentff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff)
parenta71744392b6964e624d3ae968bee660731b7d271 (diff)
Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/common/user-account.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 0239a3c4d08a0..aa3a0b82bcde1 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,11 +1,9 @@
 { pkgs, ... }:
 
 { users.extraUsers = pkgs.lib.singleton
-    { name = "alice";
+    { isNormalUser = true;
+      name = "alice";
       description = "Alice Foobar";
-      home = "/home/alice";
-      createHome = true;
-      useDefaultShell = true;
       password = "foobar";
       uid = 1000;
     };