alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/tests/os-prober.nix: apply review suggestions

Browse source
This commit is contained in:
Symphorien Gibol 2019-06-09 21:16:53 +02:00
parent 04c9866b6e
commit 9a69fab1e3
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/tests/os-prober.nix
View file

@ -51,11 +51,10 @@ let
options = [ "ro" ]; options = [ "ro" ];
}; };
nix.binaryCaches = lib.mkForce [ ]; nix.binaryCaches = lib.mkForce [ ];
nix.extraOptions = nix.extraOptions = ''
''
hashed-mirrors = hashed-mirrors =
connect-timeout = 1 connect-timeout = 1
''; '';
services.udisks2.enable = lib.mkForce false; services.udisks2.enable = lib.mkForce false;
}; };
# /etc/nixos/configuration.nix for the vm # /etc/nixos/configuration.nix for the vm
@ -66,16 +65,15 @@ let
<nixpkgs/nixos/modules/testing/test-instrumentation.nix> <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
]; ];
} // (builtins.fromJSON (builtins.readFile ${ } // (builtins.fromJSON (builtins.readFile ${
pkgs.writeText "simpleConfig.json" pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
(builtins.toJSON simpleConfig)
}))) })))
''; '';
in { in {
name = "os-prober"; name = "os-prober";
machine = { config, pkgs, ... }: (simpleConfig // { machine = { config, pkgs, ... }: (simpleConfig // {
imports = [ ../modules/profiles/installation-device.nix imports = [ ../modules/profiles/installation-device.nix
../modules/profiles/base.nix ]; ../modules/profiles/base.nix ];
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
# The test cannot access the network, so any packages # The test cannot access the network, so any packages
# nixos-rebuild needs must be included in the VM. # nixos-rebuild needs must be included in the VM.