diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-06-09 21:16:53 +0200 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-06-09 21:16:53 +0200 |
| commit | 9a69fab1e315f05975a2cc0c573f1ee55258cde4 (patch) | |
| tree | 2423706f1bbd52416a5b1ebb98278ea1211c360b /nixos/tests/os-prober.nix | |
| parent | 04c9866b6e29428ca3710523e04b420a72eea192 (diff) | |
| download | nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar.gz nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar.bz2 nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar.lz nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar.xz nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.tar.zst nixpkgs-9a69fab1e315f05975a2cc0c573f1ee55258cde4.zip | |
nixos/tests/os-prober.nix: apply review suggestions
Diffstat (limited to 'nixos/tests/os-prober.nix')
| -rw-r--r-- | nixos/tests/os-prober.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 2cfb3f5f690..eb62dd76312 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -51,11 +51,10 @@ let options = [ "ro" ]; }; nix.binaryCaches = lib.mkForce [ ]; - nix.extraOptions = - '' + nix.extraOptions = '' hashed-mirrors = connect-timeout = 1 - ''; + ''; services.udisks2.enable = lib.mkForce false; }; # /etc/nixos/configuration.nix for the vm @@ -66,16 +65,15 @@ let <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; } // (builtins.fromJSON (builtins.readFile ${ - pkgs.writeText "simpleConfig.json" - (builtins.toJSON simpleConfig) + pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig) }))) ''; in { name = "os-prober"; machine = { config, pkgs, ... }: (simpleConfig // { - imports = [ ../modules/profiles/installation-device.nix - ../modules/profiles/base.nix ]; + imports = [ ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix ]; virtualisation.memorySize = 1024; # The test cannot access the network, so any packages # nixos-rebuild needs must be included in the VM. |