commit 56ab4f61bc8f9210f76412c615beef64246e50f3 · pyrox.dev/nixpkgs

+1 -1

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

···

       27
       27
        
         networking.useDHCP = false;

     

       28
       28
        
         networking.interfaces.eth0.useDHCP = true;

     

       29
       29
        
       

     

       30
       30
       -
         # As this is intended as a stadalone image, undo some of the minimal profile stuff

     

       30
       30
       +
         # As this is intended as a standalone image, undo some of the minimal profile stuff

     

       31
       31
        
         documentation.enable = true;

     

       32
       32
        
         documentation.nixos.enable = true;

     

       33
       33
        
         environment.noXlibs = false;

-1

nixos/tests/all-tests.nix

···

       284
       284
        
         loki = handleTest ./loki.nix {};

     

       285
       285
        
         lvm2 = handleTest ./lvm2 {};

     

       286
       286
        
         lxd = handleTest ./lxd.nix {};

     

       287
       287
       -
         lxd-image = handleTest ./lxd-image.nix {};

     

       288
       287
        
         lxd-nftables = handleTest ./lxd-nftables.nix {};

     

       289
       288
        
         lxd-image-server = handleTest ./lxd-image-server.nix {};

     

       290
       289
        
         #logstash = handleTest ./logstash.nix {};

+24

nixos/tests/common/lxd/config.yaml

···

       1
       1
       +
       storage_pools:

     

       2
       2
       +
         - name: default

     

       3
       3
       +
           driver: dir

     

       4
       4
       +
           config:

     

       5
       5
       +
             source: /var/lxd-pool

     

       6
       6
       +
       

     

       7
       7
       +
       networks:

     

       8
       8
       +
         - name: lxdbr0

     

       9
       9
       +
           type: bridge

     

       10
       10
       +
           config:

     

       11
       11
       +
             ipv4.address: auto

     

       12
       12
       +
             ipv6.address: none

     

       13
       13
       +
       

     

       14
       14
       +
       profiles:

     

       15
       15
       +
         - name: default

     

       16
       16
       +
           devices:

     

       17
       17
       +
             eth0:

     

       18
       18
       +
               name: eth0

     

       19
       19
       +
               network: lxdbr0

     

       20
       20
       +
               type: nic

     

       21
       21
       +
             root:

     

       22
       22
       +
               path: /

     

       23
       23
       +
               pool: default

     

       24
       24
       +
               type: disk

+15 -48

