diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-10-27 16:08:17 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-16 20:31:24 -0400 |
| commit | ec6224b6cd147943eee685ef671811b3683cb2ce (patch) | |
| tree | 9e62d29d5d3b2cf7fcec1b15357ee4044510c737 | |
| parent | 3d832dee59ed0338db4afb83b4c481a062163771 (diff) | |
| download | nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar.gz nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar.bz2 nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar.lz nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar.xz nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.tar.zst nixpkgs-ec6224b6cd147943eee685ef671811b3683cb2ce.zip | |
Revert "installer: Disable udisks"
This reverts commit 571fb74f449aa173e231166515b41feb778524b8. The dependency on gtk2 was removed. Co-authored-by: Florian Klink <flokli@flokli.de>
| -rw-r--r-- | nixos/modules/profiles/installation-device.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/os-prober.nix | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index fd30220ce1c..4596e163404 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -31,9 +31,6 @@ with lib; # Let the user play Rogue on TTY 8 during the installation. #services.rogue.enable = true; - # Disable some other stuff we don't need. - services.udisks2.enable = mkDefault false; - # Use less privileged nixos user users.users.nixos = { isNormalUser = true; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a136678c6ef..eb1f4f192dd 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 9cd9f4ecd15..5407a62339f 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> ]; |