Author: eelco
Date: Mon Jul 25 00:52:59 2011
New Revision: 27933
URL: https://svn.nixos.org/websvn/nix/?rev=27933&sc=1
Log:
* Don't enable HAL by default anymore. It's obsolete. It's still
enabled by modules that need it (KDE < 4.7, Xfce).
* Don't enable the PolicyKit module by default either, it's also
obsolete (replaced by PolKit). It's still enabled if HAL is
enabled.
Modified:
nixos/trunk/modules/security/policykit.nix
nixos/trunk/modules/services/hardware/hal.nix
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/security/policykit.nix
==============================================================================
--- nixos/trunk/modules/security/policykit.nix Mon Jul 25 00:50:46 2011
(r27932)
+++ nixos/trunk/modules/security/policykit.nix Mon Jul 25 00:52:59 2011
(r27933)
@@ -19,7 +19,17 @@
{
- config = {
+ options = {
+
+ security.policykit.enable = mkOption {
+ default = false;
+ description = "Enable PolicyKit (obsolete).";
+ };
+
+ };
+
+
+ config = mkIf config.security.policykit.enable {
environment.systemPackages = [ pkgs.policykit ];
Modified: nixos/trunk/modules/services/hardware/hal.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/hal.nix Mon Jul 25 00:50:46
2011 (r27932)
+++ nixos/trunk/modules/services/hardware/hal.nix Mon Jul 25 00:52:59
2011 (r27933)
@@ -26,7 +26,7 @@
services.hal = {
enable = mkOption {
- default = true;
+ default = false;
description = ''
Whether to start the HAL daemon.
'';
@@ -52,6 +52,8 @@
services.hal.packages = [ hal pkgs.hal_info ];
+ security.policykit.enable = true;
+
users.extraUsers = singleton
{ name = "haldaemon";
uid = config.ids.uids.haldaemon;
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Jul 25
00:50:46 2011 (r27932)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Jul 25
00:52:59 2011 (r27933)
@@ -8,6 +8,8 @@
cfg = xcfg.desktopManager.kde4;
xorg = pkgs.xorg;
+ isKDE47 = !(pkgs.kde4 ? kdebase);
+
in
{
@@ -77,7 +79,7 @@
};
environment.systemPackages =
- (if pkgs.kde4 ? kdebase then
+ (if !isKDE47 then
# KDE <= 4.6
[ # temporary workarounds
pkgs.shared_desktop_ontologies
@@ -132,6 +134,11 @@
target = "X11/xkb";
};
+ # Enable required DBus services.
+ services.hal = mkIf (!isKDE47) { enable = true; };
+ services.udisks = mkIf isKDE47 { enable = true; };
+ services.upower = mkIf isKDE47 { enable = true; };
+
};
}
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Jul 25
00:50:46 2011 (r27932)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Jul 25
00:52:59 2011 (r27933)
@@ -74,6 +74,8 @@
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime" ];
+ services.hal.enable = true;
+
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