nixos/tests/lxd-image-server.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         # Since we don't have access to the internet during the tests, we have to

     

       5
       5
       -
         # pre-fetch lxd containers beforehand.

     

       6
       6
       -
         #

     

       7
       7
       -
         # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

     

       8
       8
       -
         # generally, sufficient for our tests.

     

       9
       9
       -
         alpine-meta = pkgs.fetchurl {

     

       10
       10
       -
           url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

     

       11
       11
       -
           hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         alpine-rootfs = pkgs.fetchurl {

     

       15
       15
       -
           url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

     

       16
       16
       -
           hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

     

       4
       4
       +
         lxd-image = import ../release.nix {

     

       5
       5
       +
           configuration = {

     

       6
       6
       +
             # Building documentation makes the test unnecessarily take a longer time:

     

       7
       7
       +
             documentation.enable = lib.mkForce false;

     

       8
       8
       +
           };

     

       17
       9
        
         };

     

       18
       10
        
       

     

       19
       19
       -
         lxd-config = pkgs.writeText "config.yaml" ''

     

       20
       20
       -
           storage_pools:

     

       21
       21
       -
             - name: default

     

       22
       22
       -
               driver: dir

     

       23
       23
       -
               config:

     

       24
       24
       -
                 source: /var/lxd-pool

     

       25
       25
       -
       

     

       26
       26
       -
           networks:

     

       27
       27
       -
             - name: lxdbr0

     

       28
       28
       -
               type: bridge

     

       29
       29
       -
               config:

     

       30
       30
       -
                 ipv4.address: auto

     

       31
       31
       -
                 ipv6.address: none

     

       32
       32
       -
       

     

       33
       33
       -
           profiles:

     

       34
       34
       -
             - name: default

     

       35
       35
       -
               devices:

     

       36
       36
       -
                 eth0:

     

       37
       37
       -
                   name: eth0

     

       38
       38
       -
                   network: lxdbr0

     

       39
       39
       -
                   type: nic

     

       40
       40
       -
                 root:

     

       41
       41
       -
                   path: /

     

       42
       42
       -
                   pool: default

     

       43
       43
       -
                   type: disk

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       11
       11
       +
         lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

     

       12
       12
       +
         lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

     

       46
       13
        
       

     

       47
       14
        
       in {

     

       48
       15
        
         name = "lxd-image-server";

     

       49
       16
        
       

     

       50
       17
        
         meta = with pkgs.lib.maintainers; {

     

       51
       51
       -
           maintainers = [ mkg20001 ];

     

       18
       18
       +
           maintainers = [ mkg20001 patryk27 ];

     

       52
       19
        
         };

     

       53
       20
        
       

     

       54
       21
        
         nodes.machine = { lib, ... }: {

     
···

       100
       67
        
           # lxd expects the pool's directory to already exist

     

       101
       68
        
           machine.succeed("mkdir /var/lxd-pool")

     

       102
       69
        
       

     

       103
       103
       -
       

     

       104
       70
        
           machine.succeed(

     

       105
       105
       -
               "cat ${lxd-config} | lxd init --preseed"

     

       71
       71
       +
               "cat ${./common/lxd/config.yaml} | lxd init --preseed"

     

       106
       72
        
           )

     

       107
       73
        
       

     

       108
       74
        
           machine.succeed(

     

       109
       109
       -
               "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

     

       75
       75
       +
               "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

     

       110
       76
        
           )

     

       111
       77
        
       

     

       112
       112
       -
           loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"

     

       78
       78
       +
           loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"

     

       113
       79
        
       

     

       114
       80
        
           with subtest("push image to server"):

     

       115
       115
       -
               machine.succeed("lxc launch alpine test")

     

       116
       116
       -
               machine.succeed("lxc stop test")

     

       81
       81
       +
               machine.succeed("lxc launch nixos test")

     

       82
       82
       +
               machine.sleep(5)

     

       83
       83
       +
               machine.succeed("lxc stop -f test")

     

       117
       84
        
               machine.succeed("lxc publish --public test --alias=testimg")

     

       118
       85
        
               machine.succeed("lxc image export testimg")

     

       119
       86
        
               machine.succeed("ls >&2")

-89

nixos/tests/lxd-image.nix

···

       1
       1
       -
       # This test ensures that the nixOS lxd images builds and functions properly

     

       2
       2
       -
       # It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software

     

       3
       3
       -
       

     

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

     

       5
       5
       -
         release = import ../release.nix {

     

       6
       6
       -
           /* configuration = {

     

       7
       7
       -
             environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works

     

       8
       8
       -
           }; */

     

       9
       9
       -
         };

     

       10
       10
       -
       

     

       11
       11
       -
         metadata = release.lxdMeta.${pkgs.system};

     

       12
       12
       -
         image = release.lxdImage.${pkgs.system};

     

       13
       13
       -
       

     

       14
       14
       -
         lxd-config = pkgs.writeText "config.yaml" ''

     

       15
       15
       -
           storage_pools:

     

       16
       16
       -
             - name: default

     

       17
       17
       -
               driver: dir

     

       18
       18
       -
               config:

     

       19
       19
       -
                 source: /var/lxd-pool

     

       20
       20
       -
       

     

       21
       21
       -
           networks:

     

       22
       22
       -
             - name: lxdbr0

     

       23
       23
       -
               type: bridge

     

       24
       24
       -
               config:

     

       25
       25
       -
                 ipv4.address: auto

     

       26
       26
       -
                 ipv6.address: none

     

       27
       27
       -
       

     

       28
       28
       -
           profiles:

     

       29
       29
       -
             - name: default

     

       30
       30
       -
               devices:

     

       31
       31
       -
                 eth0:

     

       32
       32
       -
                   name: eth0

     

       33
       33
       -
                   network: lxdbr0

     

       34
       34
       -
                   type: nic

     

       35
       35
       -
                 root:

     

       36
       36
       -
                   path: /

     

       37
       37
       -
                   pool: default

     

       38
       38
       -
                   type: disk

     

       39
       39
       -
         '';

     

       40
       40
       -
       in {

     

       41
       41
       -
         name = "lxd-image";

     

       42
       42
       -
       

     

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

     

       44
       44
       -
           maintainers = [ mkg20001 ];

     

       45
       45
       -
         };

     

       46
       46
       -
       

     

       47
       47
       -
         nodes.machine = { lib, ... }: {

     

       48
       48
       -
           virtualisation = {

     

       49
       49
       -
             # disk full otherwise

     

       50
       50
       -
             diskSize = 2048;

     

       51
       51
       -
       

     

       52
       52
       -
             lxc.lxcfs.enable = true;

     

       53
       53
       -
             lxd.enable = true;

     

       54
       54
       -
           };

     

       55
       55
       -
         };

     

       56
       56
       -
       

     

       57
       57
       -
         testScript = ''

     

       58
       58
       -
           machine.wait_for_unit("sockets.target")

     

       59
       59
       -
           machine.wait_for_unit("lxd.service")

     

       60
       60
       -
           machine.wait_for_file("/var/lib/lxd/unix.socket")

     

       61
       61
       -
       

     

       62
       62
       -
           # It takes additional second for lxd to settle

     

       63
       63
       -
           machine.sleep(1)

     

       64
       64
       -
       

     

       65
       65
       -
           # lxd expects the pool's directory to already exist

     

       66
       66
       -
           machine.succeed("mkdir /var/lxd-pool")

     

       67
       67
       -
       

     

       68
       68
       -
           machine.succeed(

     

       69
       69
       -
               "cat ${lxd-config} | lxd init --preseed"

     

       70
       70
       -
           )

     

       71
       71
       -
       

     

       72
       72
       -
           # TODO: test custom built container aswell

     

       73
       73
       -
       

     

       74
       74
       -
           with subtest("importing container works"):

     

       75
       75
       -
               machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")

     

       76
       76
       -
       

     

       77
       77
       -
           with subtest("launching container works"):

     

       78
       78
       -
               machine.succeed("lxc launch nixos machine -c security.nesting=true")

     

       79
       79
       -
               # make sure machine boots up properly

     

       80
       80
       -
               machine.sleep(5)

     

       81
       81
       -
       

     

       82
       82
       -
           with subtest("container shell works"):

     

       83
       83
       -
               machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")

     

       84
       84
       -
               machine.succeed("lxc exec machine /run/current-system/sw/bin/true")

     

       85
       85
       -
       

     

       86
       86
       -
           # with subtest("rebuilding works"):

     

       87
       87
       -
           #     machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")

     

       88
       88
       -
         '';

     

       89
       89
       -
       })

+40 -94

nixos/tests/lxd.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         # Since we don't have access to the internet during the tests, we have to

     

       5
       5
       -
         # pre-fetch lxd containers beforehand.

     

       6
       6
       -
         #

     

       7
       7
       -
         # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

     

       8
       8
       -
         # generally, sufficient for our tests.

     

       9
       9
       -
         alpine-meta-x86 = pkgs.fetchurl {

     

       10
       10
       -
           url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

     

       11
       11
       -
           hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

     

       12
       12
       -
         };

     

       13
       13
       -
         alpine-meta-for = arch: pkgs.stdenv.mkDerivation {

     

       14
       14
       -
           name = "alpine-meta-${arch}";

     

       15
       15
       -
           version = "3.12";

     

       16
       16
       -
           unpackPhase = "true";

     

       17
       17
       -
           buildPhase = ''

     

       18
       18
       -
             runHook preBuild

     

       4
       4
       +
         lxd-image = import ../release.nix {

     

       5
       5
       +
           configuration = {

     

       6
       6
       +
             # Building documentation makes the test unnecessarily take a longer time:

     

       7
       7
       +
             documentation.enable = lib.mkForce false;

     

       19
       8
        
       

     

       20
       20
       -
             tar xvf ${alpine-meta-x86}

     

       21
       21
       -
             sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml

     

       22
       22
       -
       

     

       23
       23
       -
             runHook postBuild

     

       24
       24
       -
           '';

     

       25
       25
       -
           installPhase = ''

     

       26
       26
       -
             runHook preInstall

     

       27
       27
       -
       

     

       28
       28
       -
             tar czRf $out *

     

       29
       29
       -
       

     

       30
       30
       -
             runHook postInstall

     

       31
       31
       -
           '';

     

       32
       32
       -
         };

     

       33
       33
       -
       

     

       34
       34
       -
         alpine-meta = {

     

       35
       35
       -
           x86_64-linux = alpine-meta-x86;

     

       36
       36
       -
           aarch64-linux = alpine-meta-for "aarch64";

     

       37
       37
       -
         }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

     

       38
       38
       -
       

     

       39
       39
       -
         alpine-rootfs = {

     

       40
       40
       -
           x86_64-linux = pkgs.fetchurl {

     

       41
       41
       -
             url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

     

       42
       42
       -
             hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

     

       9
       9
       +
             # Our tests require `grep` & friends:

     

       10
       10
       +
             environment.systemPackages = with pkgs; [ busybox ];

     

       43
       11
        
           };

     

       44
       44
       -
           aarch64-linux = pkgs.fetchurl {

     

       45
       45
       -
             url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz";

     

       46
       46
       -
             hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us=";

     

       47
       47
       -
           };

     

       48
       48
       -
         }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

     

       49
       49
       -
       

     

       50
       50
       -
         lxd-config = pkgs.writeText "config.yaml" ''

     

       51
       51
       -
           storage_pools:

     

       52
       52
       -
             - name: default

     

       53
       53
       -
               driver: dir

     

       54
       54
       -
               config:

     

       55
       55
       -
                 source: /var/lxd-pool

     

       56
       56
       -
       

     

       57
       57
       -
           networks:

     

       58
       58
       -
             - name: lxdbr0

     

       59
       59
       -
               type: bridge

     

       60
       60
       -
               config:

     

       61
       61
       -
                 ipv4.address: auto

     

       62
       62
       -
                 ipv6.address: none

     

       63
       63
       -
       

     

       64
       64
       -
           profiles:

     

       65
       65
       -
             - name: default

     

       66
       66
       -
               devices:

     

       67
       67
       -
                 eth0:

     

       68
       68
       -
                   name: eth0

     

       69
       69
       -
                   network: lxdbr0

     

       70
       70
       -
                   type: nic

     

       71
       71
       -
                 root:

     

       72
       72
       -
                   path: /

     

       73
       73
       -
                   pool: default

     

       74
       74
       -
                   type: disk

     

       75
       75
       -
         '';

     

       12
       12
       +
         };

     

       76
       13
        
       

     

       14
       14
       +
         lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

     

       15
       15
       +
         lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

     

       77
       16
        
       

     

       78
       17
        
       in {

     

       79
       18
        
         name = "lxd";

     
···

       84
       23
        
       

     

       85
       24
        
         nodes.machine = { lib, ... }: {

     

       86
       25
        
           virtualisation = {

     

       26
       26
       +
             diskSize = 2048;

     

       27
       27
       +
       

     

       87
       28
        
             # Since we're testing `limits.cpu`, we've gotta have a known number of

     

       88
       29
        
             # cores to lean on

     

       89
       30
        
             cores = 2;

     
···

       108
       49
        
           machine.succeed("mkdir /var/lxd-pool")

     

       109
       50
        
       

     

       110
       51
        
           machine.succeed(

     

       111
       111
       -
               "cat ${lxd-config} | lxd init --preseed"

     

       52
       52
       +
               "cat ${./common/lxd/config.yaml} | lxd init --preseed"

     

       112
       53
        
           )

     

       113
       54
        
       

     

       114
       55
        
           machine.succeed(

     

       115
       115
       -
               "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

     

       56
       56
       +
               "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

     

       116
       57
        
           )

     

       117
       58
        
       

     

       118
       118
       -
           with subtest("Containers can be launched and destroyed"):

     

       119
       119
       -
               machine.succeed("lxc launch alpine test")

     

       120
       120
       -
               machine.succeed("lxc exec test true")

     

       121
       121
       -
               machine.succeed("lxc delete -f test")

     

       59
       59
       +
           with subtest("Container can be managed"):

     

       60
       60
       +
               machine.succeed("lxc launch nixos container")

     

       61
       61
       +
               machine.sleep(5)

     

       62
       62
       +
               machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

     

       63
       63
       +
               machine.succeed("lxc exec container true")

     

       64
       64
       +
               machine.succeed("lxc delete -f container")

     

       122
       65
        
       

     

       123
       123
       -
           with subtest("Containers are being mounted with lxcfs inside"):

     

       124
       124
       -
               machine.succeed("lxc launch alpine test")

     

       66
       66
       +
           with subtest("Container is mounted with lxcfs inside"):

     

       67
       67
       +
               machine.succeed("lxc launch nixos container")

     

       68
       68
       +
               machine.sleep(5)

     

       125
       69
        
       

     

       126
       70
        
               ## ---------- ##

     

       127
       71
        
               ## limits.cpu ##

     

       128
       72
        
       

     

       129
       129
       -
               machine.succeed("lxc config set test limits.cpu 1")

     

       130
       130
       -
               machine.succeed("lxc restart test")

     

       73
       73
       +
               machine.succeed("lxc config set container limits.cpu 1")

     

       74
       74
       +
               machine.succeed("lxc restart container")

     

       75
       75
       +
               machine.sleep(5)

     

       131
       76
        
       

     

       132
       132
       -
               # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort

     

       133
       133
       -
               # to the primal methods

     

       134
       77
        
               assert (

     

       135
       78
        
                   "1"

     

       136
       136
       -
                   == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

     

       79
       79
       +
                   == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

     

       137
       80
        
               )

     

       138
       81
        
       

     

       139
       139
       -
               machine.succeed("lxc config set test limits.cpu 2")

     

       140
       140
       -
               machine.succeed("lxc restart test")

     

       82
       82
       +
               machine.succeed("lxc config set container limits.cpu 2")

     

       83
       83
       +
               machine.succeed("lxc restart container")

     

       84
       84
       +
               machine.sleep(5)

     

       141
       85
        
       

     

       142
       86
        
               assert (

     

       143
       87
        
                   "2"

     

       144
       144
       -
                   == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

     

       88
       88
       +
                   == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

     

       145
       89
        
               )

     

       146
       90
        
       

     

       147
       91
        
               ## ------------- ##

     

       148
       92
        
               ## limits.memory ##

     

       149
       93
        
       

     

       150
       150
       -
               machine.succeed("lxc config set test limits.memory 64MB")

     

       151
       151
       -
               machine.succeed("lxc restart test")

     

       94
       94
       +
               machine.succeed("lxc config set container limits.memory 64MB")

     

       95
       95
       +
               machine.succeed("lxc restart container")

     

       96
       96
       +
               machine.sleep(5)

     

       152
       97
        
       

     

       153
       98
        
               assert (

     

       154
       99
        
                   "MemTotal:          62500 kB"

     

       155
       155
       -
                   == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

     

       100
       100
       +
                   == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

     

       156
       101
        
               )

     

       157
       102
        
       

     

       158
       158
       -
               machine.succeed("lxc config set test limits.memory 128MB")

     

       159
       159
       -
               machine.succeed("lxc restart test")

     

       103
       103
       +
               machine.succeed("lxc config set container limits.memory 128MB")

     

       104
       104
       +
               machine.succeed("lxc restart container")

     

       105
       105
       +
               machine.sleep(5)

     

       160
       106
        
       

     

       161
       107
        
               assert (

     

       162
       108
        
                   "MemTotal:         125000 kB"

     

       163
       163
       -
                   == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

     

       109
       109
       +
                   == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

     

       164
       110
        
               )

     

       165
       111
        
       

     

       166
       166
       -
               machine.succeed("lxc delete -f test")

     

       112
       112
       +
               machine.succeed("lxc delete -f container")

     

       167
       113
        
         '';

     

       168
       114
        
       })

pkgs/tools/admin/lxd/default.nix

···

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         passthru.tests.lxd = nixosTests.lxd;

     

       51
       51
       +
         passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

     

       51
       52
        
       

     

       52
       53
        
         nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

     

       53
       54
        
         buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

pkgs/tools/virtualization/lxd-image-server/default.nix

···

       3
       3
        
       , rsync

     

       4
       4
        
       , python3

     

       5
       5
        
       , fetchFromGitHub

     

       6
       6
       +
       , nixosTests

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       python3.pkgs.buildPythonApplication rec {

     
···

       36
       37
        
         ];

     

       37
       38
        
       

     

       38
       39
        
         doCheck = false;

     

       40
       40
       +
       

     

       41
       41
       +
         passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

     

       39
       42
        
       

     

       40
       43
        
         meta = with lib; {

     

       41
       44
        
           description = "Creates and manages a simplestreams lxd image server on top of nginx";

+1 -1

pkgs/top-level/release-lib.nix

···

       103
       103
        
         forAllSystems = genAttrs supportedSystems;

     

       104
       104
        
       

     

       105
       105
        
       

     

       106
       106
       -
         # Generate attributes for all sytems matching at least one of the given

     

       106
       106
       +
         # Generate attributes for all systems matching at least one of the given

     

       107
       107
        
         # patterns

     

       108
       108
        
         forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);

     

       109
       109