gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
It's just not necessary.
This commit is contained in:
Robert Hensing
2023-05-07 17:47:29 +02:00
parent 0f83261f0e
commit b0e17891f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/lib/testing/nodes.nix
View File

@@ -10,6 +10,7 @@ let
mkIf mkIf
mkOption mkForce mkOption mkForce
optional optional
optionalAttrs
types types
; ;
@@ -26,7 +27,7 @@ let
{ {
virtualisation.qemu.package = testModuleArgs.config.qemu.package; virtualisation.qemu.package = testModuleArgs.config.qemu.package;
}) })
({ (optionalAttrs (!config.node.pkgsReadOnly) {
key = "nodes.nix-pkgs"; key = "nodes.nix-pkgs";
config = { config = {
# Ensure we do not use aliases. Ideally this is only set # Ensure we do not use aliases. Ideally this is only set
@@ -142,7 +143,6 @@ in
defaults = mkIf config.node.pkgsReadOnly { defaults = mkIf config.node.pkgsReadOnly {
nixpkgs.pkgs = config.node.pkgs; nixpkgs.pkgs = config.node.pkgs;
imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; imports = [ ../../modules/misc/nixpkgs/read-only.nix ];
disabledModules = [{ key = "nodes.nix-pkgs"; }];
}; };
}; };