diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 13:04:52 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 13:14:30 +0100 |
| commit | adc1b38b85857630be32452a2cfd26f39946d497 (patch) | |
| tree | 121f78854e3f9a8e2bc85065867c8b04e511ea03 /lib/modules.nix | |
| parent | f0b7b0af12be7b36add358cd1e24bbca02e57c64 (diff) | |
| download | nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.gz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.bz2 nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.lz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.xz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.zst nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.zip | |
Add a priority level for overrides in VM tests
Now that overriding fileSystems in qemu-vm.nix works again, it's important that the VM tests that add additional file systems use the same override priority. Instead of using the same magic constant everywhere, they can now use mkVMOverride. http://hydra.nixos.org/build/6695561
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 1163274e6bf..5f11a98c970 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -284,9 +284,10 @@ rec { inherit priority content; }; - mkOptionDefault = mkOverride 1001; - mkDefault = mkOverride 1000; + mkOptionDefault = mkOverride 1001; # priority of option defaults + mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default mkForce = mkOverride 50; + mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ mkFixStrictness = id; # obsolete, no-op |