nixos/testing/nodes.nix: Do not rely on disabledModules

It's just not necessary.

Changed files
+2 -2
nixos
lib
testing
+2 -2
nixos/lib/testing/nodes.nix
···
mkIf
mkOption mkForce
optional
types
;
···
{
virtualisation.qemu.package = testModuleArgs.config.qemu.package;
})
-
({
key = "nodes.nix-pkgs";
config = {
# Ensure we do not use aliases. Ideally this is only set
···
defaults = mkIf config.node.pkgsReadOnly {
nixpkgs.pkgs = config.node.pkgs;
imports = [ ../../modules/misc/nixpkgs/read-only.nix ];
-
disabledModules = [{ key = "nodes.nix-pkgs"; }];
};
};
···
mkIf
mkOption mkForce
optional
+
optionalAttrs
types
;
···
{
virtualisation.qemu.package = testModuleArgs.config.qemu.package;
})
+
(optionalAttrs (!config.node.pkgsReadOnly) {
key = "nodes.nix-pkgs";
config = {
# Ensure we do not use aliases. Ideally this is only set
···
defaults = mkIf config.node.pkgsReadOnly {
nixpkgs.pkgs = config.node.pkgs;
imports = [ ../../modules/misc/nixpkgs/read-only.nix ];
};
};