commit 89d5d191b48c502c84a4ed459ef3c9adc77a012a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/atd.nix

···

       9
       9
        
         machine =

     

       10
       10
        
           { config, pkgs, ... }:

     

       11
       11
        
           { services.atd.enable = true;

     

       12
       12
       -
             users.extraUsers.alice = { isNormalUser = true; };

     

       12
       12
       +
             users.users.alice = { isNormalUser = true; };

     

       13
       13
        
           };

     

       14
       14
        
       

     

       15
       15
        
         # "at" has a resolution of 1 minute

+2 -2

nixos/tests/common/user-account.nix

···

       1
       1
        
       { lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       { users.extraUsers.alice =

     

       3
       3
       +
       { users.users.alice =

     

       4
       4
        
           { isNormalUser = true;

     

       5
       5
        
             description = "Alice Foobar";

     

       6
       6
        
             password = "foobar";

     

       7
       7
        
           };

     

       8
       8
        
       

     

       9
       9
       -
         users.extraUsers.bob =

     

       9
       9
       +
         users.users.bob =

     

       10
       10
        
           { isNormalUser = true;

     

       11
       11
        
             description = "Bob Foobar";

     

       12
       12
        
             password = "foobar";

+2 -2

nixos/tests/gitolite.nix

···

       78
       78
        
                   # there's nobody around that can input password

     

       79
       79
        
                   PreferredAuthentications publickey

     

       80
       80
        
               '';

     

       81
       81
       -
               users.extraUsers.alice = { isNormalUser = true; };

     

       82
       82
       -
               users.extraUsers.bob = { isNormalUser = true; };

     

       81
       81
       +
               users.users.alice = { isNormalUser = true; };

     

       82
       82
       +
               users.users.bob = { isNormalUser = true; };

     

       83
       83
        
             };

     

       84
       84
        
       

     

       85
       85
        
         };

+1 -1

nixos/tests/installer.nix

···

       43
       43
        
                 boot.loader.systemd-boot.enable = true;

     

       44
       44
        
               ''}

     

       45
       45
        
       

     

       46
       46
       -
               users.extraUsers.alice = {

     

       46
       46
       +
               users.users.alice = {

     

       47
       47
        
                 isNormalUser = true;

     

       48
       48
        
                 home = "/home/alice";

     

       49
       49
        
                 description = "Alice Foobar";

+2 -2

nixos/tests/jenkins.nix

···

       18
       18
        
               # should have no effect

     

       19
       19
        
               services.jenkinsSlave.enable = true;

     

       20
       20
        
       

     

       21
       21
       -
               users.extraUsers.jenkins.extraGroups = [ "users" ];

     

       21
       21
       +
               users.users.jenkins.extraGroups = [ "users" ];

     

       22
       22
        
       

     

       23
       23
        
               systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min";

     

       24
       24
        
             };

     
···

       27
       27
        
             { config, pkgs, ... }:

     

       28
       28
        
             { services.jenkinsSlave.enable = true;

     

       29
       29
        
       

     

       30
       30
       -
               users.extraUsers.jenkins.extraGroups = [ "users" ];

     

       30
       30
       +
               users.users.jenkins.extraGroups = [ "users" ];

     

       31
       31
        
             };

     

       32
       32
        
       

     

       33
       33
        
         };

+1 -1

nixos/tests/lightdm.nix

···

       16
       16
        
         enableOCR = true;

     

       17
       17
        
       

     

       18
       18
        
         testScript = { nodes, ... }: let

     

       19
       19
       -
           user = nodes.machine.config.users.extraUsers.alice;

     

       19
       19
       +
           user = nodes.machine.config.users.users.alice;

     

       20
       20
        
         in ''

     

       21
       21
        
           startAll;

     

       22
       22
        
           $machine->waitForText(qr/${user.description}/);

+2 -2

nixos/tests/openssh.nix

···

       17
       17
        
               services.openssh.enable = true;

     

       18
       18
        
               security.pam.services.sshd.limits =

     

       19
       19
        
                 [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];

     

       20
       20
       -
               users.extraUsers.root.openssh.authorizedKeys.keys = [

     

       20
       20
       +
               users.users.root.openssh.authorizedKeys.keys = [

     

       21
       21
        
                 snakeOilPublicKey

     

       22
       22
        
               ];

     

       23
       23
        
             };

     
···

       29
       29
        
               services.openssh = { enable = true; startWhenNeeded = true; };

     

       30
       30
        
               security.pam.services.sshd.limits =

     

       31
       31
        
                 [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];

     

       32
       32
       -
               users.extraUsers.root.openssh.authorizedKeys.keys = [

     

       32
       32
       +
               users.users.root.openssh.authorizedKeys.keys = [

     

       33
       33
        
                 snakeOilPublicKey

     

       34
       34
        
               ];

     

       35
       35
        
             };

+1 -1

nixos/tests/pam-oath-login.nix

···

       30
       30
        
               enable = true;

     

       31
       31
        
             };

     

       32
       32
        
       

     

       33
       33
       -
             users.extraUsers.alice = {

     

       33
       33
       +
             users.users.alice = {

     

       34
       34
        
               isNormalUser = true;

     

       35
       35
        
               name = "alice";

     

       36
       36
        
               uid = 1000;

+1 -1

nixos/tests/plasma5.nix

···

       41
       41
        
         enableOCR = true;

     

       42
       42
        
       

     

       43
       43
        
         testScript = { nodes, ... }: let

     

       44
       44
       -
           user = nodes.machine.config.users.extraUsers.alice;

     

       44
       44
       +
           user = nodes.machine.config.users.users.alice;

     

       45
       45
        
           xdo = "${pkgs.xdotool}/bin/xdotool";

     

       46
       46
        
         in ''

     

       47
       47
        
           startAll;

+1 -1

nixos/tests/sddm.nix

···

       21
       21
        
             enableOCR = true;

     

       22
       22
        
       

     

       23
       23
        
             testScript = { nodes, ... }: let

     

       24
       24
       -
               user = nodes.machine.config.users.extraUsers.alice;

     

       24
       24
       +
               user = nodes.machine.config.users.users.alice;

     

       25
       25
        
             in ''

     

       26
       26
        
               startAll;

     

       27
       27
        
               $machine->waitForText(qr/select your user/i);

+1 -1

nixos/tests/slim.nix

···

       48
       48
        
         enableOCR = true;

     

       49
       49
        
       

     

       50
       50
        
         testScript = { nodes, ... }: let

     

       51
       51
       -
           user = nodes.machine.config.users.extraUsers.alice;

     

       51
       51
       +
           user = nodes.machine.config.users.users.alice;

     

       52
       52
        
         in ''

     

       53
       53
        
           startAll;

     

       54
       54
        
           $machine->waitForText(qr/Username:/);

+1 -1

nixos/tests/sudo.nix

···

       14
       14
        
             { config, lib, pkgs, ... }:

     

       15
       15
        
             with lib;

     

       16
       16
        
             {

     

       17
       17
       -
               users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };

     

       17
       17
       +
               users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };

     

       18
       18
        
               users.users = {

     

       19
       19
        
                 test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; };

     

       20
       20
        
                 test1 = { isNormalUser = true; password = password; };

+1 -1

nixos/tests/virtualbox.nix

···

       334
       334
        
             virtualisation.memorySize = 2048;

     

       335
       335
        
             virtualisation.virtualbox.host.enable = true;

     

       336
       336
        
             services.xserver.displayManager.auto.user = "alice";

     

       337
       337
       -
             users.extraUsers.alice.extraGroups = let

     

       337
       337
       +
             users.users.alice.extraGroups = let

     

       338
       338
        
               inherit (config.virtualisation.virtualbox.host) enableHardening;

     

       339
       339
        
             in lib.mkIf enableHardening (lib.singleton "vboxusers");

     

       340
       340
        
           };