From 6208b248894c070109d777652141eb1795170067 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 08:17:45 +0100 Subject: profiles/common: Move requiresTests to tests. That way we have everything regarding the vuizvui testing system in one module instead of two. Signed-off-by: aszlig --- modules/profiles/common.nix | 13 ------------- modules/profiles/tests.nix | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix index 486426e9..dbaec7ed 100644 --- a/modules/profiles/common.nix +++ b/modules/profiles/common.nix @@ -33,19 +33,6 @@ with lib; The channel name which is used to refer to vuizvui. ''; }; - - requiresTests = mkOption { - type = types.listOf (types.listOf types.str); - default = []; - example = [ ["nixos" "nat" "firewall"] ["vuizvui" "foo"] ]; - description = '' - A list of attribute paths to the tests which need to succeed in order to - trigger a channel update for the current configuration/machine. - - Every attribute path itself is a list of attribute names, which are - queried using lib.getAttrFromPath. - ''; - }; }; config = let diff --git a/modules/profiles/tests.nix b/modules/profiles/tests.nix index 8a8f448b..c1d39d40 100644 --- a/modules/profiles/tests.nix +++ b/modules/profiles/tests.nix @@ -9,6 +9,21 @@ let ]; in { + options.vuizvui = { + requiresTests = mkOption { + type = types.listOf (types.listOf types.str); + default = []; + example = [ ["nixos" "nat" "firewall"] ["vuizvui" "foo"] ]; + description = '' + A list of attribute paths to the tests which need to succeed in order to + trigger a channel update for the current configuration/machine. + + Every attribute path itself is a list of attribute names, which are + queried using lib.getAttrFromPath. + ''; + }; + }; + config = { vuizvui.requiresTests = networkTests; }; -- cgit 1.4.1