summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-02-08 21:09:48 +0100
committerDomen Kožar <domen@dev.si>2014-02-08 21:10:00 +0100
commitee14f8da9a04daa6c0412d983aa8daf37a539662 (patch)
tree59eb25817b246462358647a4e6f24641a32feabc
parentdea562b6b920463395db47d141689e0768eb4836 (diff)
downloadnixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar.gz
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar.bz2
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar.lz
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar.xz
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.tar.zst
nixpkgs-ee14f8da9a04daa6c0412d983aa8daf37a539662.zip
remove references to isSystemUser and fix eval of tested job
-rw-r--r--nixos/doc/manual/configuration.xml1
-rw-r--r--nixos/modules/profiles/demo.nix2
-rw-r--r--nixos/tests/common/user-account.nix1
3 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index e6d7dee251a..da08098ddda 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1025,7 +1025,6 @@ users.extraUsers.alice =
     home = "/home/alice";
     description = "Alice Foobar";
     extraGroups = [ "wheel" ];
-    isSystemUser = false;
     useDefaultShell = true;
     openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
   };
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 396dcf6c5d3..605cc6aad1d 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -11,6 +11,6 @@
       createHome = true;
       useDefaultShell = true;
       password = "demo";
-      isSystemUser = false;
+      uid = 1000;
     };
 }
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 8157cf8d263..0239a3c4d08 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -7,5 +7,6 @@
       createHome = true;
       useDefaultShell = true;
       password = "foobar";
+      uid = 1000;
     };
 }