diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-10 15:55:51 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-10 15:55:51 +0200 |
| commit | d2155649af372b87f6373762356303bb450c6a07 (patch) | |
| tree | 0f9503545b88d99d6bc2aeb78ebaa8ed8418785a /nixos/tests/default.nix | |
| parent | fe7599b2b2c0f327d2a7672d081f64bbdf6ec2f3 (diff) | |
| parent | 6a7a8a144fae43fae51232703bf742c8bcee8d67 (diff) | |
| download | nixlib-d2155649af372b87f6373762356303bb450c6a07.tar nixlib-d2155649af372b87f6373762356303bb450c6a07.tar.gz nixlib-d2155649af372b87f6373762356303bb450c6a07.tar.bz2 nixlib-d2155649af372b87f6373762356303bb450c6a07.tar.lz nixlib-d2155649af372b87f6373762356303bb450c6a07.tar.xz nixlib-d2155649af372b87f6373762356303bb450c6a07.tar.zst nixlib-d2155649af372b87f6373762356303bb450c6a07.zip | |
Merge branch 'containers'
Fixes #2105.
Diffstat (limited to 'nixos/tests/default.nix')
| -rw-r--r-- | nixos/tests/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix index 0a749ad5fdee..d2eb6a999628 100644 --- a/nixos/tests/default.nix +++ b/nixos/tests/default.nix @@ -8,6 +8,7 @@ with import ../lib/testing.nix { inherit system minimal; }; { avahi = makeTest (import ./avahi.nix); bittorrent = makeTest (import ./bittorrent.nix); + containers = makeTest (import ./containers.nix); firefox = makeTest (import ./firefox.nix); firewall = makeTest (import ./firewall.nix); installer = makeTests (import ./installer.nix); |