commit 5f1345a30318cf9559e58576dff8c5d3e4d77a62 · pyrox.dev/nixpkgs

+3 -5

nixos/tests/containers-bridge.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         hostIp = "192.168.0.1";

     

       5
       3
        
         containerIp = "192.168.0.100/24";

     
···

       7
       5
        
         containerIp6 = "fc00::2/7";

     

       8
       6
        
       in

     

       9
       7
        
       

     

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

     

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

     

       11
       9
        
         name = "containers-bridge";

     

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

     

       13
       13
       -
           maintainers = [ aristid aszlig eelco kampfschlaefer ];

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         machine =

+3 -3

nixos/tests/containers-custom-pkgs.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
         customPkgs = pkgs.appendOverlays [ (self: super: {

     

       4
       4
        
           hello = super.hello.overrideAttrs (old: {

     
···

       8
       8
        
       

     

       9
       9
        
       in {

     

       10
       10
        
         name = "containers-custom-pkgs";

     

       11
       11
       -
         meta = with lib.maintainers; {

     

       12
       12
       -
           maintainers = [ adisbladis earvstedt ];

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           maintainers = with lib.maintainers; [ adisbladis earvstedt ];

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         machine = { config, ... }: {

+4 -3

nixos/tests/containers-ephemeral.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

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

     

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

     

       4
       2
        
         name = "containers-ephemeral";

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ patryk27 ];

     

       5
       5
       +
         };

     

       5
       6
        
       

     

       6
       7
        
         machine = { pkgs, ... }: {

     

       7
       8
        
           virtualisation.memorySize = 768;

+3 -5

nixos/tests/containers-extra_veth.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

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

     

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

     

       4
       2
        
         name = "containers-extra_veth";

     

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

     

       6
       6
       -
           maintainers = [ kampfschlaefer ];

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ kampfschlaefer ];

     

       7
       5
        
         };

     

       8
       6
        
       

     

       9
       7
        
         machine =

+3 -5

nixos/tests/containers-hosts.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

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

     

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

     

       4
       2
        
         name = "containers-hosts";

     

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

     

       6
       6
       -
           maintainers = [ montag451 ];

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ montag451 ];

     

       7
       5
        
         };

     

       8
       6
        
       

     

       9
       7
        
         machine =

+3 -5

nixos/tests/containers-imperative.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

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

     

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

     

       4
       2
        
         name = "containers-imperative";

     

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

     

       6
       6
       -
           maintainers = [ aristid aszlig eelco kampfschlaefer ];

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];

     

       7
       5
        
         };

     

       8
       6
        
       

     

       9
       7
        
         machine =

+3 -5

nixos/tests/containers-ip.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         webserverFor = hostAddress: localAddress: {

     

       5
       3
        
           inherit hostAddress localAddress;

     
···

       13
       11
        
           };

     

       14
       12
        
         };

     

       15
       13
        
       

     

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

     

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

     

       17
       15
        
         name = "containers-ipv4-ipv6";

     

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

     

       19
       19
       -
           maintainers = [ aristid aszlig eelco kampfschlaefer ];

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];

     

       20
       18
        
         };

     

       21
       19
        
       

     

       22
       20
        
         machine =

+3 -5

nixos/tests/containers-macvlans.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         # containers IP on VLAN 1

     

       5
       3
        
         containerIp1 = "192.168.1.253";

     

       6
       4
        
         containerIp2 = "192.168.1.254";

     

       7
       5
        
       in

     

       8
       6
        
       

     

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

     

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

     

       10
       8
        
         name = "containers-macvlans";

     

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

     

       12
       12
       -
           maintainers = [ montag451 ];

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           maintainers = with lib.maintainers; [ montag451 ];

     

       13
       11
        
         };

     

       14
       12
        
       

     

       15
       13
        
         nodes = {

+3 -4

nixos/tests/containers-physical_interfaces.nix

···

       1
       1
       -
       

     

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

     

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

     

       3
       2
        
         name = "containers-physical_interfaces";

     

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

     

       5
       5
       -
           maintainers = [ kampfschlaefer ];

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ kampfschlaefer ];

     

       6
       5
        
         };

     

       7
       6
        
       

     

       8
       7
        
         nodes = {

+3 -5

nixos/tests/containers-portforward.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         hostIp = "192.168.0.1";

     

       5
       3
        
         hostPort = 10080;

     
···

       7
       5
        
         containerPort = 80;

     

       8
       6
        
       in

     

       9
       7
        
       

     

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

     

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

     

       11
       9
        
         name = "containers-portforward";

     

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

     

       13
       13
       -
           maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ];

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         machine =

+3 -4

nixos/tests/containers-reloadable.nix

···

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

     

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

     

       2
       2
        
       let

     

       3
       3
        
         client_base = {

     

       4
       4
       -
       

     

       5
       4
        
           containers.test1 = {

     

       6
       5
        
             autoStart = true;

     

       7
       6
        
             config = {

     
···

       16
       15
        
         };

     

       17
       16
        
       in {

     

       18
       17
        
         name = "containers-reloadable";

     

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

     

       20
       20
       -
           maintainers = [ danbst ];

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           maintainers = with lib.maintainers; [ danbst ];

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       22
        
         nodes = {

+3 -5

nixos/tests/containers-restart_networking.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         client_base = {

     

       5
       3
        
           networking.firewall.enable = false;

     
···

       16
       14
        
             };

     

       17
       15
        
           };

     

       18
       16
        
         };

     

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

     

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

     

       20
       18
        
       {

     

       21
       19
        
         name = "containers-restart_networking";

     

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

     

       23
       23
       -
           maintainers = [ kampfschlaefer ];

     

       20
       20
       +
         meta = {

     

       21
       21
       +
           maintainers = with lib.maintainers; [ kampfschlaefer ];

     

       24
       22
        
         };

     

       25
       23
        
       

     

       26
       24
        
         nodes = {

+3 -5

nixos/tests/containers-tmpfs.nix

···

       1
       1
       -
       # Test for NixOS' container support.

     

       2
       2
       -
       

     

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

     

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

     

       4
       2
        
         name = "containers-tmpfs";

     

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

     

       6
       6
       -
           maintainers = [ ];

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ patryk27 ];

     

       7
       5
        
         };

     

       8
       6
        
       

     

       9
       7
        
         machine =