commit c637afe9c187098c6780963212f409426a19b465 · pyrox.dev/nixpkgs

-2

nixos/maintainers/scripts/cloudstack/cloudstack-image.nix

···

       2
       2
        
       

     

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

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
         imports =

     

       9
       7
        
           [ ../../../modules/virtualisation/cloudstack-config.nix ];

-2

nixos/maintainers/scripts/lxd/lxd-image-inner.nix

···

       4
       4
        
       

     

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

     

       6
       6
        
       

     

       7
       7
       -
       with lib;

     

       8
       8
       -
       

     

       9
       7
        
       {

     

       10
       8
        
         imports =

     

       11
       9
        
           [ # Include the default lxd configuration.

-2

nixos/maintainers/scripts/lxd/lxd-image.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         imports = [

     

       7
       5
        
           ../../../modules/virtualisation/lxc-container.nix

-2

nixos/maintainers/scripts/lxd/nix.tpl

···

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

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       # WARNING: THIS CONFIGURATION IS AUTOGENERATED AND WILL BE OVERWRITTEN AUTOMATICALLY

     

       6
       4
        
       

     

       7
       5
        
       {

+5 -2

nixos/modules/rename.nix

···

       1
       1
        
       { lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       3
       3
       +
       let

     

       4
       4
       +
         inherit (lib)

     

       5
       5
       +
           mkAliasOptionModuleMD

     

       6
       6
       +
           mkRemovedOptionModule;

     

       7
       7
       +
       in

     

       5
       8
        
       {

     

       6
       9
        
         imports = [

     

       7
       10
        
           /*

+1 -3

nixos/tests/3proxy.nix

···

       1
       1
        
       { lib, pkgs, ... }: {

     

       2
       2
        
         name = "3proxy";

     

       3
       3
       -
         meta = with lib.maintainers; {

     

       4
       4
       -
           maintainers = [ misuzu ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ misuzu ];

     

       6
       4
        
       

     

       7
       5
        
         nodes = {

     

       8
       6
        
           peer0 = { lib, ... }: {

+2 -5

nixos/tests/apparmor.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, ... } : {

     

       2
       2
        
         name = "apparmor";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; {

     

       4
       4
       -
           maintainers = [ julm ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ julm ];

     

       6
       4
        
       

     

       7
       5
        
         nodes.machine =

     

       8
       6
        
           { lib, pkgs, config, ... }:

     

       9
       9
       -
           with lib;

     

       10
       7
        
           {

     

       11
       11
       -
             security.apparmor.enable = mkDefault true;

     

       8
       8
       +
             security.apparmor.enable = lib.mkDefault true;

     

       12
       9
        
           };

     

       13
       10
        
       

     

       14
       11
        
         testScript =

+1 -2

nixos/tests/atuin.nix

···

       6
       6
        
         testPass = "password";

     

       7
       7
        
         testEmail = "test.testerman@test.com";

     

       8
       8
        
       in

     

       9
       9
       -
       with lib;

     

       10
       9
        
       {

     

       11
       10
        
         name = "atuin";

     

       12
       12
       -
         meta.maintainers = with pkgs.lib.maintainers; [ devusb ];

     

       11
       11
       +
         meta.maintainers = with lib.maintainers; [ devusb ];

     

       13
       12
        
       

     

       14
       13
        
         nodes = {

     

       15
       14
        
           server =

+1 -3

nixos/tests/bazarr.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         port = 42069;

     

       7
       5
        
       in

     

       8
       6
        
       {

     

       9
       7
        
         name = "bazarr";

     

       10
       10
       -
         meta.maintainers = with maintainers; [ d-xo ];

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ d-xo ];

     

       11
       9
        
       

     

       12
       10
        
         nodes.machine =

     

       13
       11
        
           { pkgs, ... }:

+2 -2

nixos/tests/boot-stage1.nix

···

       107
       107
        
               '';

     

       108
       108
        
             };

     

       109
       109
        
       

     

       110
       110
       -
             copyCanaries = with lib; concatMapStrings (canary: ''

     

       111
       111
       -
               ${optionalString (canary ? child) ''

     

       110
       110
       +
             copyCanaries = lib.concatMapStrings (canary: ''

     

       111
       111
       +
               ${lib.optionalString (canary ? child) ''

     

       112
       112
        
                 copy_bin_and_libs "${canary.child}/bin/${canary.child.name}"

     

       113
       113
        
               ''}

     

       114
       114
        
               copy_bin_and_libs "${canary}/bin/${canary.name}"

+1 -3

nixos/tests/budgie.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
        
         name = "budgie";

     

       3
       3
        
       

     

       4
       4
       -
         meta = with lib; {

     

       5
       5
       -
           maintainers = [ maintainers.federicoschonborn ];

     

       6
       6
       -
         };

     

       4
       4
       +
         meta.maintainers = [ lib.maintainers.federicoschonborn ];

     

       7
       5
        
       

     

       8
       6
        
         nodes.machine = { ... }: {

     

       9
       7
        
           imports = [

+3 -5

nixos/tests/cadvisor.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... } : {

     

       1
       1
       +
       import ./make-test-python.nix ({ lib, pkgs, ... } : {

     

       2
       2
        
         name = "cadvisor";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; {

     

       4
       4
       -
           maintainers = [ offline ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ offline ];

     

       6
       4
        
       

     

       7
       5
        
         nodes = {

     

       8
       6
        
           machine = { ... }: {

     

       9
       7
        
             services.cadvisor.enable = true;

     

       10
       8
        
           };

     

       11
       9
        
       

     

       12
       12
       -
           influxdb = { lib, ... }: with lib; {

     

       10
       10
       +
           influxdb = { lib, ... }: {

     

       13
       11
        
             services.cadvisor.enable = true;

     

       14
       12
        
             services.cadvisor.storageDriver = "influxdb";

     

       15
       13
        
             services.influxdb.enable = true;

+1 -2

nixos/tests/calibre-web.nix

···

       5
       5
        
             port = 3142;

     

       6
       6
        
             defaultPort = 8083;

     

       7
       7
        
           in

     

       8
       8
       -
             with lib;

     

       9
       8
        
             {

     

       10
       9
        
               name = "calibre-web";

     

       11
       11
       -
               meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ];

     

       10
       10
       +
               meta.maintainers = with lib.maintainers; [ pborzenkov ];

     

       12
       11
        
       

     

       13
       12
        
               nodes = {

     

       14
       13
        
                 customized = { pkgs, ... }: {

+1 -3

nixos/tests/cinnamon.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
        
         name = "cinnamon";

     

       3
       3
        
       

     

       4
       4
       -
         meta = with lib; {

     

       5
       5
       -
           maintainers = teams.cinnamon.members;

     

       6
       6
       -
         };

     

       4
       4
       +
         meta.maintainers = lib.teams.cinnamon.members;

     

       7
       5
        
       

     

       8
       6
        
         nodes.machine = { nodes, ... }: {

     

       9
       7
        
           imports = [ ./common/user-account.nix ];

+5 -5

nixos/tests/common/acme/server/default.nix

···

       76
       76
        
       in {

     

       77
       77
        
         imports = [ ../../resolver.nix ];

     

       78
       78
        
       

     

       79
       79
       -
         options.test-support.acme = with lib; {

     

       80
       80
       -
           caDomain = mkOption {

     

       81
       81
       -
             type = types.str;

     

       79
       79
       +
         options.test-support.acme = {

     

       80
       80
       +
           caDomain = lib.mkOption {

     

       81
       81
       +
             type = lib.types.str;

     

       82
       82
        
             readOnly = true;

     

       83
       83
        
             default = domain;

     

       84
       84
        
             description = lib.mdDoc ''

     
···

       86
       86
        
               identify the CA server.

     

       87
       87
        
             '';

     

       88
       88
        
           };

     

       89
       89
       -
           caCert = mkOption {

     

       90
       90
       -
             type = types.path;

     

       89
       89
       +
           caCert = lib.mkOption {

     

       90
       90
       +
             type = lib.types.path;

     

       91
       91
        
             readOnly = true;

     

       92
       92
        
             default = testCerts.ca.cert;

     

       93
       93
        
             description = lib.mdDoc ''

+3 -16

nixos/tests/common/auto.nix

···

       1
       1
        
       { config, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       6
       -
       

     

       7
       4
        
         dmcfg = config.services.xserver.displayManager;

     

       8
       5
        
         cfg = config.test-support.displayManager.auto;

     

       9
       9
       -
       

     

       10
       6
        
       in

     

       11
       11
       -
       

     

       12
       7
        
       {

     

       13
       8
        
       

     

       14
       9
        
         ###### interface

     

       15
       10
        
       

     

       16
       11
        
         options = {

     

       17
       17
       -
       

     

       18
       12
        
           test-support.displayManager.auto = {

     

       19
       19
       -
       

     

       20
       20
       -
             enable = mkOption {

     

       13
       13
       +
             enable = lib.mkOption {

     

       21
       14
        
               default = false;

     

       22
       15
        
               description = lib.mdDoc ''

     

       23
       16
        
                 Whether to enable the fake "auto" display manager, which

     
···

       27
       20
        
               '';

     

       28
       21
        
             };

     

       29
       22
        
       

     

       30
       30
       -
             user = mkOption {

     

       23
       23
       +
             user = lib.mkOption {

     

       31
       24
        
               default = "root";

     

       32
       25
        
               description = lib.mdDoc "The user account to login automatically.";

     

       33
       26
        
             };

     

       34
       34
       -
       

     

       35
       27
        
           };

     

       36
       36
       -
       

     

       37
       28
        
         };

     

       38
       38
       -
       

     

       39
       29
        
       

     

       40
       30
        
         ###### implementation

     

       41
       31
        
       

     

       42
       42
       -
         config = mkIf cfg.enable {

     

       43
       43
       -
       

     

       32
       32
       +
         config = lib.mkIf cfg.enable {

     

       44
       33
        
           services.xserver.displayManager = {

     

       45
       34
        
             lightdm.enable = true;

     

       46
       35
        
             autoLogin = {

     
···

       62
       51
        
       

     

       63
       52
        
               session  include   lightdm

     

       64
       53
        
           '';

     

       65
       65
       -
       

     

       66
       54
        
         };

     

       67
       67
       -
       

     

       68
       55
        
       }

+2 -4

nixos/tests/convos.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       3
       3
       +
       

     

       4
       4
        
       let

     

       5
       5
        
         port = 3333;

     

       6
       6
        
       in

     

       7
       7
        
       {

     

       8
       8
        
         name = "convos";

     

       9
       9
       -
         meta = with pkgs.lib.maintainers; {

     

       10
       10
       -
           maintainers = [ sgo ];

     

       11
       11
       -
         };

     

       9
       9
       +
         meta.maintainers = with lib.maintainers; [ sgo ];

     

       12
       10
        
       

     

       13
       11
        
         nodes = {

     

       14
       12
        
           machine =

+4 -10

nixos/tests/couchdb.nix

···

       1
       1
        
       let

     

       2
       2
       -
       

     

       3
       2
        
         makeNode = couchpkg: user: passwd:

     

       4
       3
        
           { pkgs, ... } :

     

       5
       4
        
       

     

       6
       6
       -
             { environment.systemPackages = with pkgs; [ jq ];

     

       5
       5
       +
             { environment.systemPackages = [ pkgs.jq ];

     

       7
       6
        
               services.couchdb.enable = true;

     

       8
       7
        
               services.couchdb.package = couchpkg;

     

       9
       8
        
               services.couchdb.adminUser = user;

     
···

       12
       11
        
         testuser = "testadmin";

     

       13
       12
        
         testpass = "cowabunga";

     

       14
       13
        
         testlogin = "${testuser}:${testpass}@";

     

       15
       15
       -
       

     

       16
       16
       -
       in import ./make-test-python.nix ({ pkgs, lib, ...}:

     

       17
       17
       -
       

     

       18
       18
       -
       with lib;

     

       19
       19
       -
       

     

       14
       14
       +
       in

     

       15
       15
       +
       import ./make-test-python.nix ({ pkgs, lib, ...}:

     

       20
       16
        
       {

     

       21
       17
        
         name = "couchdb";

     

       22
       22
       -
         meta = with pkgs.lib.maintainers; {

     

       23
       23
       -
           maintainers = [ ];

     

       24
       24
       -
         };

     

       18
       18
       +
         meta.maintainers = [ ];

     

       25
       19
        
       

     

       26
       20
        
         nodes = {

     

       27
       21
        
           couchdb3 = makeNode pkgs.couchdb3 testuser testpass;

+1 -3

nixos/tests/doas.nix

···

       2
       2
        
       import ./make-test-python.nix (

     

       3
       3
        
         { lib, ... }: {

     

       4
       4
        
           name = "doas";

     

       5
       5
       -
           meta = with lib.maintainers; {

     

       6
       6
       -
             maintainers = [ cole-h ];

     

       7
       7
       -
           };

     

       5
       5
       +
           meta.maintainers = with lib.maintainers; [ cole-h ];

     

       8
       6
        
       

     

       9
       7
        
           nodes.machine =

     

       10
       8
        
             { ... }:

+1 -3

nixos/tests/doh-proxy-rust.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, pkgs, ... }: {

     

       2
       2
        
         name = "doh-proxy-rust";

     

       3
       3
       -
         meta = with lib.maintainers; {

     

       4
       4
       -
           maintainers = [ stephank ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ stephank ];

     

       6
       4
        
       

     

       7
       5
        
         nodes = {

     

       8
       6
        
           machine = { pkgs, lib, ... }: {

+1 -2

nixos/tests/esphome.nix

···

       4
       4
        
         testPort = 6052;

     

       5
       5
        
         unixSocket = "/run/esphome/esphome.sock";

     

       6
       6
        
       in

     

       7
       7
       -
       with lib;

     

       8
       7
        
       {

     

       9
       8
        
         name = "esphome";

     

       10
       10
       -
         meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];

     

       9
       9
       +
         meta.maintainers = with lib.maintainers; [ oddlama ];

     

       11
       10
        
       

     

       12
       11
        
         nodes = {

     

       13
       12
        
           esphomeTcp = { ... }:

+1 -3

nixos/tests/fluidd.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "fluidd";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ vtuan10 ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ vtuan10 ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine = { pkgs, ... }: {

     

       10
       8
        
           services.fluidd = {

+6 -10

nixos/tests/gitlab.nix

···

       11
       11
        
       

     

       12
       12
        
       { pkgs, lib, ... }:

     

       13
       13
        
       

     

       14
       14
       -
       with lib;

     

       15
       15
       -
       

     

       16
       14
        
       let

     

       17
       15
        
         inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;

     

       18
       16
        
         initialRootPassword = "notproduction";

     
···

       30
       28
        
         bobProjectId = "3";

     

       31
       29
        
       in {

     

       32
       30
        
         name = "gitlab";

     

       33
       33
       -
         meta = with pkgs.lib.maintainers; {

     

       34
       34
       -
           maintainers = [ globin yayayayaka ];

     

       35
       35
       -
         };

     

       31
       31
       +
         meta.maintainers = with lib.maintainers; [ globin yayayayaka ];

     

       36
       32
        
       

     

       37
       33
        
         nodes = {

     

       38
       34
        
           gitlab = { ... }: {

     
···

       43
       39
        
             virtualisation.useNixStoreImage = true;

     

       44
       40
        
             virtualisation.writableStore = false;

     

       45
       41
        
       

     

       46
       46
       -
             systemd.services.gitlab.serviceConfig.Restart = mkForce "no";

     

       47
       47
       -
             systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";

     

       48
       48
       -
             systemd.services.gitaly.serviceConfig.Restart = mkForce "no";

     

       49
       49
       -
             systemd.services.gitlab-sidekiq.serviceConfig.Restart = mkForce "no";

     

       42
       42
       +
             systemd.services.gitlab.serviceConfig.Restart = lib.mkForce "no";

     

       43
       43
       +
             systemd.services.gitlab-workhorse.serviceConfig.Restart = lib.mkForce "no";

     

       44
       44
       +
             systemd.services.gitaly.serviceConfig.Restart = lib.mkForce "no";

     

       45
       45
       +
             systemd.services.gitlab-sidekiq.serviceConfig.Restart = lib.mkForce "no";

     

       50
       46
        
       

     

       51
       47
        
             services.nginx = {

     

       52
       48
        
               enable = true;

     
···

       195
       191
        
               gitlab.succeed(

     

       196
       192
        
                   "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"

     

       197
       193
        
               )

     

       198
       198
       -
             '' + optionalString doSetup ''

     

       194
       194
       +
             '' + lib.optionalString doSetup ''

     

       199
       195
        
               with subtest("Create user Alice"):

     

       200
       196
        
                   gitlab.succeed(

     

       201
       197
        
                       """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserAlice} http://gitlab/api/v4/users)" = "201" ]"""

+5 -6

nixos/tests/gnome-flashback.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ...} : {

     

       2
       2
        
         name = "gnome-flashback";

     

       3
       3
       -
         meta = with lib; {

     

       4
       4
       -
           maintainers = teams.gnome.members ++ [ maintainers.chpatrick ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = lib.teams.gnome.members ++ [ lib.maintainers.chpatrick ];

     

       6
       4
        
       

     

       7
       7
       -
         nodes.machine = { nodes, ... }: let

     

       8
       8
       -
           user = nodes.machine.config.users.users.alice;

     

       9
       9
       -
         in

     

       5
       5
       +
         nodes.machine = { nodes, ... }:

     

       6
       6
       +
           let

     

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

     

       8
       8
       +
           in

     

       10
       9
        
       

     

       11
       10
        
           { imports = [ ./common/user-account.nix ];

     

       12
       11

+2 -2

nixos/tests/gnome-xorg.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ...} : {

     

       2
       2
        
         name = "gnome-xorg";

     

       3
       3
       -
         meta = with lib; {

     

       4
       4
       -
           maintainers = teams.gnome.members;

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = lib.teams.gnome.members;

     

       5
       5
        
         };

     

       6
       6
        
       

     

       7
       7
        
         nodes.machine = { nodes, ... }: let

+1 -3

nixos/tests/gnome.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ...} : {

     

       2
       2
        
         name = "gnome";

     

       3
       3
       -
         meta = with lib; {

     

       4
       4
       -
           maintainers = teams.gnome.members;

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = lib.teams.gnome.members;

     

       6
       4
        
       

     

       7
       5
        
         nodes.machine =

     

       8
       6
        
           { ... }:

+3 -4

nixos/tests/hadoop/hdfs.nix

···

       1
       1
        
       # Test a minimal HDFS cluster with no HA

     

       2
       2
        
       import ../make-test-python.nix ({ package, lib, ... }:

     

       3
       3
       -
       with lib;

     

       4
       3
        
       {

     

       5
       4
        
         name = "hadoop-hdfs";

     

       6
       5
        
       

     
···

       22
       21
        
                 };

     

       23
       22
        
                 httpfs = {

     

       24
       23
        
                   # The NixOS hadoop module only support webHDFS on 3.3 and newer

     

       25
       25
       -
                   enable = mkIf (versionAtLeast package.version "3.3") true;

     

       24
       24
       +
                   enable = lib.mkIf (lib.versionAtLeast package.version "3.3") true;

     

       26
       25
        
                   openFirewall = true;

     

       27
       26
        
                 };

     

       28
       27
        
               };

     
···

       57
       56
        
       

     

       58
       57
        
           datanode.wait_for_unit("hdfs-datanode")

     

       59
       58
        
           datanode.wait_for_unit("network.target")

     

       60
       60
       -
         '' + ( if versionAtLeast package.version "3" then ''

     

       59
       59
       +
         '' + (if lib.versionAtLeast package.version "3" then ''

     

       61
       60
        
           datanode.wait_for_open_port(9864)

     

       62
       61
        
           datanode.wait_for_open_port(9866)

     

       63
       62
        
           datanode.wait_for_open_port(9867)

     
···

       76
       75
        
           datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")

     

       77
       76
        
           assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       78
       77
        
       

     

       79
       79
       -
         '' + optionalString ( versionAtLeast package.version "3.3" ) ''

     

       78
       78
       +
         '' + lib.optionalString (lib.versionAtLeast package.version "3.3" ) ''

     

       80
       79
        
           namenode.wait_for_unit("hdfs-httpfs")

     

       81
       80
        
           namenode.wait_for_open_port(14000)

     

       82
       81
        
           assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1")

-1

nixos/tests/hardened.nix

···

       6
       6
        
       

     

       7
       7
        
         nodes.machine =

     

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

     

       9
       9
       -
           with lib;

     

       10
       9
        
           { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };

     

       11
       10
        
             users.users.sybil = { isNormalUser = true; group = "wheel"; };

     

       12
       11
        
             imports = [ ../modules/profiles/hardened.nix ];

+2 -2

nixos/tests/hibernate.nix

···

       46
       46
        
       

     

       47
       47
        
         nodes = {

     

       48
       48
        
           # System configuration used for installing the installedConfig from above.

     

       49
       49
       -
           machine = { config, lib, pkgs, ... }: with lib; {

     

       49
       49
       +
           machine = { config, lib, pkgs, ... }: {

     

       50
       50
        
             imports = [

     

       51
       51
        
               ../modules/profiles/installation-device.nix

     

       52
       52
        
               ../modules/profiles/base.nix

     

       53
       53
        
             ];

     

       54
       54
        
       

     

       55
       55
        
             nix.settings = {

     

       56
       56
       -
               substituters = mkForce [];

     

       56
       56
       +
               substituters = lib.mkForce [];

     

       57
       57
        
               hashed-mirrors = null;

     

       58
       58
        
               connect-timeout = 1;

     

       59
       59
        
             };

+1 -3

nixos/tests/iftop.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "iftop";

     

       7
       7
       -
         meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ ma27 ];

     

       8
       6
        
       

     

       9
       7
        
         nodes = {

     

       10
       8
        
           withIftop = {

+1 -3

nixos/tests/jackett.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "jackett";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ etu ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ etu ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+1 -3

nixos/tests/jirafeau.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "jirafeau";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ davidtwco ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ davidtwco ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine = { pkgs, ... }: {

     

       10
       8
        
           services.jirafeau = {

+1 -3

nixos/tests/komga.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "komga";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ govanify ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ govanify ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+1 -3

nixos/tests/libreddit.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "libreddit";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ fab ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ fab ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine = {

     

       10
       8
        
           services.libreddit.enable = true;

+1 -3

nixos/tests/lidarr.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "lidarr";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ etu ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ etu ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+1 -2

nixos/tests/miniflux.nix

···

       17
       17
        
                 '';

     

       18
       18
        
       

     

       19
       19
        
       in

     

       20
       20
       -
       with lib;

     

       21
       20
        
       {

     

       22
       21
        
         name = "miniflux";

     

       23
       23
       -
         meta.maintainers = with pkgs.lib.maintainers; [ ];

     

       22
       22
       +
         meta.maintainers = [ ];

     

       24
       23
        
       

     

       25
       24
        
         nodes = {

     

       26
       25
        
           default =

+6 -9

nixos/tests/misc.nix

···

       1
       1
        
       # Miscellaneous small tests that don't warrant their own VM run.

     

       2
       2
        
       

     

       3
       3
       -
       import ./make-test-python.nix ({ pkgs, ...} : let

     

       3
       3
       +
       import ./make-test-python.nix ({ lib, pkgs, ...} : let

     

       4
       4
        
         foo = pkgs.writeText "foo" "Hello World";

     

       5
       5
        
       in {

     

       6
       6
        
         name = "misc";

     

       7
       7
       -
         meta = with pkgs.lib.maintainers; {

     

       8
       8
       -
           maintainers = [ eelco ];

     

       9
       9
       -
         };

     

       7
       7
       +
         meta.maintainers = with lib.maintainers; [ eelco ];

     

       10
       8
        
       

     

       11
       9
        
         nodes.machine =

     

       12
       10
        
           { lib, ... }:

     

       13
       13
       -
           with lib;

     

       14
       14
       -
           { swapDevices = mkOverride 0

     

       11
       11
       +
           { swapDevices = lib.mkOverride 0

     

       15
       12
        
               [ { device = "/root/swapfile"; size = 128; } ];

     

       16
       16
       -
             environment.variables.EDITOR = mkOverride 0 "emacs";

     

       17
       17
       -
             documentation.nixos.enable = mkOverride 0 true;

     

       13
       13
       +
             environment.variables.EDITOR = lib.mkOverride 0 "emacs";

     

       14
       14
       +
             documentation.nixos.enable = lib.mkOverride 0 true;

     

       18
       15
        
             systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];

     

       19
       16
        
             virtualisation.fileSystems = { "/tmp2" =

     

       20
       17
        
               { fsType = "tmpfs";

     
···

       32
       29
        
                 options = [ "bind" "rw" "noauto" ];

     

       33
       30
        
               };

     

       34
       31
        
             };

     

       35
       35
       -
             systemd.automounts = singleton

     

       32
       32
       +
             systemd.automounts = lib.singleton

     

       36
       33
        
               { wantedBy = [ "multi-user.target" ];

     

       37
       34
        
                 where = "/tmp2";

     

       38
       35
        
               };

+1 -3

nixos/tests/mpv.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         port = toString 4321;

     

       7
       5
        
       in

     

       8
       6
        
       {

     

       9
       7
        
         name = "mpv";

     

       10
       10
       -
         meta.maintainers = with maintainers; [ zopieux ];

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ zopieux ];

     

       11
       9
        
       

     

       12
       10
        
         nodes.machine =

     

       13
       11
        
           { pkgs, ... }:

+1 -4

nixos/tests/n8n.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       2
        
       let

     

       6
       3
        
         port = 5678;

     

       7
       4
        
       in

     

       8
       5
        
       {

     

       9
       6
        
         name = "n8n";

     

       10
       10
       -
         meta.maintainers = with maintainers; [ freezeboy k900 ];

     

       7
       7
       +
         meta.maintainers = with lib.maintainers; [ freezeboy k900 ];

     

       11
       8
        
       

     

       12
       9
        
         nodes.machine =

     

       13
       10
        
           { pkgs, ... }:

-2

nixos/tests/nfs/kerberos.nix

···

       1
       1
        
       import ../make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         krb5 =

     

       7
       5
        
           { enable = true;

+1 -3

nixos/tests/noto-fonts.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
        
         name = "noto-fonts";

     

       3
       3
       -
         meta = {

     

       4
       4
       -
           maintainers = with lib.maintainers; [ nickcao midchildan ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ nickcao midchildan ];

     

       6
       4
        
       

     

       7
       5
        
         nodes.machine = {

     

       8
       6
        
           imports = [ ./common/x11.nix ];

+1 -4

nixos/tests/nzbhydra2.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
         with lib;

     

       4
       4
       -
       

     

       5
       2
        
         {

     

       6
       3
        
           name = "nzbhydra2";

     

       7
       7
       -
           meta.maintainers = with maintainers; [ jamiemagee ];

     

       4
       4
       +
           meta.maintainers = with lib.maintainers; [ jamiemagee ];

     

       8
       5
        
       

     

       9
       6
        
           nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; };

     

       10
       7

+2 -3

nixos/tests/oci-containers.nix

···

       11
       11
        
         mkOCITest = backend: makeTest {

     

       12
       12
        
           name = "oci-containers-${backend}";

     

       13
       13
        
       

     

       14
       14
       -
           meta = {

     

       15
       15
       -
             maintainers = with lib.maintainers; [ adisbladis benley mkaito ] ++ lib.teams.serokell.members;

     

       16
       16
       -
           };

     

       14
       14
       +
           meta.maintainers = lib.teams.serokell.members

     

       15
       15
       +
                              ++ (with lib.maintainers; [ adisbladis benley mkaito ]);

     

       17
       16
        
       

     

       18
       17
        
           nodes = {

     

       19
       18
        
             ${backend} = { pkgs, ... }: {

+2 -4

nixos/tests/odoo.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {

     

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ...} : {

     

       2
       2
        
         name = "odoo";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; {

     

       4
       4
       -
           maintainers = [ mkg20001 ];

     

       5
       5
       -
         };

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ mkg20001 ];

     

       6
       4
        
       

     

       7
       5
        
         nodes = {

     

       8
       6
        
           server = { ... }: {

+1 -3

nixos/tests/ombi.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "ombi";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ woky ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ woky ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+1 -3

nixos/tests/pantheon.nix

···

       3
       3
        
       {

     

       4
       4
        
         name = "pantheon";

     

       5
       5
        
       

     

       6
       6
       -
         meta = with lib; {

     

       7
       7
       -
           maintainers = teams.pantheon.members;

     

       8
       8
       -
         };

     

       6
       6
       +
         meta.maintainers = lib.teams.pantheon.members;

     

       9
       7
        
       

     

       10
       8
        
         nodes.machine = { ... }:

     

       11
       9

+4 -4

nixos/tests/please.nix

···

       6
       6
        
         nodes.machine =

     

       7
       7
        
           { ... }:

     

       8
       8
        
           {

     

       9
       9
       -
             users.users = with lib; mkMerge [

     

       10
       10
       -
               (listToAttrs (map

     

       11
       11
       -
                 (n: nameValuePair n { isNormalUser = true; })

     

       12
       12
       -
                 (genList (x: "user${toString x}") 6)))

     

       9
       9
       +
             users.users = lib.mkMerge [

     

       10
       10
       +
               (lib.listToAttrs (map

     

       11
       11
       +
                 (n: lib.nameValuePair n { isNormalUser = true; })

     

       12
       12
       +
                 (lib.genList (x: "user${toString x}") 6)))

     

       13
       13
        
               {

     

       14
       14
        
                 user0.extraGroups = [ "wheel" ];

     

       15
       15
        
               }

+1 -3

nixos/tests/polaris.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "polaris";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ pbsds ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ pbsds ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }: {

+1 -3

nixos/tests/prowlarr.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "prowlarr";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ jdreaver ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ jdreaver ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+3 -3

nixos/tests/quake3.nix

···

       11
       11
        
           };

     

       12
       12
        
       

     

       13
       13
        
         # Only allow the demo data to be used (only if it's unfreeRedistributable).

     

       14
       14
       -
         unfreePredicate = pkg: with lib; let

     

       14
       14
       +
         unfreePredicate = pkg: let

     

       15
       15
        
           allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ];

     

       16
       16
        
           allowLicenses = [ lib.licenses.unfreeRedistributable ];

     

       17
       17
       -
         in elem pkg.pname allowPackageNames &&

     

       18
       18
       -
            elem (pkg.meta.license or null) allowLicenses;

     

       17
       17
       +
         in lib.elem pkg.pname allowPackageNames &&

     

       18
       18
       +
            lib.elem (pkg.meta.license or null) allowLicenses;

     

       19
       19
        
       

     

       20
       20
        
         client =

     

       21
       21
        
           { pkgs, ... }:

+1 -3

nixos/tests/radarr.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "radarr";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ etu ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ etu ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+2 -6

nixos/tests/readarr.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       1
       1
       +
       import ./make-test-python.nix ({ lib, ... }: {

     

       6
       2
        
         name = "readarr";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ jocelynthode ];

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ jocelynthode ];

     

       8
       4
        
       

     

       9
       5
        
         nodes.machine =

     

       10
       6
        
           { pkgs, ... }:

+4 -6

nixos/tests/redis.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }:

     

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
        
       {

     

       3
       3
        
         name = "redis";

     

       4
       4
       -
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       -
           maintainers = [ flokli ];

     

       6
       6
       -
         };

     

       4
       4
       +
         meta.maintainers = with lib.maintainers; [ flokli ];

     

       7
       5
        
       

     

       8
       6
        
         nodes = {

     

       9
       7
        
           machine =

     

       10
       10
       -
             { pkgs, lib, ... }: with lib;

     

       8
       8
       +
             { pkgs, lib, ... }:

     

       11
       9
        
       

     

       12
       10
        
             {

     

       13
       11
        
               services.redis.servers."".enable = true;

     

       14
       12
        
               services.redis.servers."test".enable = true;

     

       15
       13
        
       

     

       16
       16
       -
               users.users = listToAttrs (map (suffix: nameValuePair "member${suffix}" {

     

       14
       14
       +
               users.users = lib.listToAttrs (map (suffix: lib.nameValuePair "member${suffix}" {

     

       17
       15
        
                 createHome = false;

     

       18
       16
        
                 description = "A member of the redis${suffix} group";

     

       19
       17
        
                 isNormalUser = true;

+1 -3

nixos/tests/sonarr.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "sonarr";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ etu ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ etu ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+2 -6

nixos/tests/sudo.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         password = "helloworld";

     

       5
       5
       -
       

     

       6
       5
        
       in

     

       7
       7
       -
         import ./make-test-python.nix ({ pkgs, ...} : {

     

       6
       6
       +
         import ./make-test-python.nix ({ lib, pkgs, ...} : {

     

       8
       7
        
           name = "sudo";

     

       9
       9
       -
           meta = with pkgs.lib.maintainers; {

     

       10
       10
       -
             maintainers = [ lschuermann ];

     

       11
       11
       -
           };

     

       8
       8
       +
           meta.maintainers = with lib.maintainers; [ lschuermann ];

     

       12
       9
        
       

     

       13
       10
        
           nodes.machine =

     

       14
       11
        
             { lib, ... }:

     

       15
       15
       -
             with lib;

     

       16
       12
        
             {

     

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

     

       18
       14
        
               users.users = {

+2 -2

nixos/tests/systemd-timesyncd.nix

···

       11
       11
        
         name = "systemd-timesyncd";

     

       12
       12
        
         nodes = {

     

       13
       13
        
           current = mkVM {};

     

       14
       14
       -
           pre1909 = mkVM ({lib, ... }: with lib; {

     

       14
       14
       +
           pre1909 = mkVM ({lib, ... }: {

     

       15
       15
        
             # create the path that should be migrated by our activation script when

     

       16
       16
        
             # upgrading to a newer nixos version

     

       17
       17
        
             system.stateVersion = "19.03";

     

       18
       18
       -
             system.activationScripts.simulate-old-timesync-state-dir = mkBefore ''

     

       18
       18
       +
             system.activationScripts.simulate-old-timesync-state-dir = lib.mkBefore ''

     

       19
       19
        
               rm -f /var/lib/systemd/timesync

     

       20
       20
        
               mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync

     

       21
       21
        
               ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync

+3 -5

nixos/tests/tor.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ lib, ... }: with lib;

     

       2
       2
       -
       

     

       3
       3
       -
       {

     

       1
       1
       +
       import ./make-test-python.nix ({ lib, ... }: {

     

       4
       2
        
         name = "tor";

     

       5
       5
       -
         meta.maintainers = with maintainers; [ joachifm ];

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ joachifm ];

     

       6
       4
        
       

     

       7
       5
        
         nodes.client = { pkgs, ... }: {

     

       8
       6
        
           boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];

     

       9
       7
        
           networking.firewall.enable = false;

     

       10
       8
        
           networking.useDHCP = false;

     

       11
       9
        
       

     

       12
       12
       -
           environment.systemPackages = with pkgs; [ netcat ];

     

       10
       10
       +
           environment.systemPackages = [ pkgs.netcat ];

     

       13
       11
        
           services.tor.enable = true;

     

       14
       12
        
           services.tor.client.enable = true;

     

       15
       13
        
           services.tor.settings.ControlPort = 9051;

+1 -3

nixos/tests/ulogd.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
        
         name = "ulogd";

     

       3
       3
        
       

     

       4
       4
       -
         meta = with lib; {

     

       5
       5
       -
           maintainers = with maintainers; [ p-h ];

     

       6
       6
       -
         };

     

       4
       4
       +
         meta.maintainers = with lib.maintainers; [ p-h ];

     

       7
       5
        
       

     

       8
       6
        
         nodes.machine = { ... }: {

     

       9
       7
        
           networking.firewall.enable = false;

+1 -3

nixos/tests/uptime-kuma.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "uptime-kuma";

     

       7
       7
       -
         meta.maintainers = with maintainers; [ julienmalka ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ julienmalka ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine =

     

       10
       8
        
           { pkgs, ... }:

+1 -3

nixos/tests/xautolock.nix

···

       1
       1
        
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       {

     

       6
       4
        
         name = "xautolock";

     

       7
       7
       -
         meta.maintainers = with pkgs.lib.maintainers; [ ];

     

       5
       5
       +
         meta.maintainers = [ ];

     

       8
       6
        
       

     

       9
       7
        
         nodes.machine = {

     

       10
       8
        
           imports = [ ./common/x11.nix ./common/user-account.nix ];

+2 -6

nixos/tests/xss-lock.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       6
       2
        
         name = "xss-lock";

     

       7
       7
       -
         meta.maintainers = with pkgs.lib.maintainers; [ ];

     

       3
       3
       +
         meta.maintainers = [ ];

     

       8
       4
        
       

     

       9
       5
        
         nodes = {

     

       10
       6
        
           simple = {

+2 -8

nixos/tests/yabar.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       6
       2
        
         name = "yabar";

     

       7
       7
       -
         meta = with pkgs.lib.maintainers; {

     

       8
       8
       -
           maintainers = [ ];

     

       9
       9
       -
         };

     

       3
       3
       +
         meta.maintainers = [ ];

     

       10
       4
        
       

     

       11
       5
        
         nodes.machine = {

     

       12
       6
        
           imports = [ ./common/x11.nix ./common/user-account.nix ];