diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-10-27 16:08:17 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-16 19:56:50 -0400 |
| commit | b04b354e2cee6248ba9871841e3d29d6f123ae56 (patch) | |
| tree | 8da0e2a445db9d310dbbd72f944171a40d18fed5 /nixos/tests | |
| parent | b5bea4ce32a26deb3b6d600893e37a4c347c66ab (diff) | |
| download | nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar.gz nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar.bz2 nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar.lz nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar.xz nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.tar.zst nixlib-b04b354e2cee6248ba9871841e3d29d6f123ae56.zip | |
Revert "installer: Disable udisks"
This reverts commit 571fb74f449aa173e231166515b41feb778524b8. The dependency on gtk2 was removed. Co-authored-by: Florian Klink <flokli@flokli.de>
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/installer.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/os-prober.nix | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a136678c6eff..eb1f4f192dd1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -54,8 +54,6 @@ let hardware.enableAllFirmware = lib.mkForce false; - services.udisks2.enable = lib.mkDefault false; - ${replaceChars ["\n"] ["\n "] extraConfig} } ''; @@ -295,8 +293,6 @@ let ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; - services.udisks2.enable = mkDefault false; - nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 9cd9f4ecd150..5407a62339fe 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -51,12 +51,11 @@ let hashed-mirrors = connect-timeout = 1 ''; - services.udisks2.enable = lib.mkForce false; }; # /etc/nixos/configuration.nix for the vm configFile = pkgs.writeText "configuration.nix" '' {config, pkgs, ...}: ({ - imports = + imports = [ ./hardware-configuration.nix <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; |