diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-05-07 17:47:29 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-05-11 16:24:01 +0200 |
| commit | b0e17891f2d27c2661a5b7a03d77bfec64b508e4 (patch) | |
| tree | 9a7c052543c8aed6b3020a7fb7603de7817e95ef /nixos/lib | |
| parent | 0f83261f0e2ccfa116076d1848550d1b6bccc852 (diff) | |
| download | nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar.gz nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar.bz2 nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar.lz nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar.xz nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.tar.zst nixlib-b0e17891f2d27c2661a5b7a03d77bfec64b508e4.zip | |
nixos/testing/nodes.nix: Do not rely on disabledModules
It's just not necessary.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/testing/nodes.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 0197097e8884..6e439fd814db 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -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"; }]; }; }; |