commit e58c57a86843ae8b9df88eeef20426899821f121 · pyrox.dev/nixpkgs

+2 -1

nixos/tests/all-tests.nix

···

       424
       424
        
         icingaweb2 = handleTest ./icingaweb2.nix {};

     

       425
       425
        
         iftop = handleTest ./iftop.nix {};

     

       426
       426
        
         incron = handleTest ./incron.nix {};

     

       427
       427
       -
         incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; });

     

       427
       427
       +
         incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; inherit (pkgs) incus; });

     

       428
       428
       +
         incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; });

     

       428
       429
        
         influxdb = handleTest ./influxdb.nix {};

     

       429
       430
        
         influxdb2 = handleTest ./influxdb2.nix {};

     

       430
       431
        
         initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {};

+5 -2

nixos/tests/incus/container.nix

···

       1
       1
       -
       import ../make-test-python.nix ({ pkgs, lib, extra ? {}, name ? "incus-container", ... } :

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, lib, extra ? {}, name ? "incus-container", incus ? pkgs.incus-lts, ... } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         releases = import ../../release.nix {

     
···

       28
       28
        
             memorySize = 1024;

     

       29
       29
        
             diskSize = 4096;

     

       30
       30
        
       

     

       31
       31
       -
             incus.enable = true;

     

       31
       31
       +
             incus = {

     

       32
       32
       +
               enable = true;

     

       33
       33
       +
               package = incus;

     

       34
       34
       +
             };

     

       32
       35
        
           };

     

       33
       36
        
           networking.nftables.enable = true;

     

       34
       37
        
         };

+12 -9

nixos/tests/incus/default.nix

···

       3
       3
        
         config ? { },

     

       4
       4
        
         pkgs ? import ../../.. { inherit system config; },

     

       5
       5
        
         handleTestOn,

     

       6
       6
       +
         incus ? pkgs.incus-lts,

     

       6
       7
        
       }:

     

       7
       8
        
       {

     

       8
       9
        
         container-legacy-init = import ./container.nix {

     

       9
       10
        
           name = "container-legacy-init";

     

       10
       10
       -
           inherit system pkgs;

     

       11
       11
       +
           inherit incus system pkgs;

     

       11
       12
        
         };

     

       12
       13
        
         container-systemd-init = import ./container.nix {

     

       13
       14
        
           name = "container-systemd-init";

     

       14
       14
       -
           inherit system pkgs;

     

       15
       15
       +
           inherit incus system pkgs;

     

       15
       16
        
           extra = {

     

       16
       17
        
             boot.initrd.systemd.enable = true;

     

       17
       18
        
           };

     

       18
       19
        
         };

     

       19
       19
       -
         incusd-options = import ./incusd-options.nix { inherit system pkgs; };

     

       20
       20
       -
         lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; };

     

       21
       21
       -
         openvswitch = import ./openvswitch.nix { inherit system pkgs; };

     

       22
       22
       -
         socket-activated = import ./socket-activated.nix { inherit system pkgs; };

     

       23
       23
       -
         storage = import ./storage.nix { inherit system pkgs; };

     

       24
       24
       -
         ui = import ./ui.nix { inherit system pkgs; };

     

       25
       25
       -
         virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { inherit system pkgs; };

     

       20
       20
       +
         incusd-options = import ./incusd-options.nix { inherit incus system pkgs; };

     

       21
       21
       +
         lxd-to-incus = import ./lxd-to-incus.nix { inherit incus system pkgs; };

     

       22
       22
       +
         openvswitch = import ./openvswitch.nix { inherit incus system pkgs; };

     

       23
       23
       +
         socket-activated = import ./socket-activated.nix { inherit incus system pkgs; };

     

       24
       24
       +
         storage = import ./storage.nix { inherit incus system pkgs; };

     

       25
       25
       +
         ui = import ./ui.nix { inherit incus system pkgs; };

     

       26
       26
       +
         virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix {

     

       27
       27
       +
           inherit incus system pkgs;

     

       28
       28
       +
         };

     

       26
       29
        
       }

+7 -1

nixos/tests/incus/incusd-options.nix

