diff options
Diffstat (limited to 'modules/profiles')
-rw-r--r-- | modules/profiles/common.nix | 14 | ||||
-rw-r--r-- | modules/profiles/tests.nix | 4 |
2 files changed, 9 insertions, 9 deletions
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 <function>lib.getAttrFromPath</function>. ''; }; }; @@ -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; - }; }; } diff --git a/modules/profiles/tests.nix b/modules/profiles/tests.nix index 66ea76e5..811d6cf8 100644 --- a/modules/profiles/tests.nix +++ b/modules/profiles/tests.nix @@ -1,10 +1,10 @@ -{ config, lib, tests, ... }: +{ config, lib, ... }: with lib; let which = if config.networking.useNetworkd then "networkd" else "scripted"; - networkTests = map (attr: getAttr attr tests.nixos.networking.${which}) [ + networkTests = map (name: ["nixos" "networking" which]) [ "static" "dhcpSimple" "dhcpOneIf" "bond" "bridge" "macvlan" "sit" "vlan" ]; |