diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-27 09:18:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-27 09:18:49 +0100 |
commit | ad5127c417102ad725042a7f2cb642cd5e9d8190 (patch) | |
tree | 28b1aaf1297b8cb058085c471f8efaa1fb6a4818 /nixos | |
parent | 4101087746e906d2bbaa408a5508f5682af05acc (diff) | |
parent | 34a91dfbb984b96f2a37efde2e581479810abf5c (diff) | |
download | nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar.gz nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar.bz2 nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar.lz nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar.xz nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.tar.zst nixlib-ad5127c417102ad725042a7f2cb642cd5e9d8190.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/release.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 3f6766ad59b8..23f050367d69 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,6 +228,7 @@ in rec { tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.borgbackup = callTest tests/borgbackup.nix {}; + tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; @@ -361,6 +362,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.xrdp = callTest tests/xrdp.nix {}; tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; |