From 9a69fab1e315f05975a2cc0c573f1ee55258cde4 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 9 Jun 2019 21:16:53 +0200 Subject: [PATCH] nixos/tests/os-prober.nix: apply review suggestions --- nixos/tests/os-prober.nix | 12 +++++------- 1 file 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 ]; } // (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.