mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
nixos/testing/nodes.nix: Do not rely on disabledModules
It's just not necessary.
This commit is contained in:
parent
0f83261f0e
commit
b0e17891f2
|
@ -10,6 +10,7 @@ let
|
|||
mkIf
|
||||
mkOption mkForce
|
||||
optional
|
||||
optionalAttrs
|
||||
types
|
||||
;
|
||||
|
||||
|
@ -26,7 +27,7 @@ let
|
|||
{
|
||||
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
|
||||
|
@ -142,7 +143,6 @@ in
|
|||
defaults = mkIf config.node.pkgsReadOnly {
|
||||
nixpkgs.pkgs = config.node.pkgs;
|
||||
imports = [ ../../modules/misc/nixpkgs/read-only.nix ];
|
||||
disabledModules = [{ key = "nodes.nix-pkgs"; }];
|
||||
};
|
||||
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue