From aa6741135cb7e78ab038eee798067f2df32bb6d9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 07:34:35 +0100 Subject: modules: Make requiresTests a list of paths. Unfortunately, we went into trouble and the Hydra machine not only consumed lots of ram during evaluation but it also triggered a bunch of evaluation errors because the available tests were strictly evaluated. Using attribute paths consisting of plain strings doesn't have the same problem, even though they look a bit uglier. Signed-off-by: aszlig --- modules/profiles/common.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/profiles/common.nix') diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix index 58d6c27b..486426e9 100644 --- a/modules/profiles/common.nix +++ b/modules/profiles/common.nix @@ -35,11 +35,15 @@ with lib; }; requiresTests = mkOption { - type = types.listOf types.package; + type = types.listOf (types.listOf types.str); default = []; + example = [ ["nixos" "nat" "firewall"] ["vuizvui" "foo"] ]; description = '' - A list of derivations which have to succeed in order to trigger a - channel update for the current configuration/machine. + 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. ''; }; }; @@ -93,9 +97,5 @@ with lib; rootChannelsPath ] ++ optional config.vuizvui.enableGlobalNixpkgsConfig nixpkgsConfig; in mkIf config.vuizvui.modifyNixPath (mkOverride 90 nixPath); - - _module.args.tests = import ../../lib/get-tests.nix { - inherit nixpkgs system; - }; }; } -- cgit 1.4.1