···

       1
       1
        
       # this is a set of tests for non-default options. typically the default options

     

       2
       2
        
       # will be handled by the other tests

     

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

     

       4
       4
       -
         { pkgs, lib, ... }:

     

       4
       4
       +
         {

     

       5
       5
       +
           pkgs,

     

       6
       6
       +
           lib,

     

       7
       7
       +
           incus ? pkgs.incus-lts,

     

       8
       8
       +
           ...

     

       9
       9
       +
         }:

     

       5
       10
        
       

     

       6
       11
        
         let

     

       7
       12
        
           releases = import ../../release.nix {

     
···

       29
       34
        
       

     

       30
       35
        
               incus = {

     

       31
       36
        
                 enable = true;

     

       37
       37
       +
                 package = incus;

     

       32
       38
        
                 softDaemonRestart = false;

     

       33
       39
        
       

     

       34
       40
        
                 preseed = {

+10 -2

nixos/tests/incus/lxd-to-incus.nix

···

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

     

       2
       2
        
       

     

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

     

       3
       3
       +
         {

     

       4
       4
       +
           pkgs,

     

       5
       5
       +
           lib,

     

       6
       6
       +
           incus ? pkgs.incus-lts,

     

       7
       7
       +
           ...

     

       8
       8
       +
         }:

     

       4
       9
        
       

     

       5
       10
        
         let

     

       6
       11
        
           releases = import ../../release.nix { configuration.documentation.enable = lib.mkForce false; };

     
···

       65
       70
        
                   ];

     

       66
       71
        
                 };

     

       67
       72
        
       

     

       68
       68
       -
                 incus.enable = true;

     

       73
       73
       +
                 incus = {

     

       74
       74
       +
                   enable = true;

     

       75
       75
       +
                   package = incus;

     

       76
       76
       +
                 };

     

       69
       77
        
               };

     

       70
       78
        
               networking.nftables.enable = true;

     

       71
       79
        
             };

+6 -2

nixos/tests/incus/openvswitch.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         name = "incus-openvswitch";

     
···

       9
       9
        
       

     

       10
       10
        
         nodes.machine = { lib, ... }: {

     

       11
       11
        
           virtualisation = {

     

       12
       12
       -
             incus.enable = true;

     

       12
       12
       +
             incus = {

     

       13
       13
       +
               enable = true;

     

       14
       14
       +
               package = incus;

     

       15
       15
       +
             };

     

       16
       16
       +
       

     

       13
       17
        
             vswitch.enable = true;

     

       14
       18
        
             incus.preseed = {

     

       15
       19
        
               networks = [

+6 -3

nixos/tests/incus/socket-activated.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         name = "incus-socket-activated";

     
···

       9
       9
        
       

     

       10
       10
        
         nodes.machine = { lib, ... }: {

     

       11
       11
        
           virtualisation = {

     

       12
       12
       -
             incus.enable = true;

     

       13
       13
       -
             incus.socketActivation = true;

     

       12
       12
       +
             incus = {

     

       13
       13
       +
               enable = true;

     

       14
       14
       +
               package = incus;

     

       15
       15
       +
               socketActivation = true;

     

       16
       16
       +
             };

     

       14
       17
        
           };

     

       15
       18
        
           networking.nftables.enable = true;

     

       16
       19
        
         };

+10 -2

nixos/tests/incus/storage.nix

···

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

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       2
       2
       +
         {

     

       3
       3
       +
           pkgs,

     

       4
       4
       +
           lib,

     

       5
       5
       +
           incus ? pkgs.incus-lts,

     

       6
       6
       +
           ...

     

       7
       7
       +
         }:

     

       3
       8
        
       

     

       4
       9
        
         {

     

       5
       10
        
           name = "incus-storage";

     
···

       19
       24
        
       

     

       20
       25
        
               virtualisation = {

     

       21
       26
        
                 emptyDiskImages = [ 2048 ];

     

       22
       22
       -
                 incus.enable = true;

     

       27
       27
       +
                 incus = {

     

       28
       28
       +
                   enable = true;

     

       29
       29
       +
                   package = incus;

     

       30
       30
       +
                 };

     

       23
       31
        
               };

     

       24
       32
        
             };

     

       25
       33

+5 -2

nixos/tests/incus/ui.nix

···

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

     

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

     

       2
       2
        
         name = "incus-ui";

     

       3
       3
        
       

     

       4
       4
        
         meta = {

     
···

       7
       7
        
       

     

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

     

       9
       9
        
           virtualisation = {

     

       10
       10
       -
             incus.enable = true;

     

       10
       10
       +
             incus = {

     

       11
       11
       +
               enable = true;

     

       12
       12
       +
               package = incus;

     

       13
       13
       +
             };

     

       11
       14
        
             incus.ui.enable = true;

     

       12
       15
        
           };

     

       13
       16
        
           networking.nftables.enable = true;

+5 -2

nixos/tests/incus/virtual-machine.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         releases = import ../../release.nix {

     
···

       33
       33
        
             # Provide a TPM to test vTPM support for guests

     

       34
       34
        
             tpm.enable = true;

     

       35
       35
        
       

     

       36
       36
       -
             incus.enable = true;

     

       36
       36
       +
             incus = {

     

       37
       37
       +
               enable = true;

     

       38
       38
       +
               package = incus;

     

       39
       39
       +
             };

     

       37
       40
        
           };

     

       38
       41
        
           networking.nftables.enable = true;

     

       39
       42
        
         };

+1 -1

pkgs/by-name/in/incus/generic.nix

···

       115
       115
        
               ;

     

       116
       116
        
           };

     

       117
       117
        
       

     

       118
       118
       -
           tests = nixosTests.incus;

     

       118
       118
       +
           tests = if lts then nixosTests.incus-lts else nixosTests.incus;

     

       119
       119
        
       

     

       120
       120
        
           ui = callPackage ./ui.nix { };

     

       121
       121