From b0d99c50c033fe7134f68c243f25b0cb993f7077 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 29 Apr 2024 14:00:27 +0300 Subject: [PATCH] Revert "dbus: Switch default implementation to broker" This reverts commit e827697fd3435b458a759ef0b92de7f26624b910. This seems to cause various issues during system activation, as reported in https://github.com/NixOS/nixpkgs/issues/302771 for example. Due to being close to branchoff, revert this for now. We'll open a tracking issue to collect and sort out remaining issues. --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 -- nixos/modules/services/system/dbus.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index d83e7c4ff71c..78295e979961 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -44,8 +44,6 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - A new option `systemd.sysusers.enable` was added. If enabled, users and groups are created with systemd-sysusers instead of with a custom perl script. -- The default dbus implementation has transitioned to dbus-broker from the classic dbus daemon for better performance and reliability. Users can revert to the classic dbus daemon by setting `services.dbus.implementation = "dbus";`. For detailed deviations, refer to [dbus-broker's deviations page](https://github.com/bus1/dbus-broker/wiki/Deviations). - - `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `hardware.nvidia-container-toolkit.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature. - `system.etc.overlay.enable` option was added. If enabled, `/etc` is diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index a9fc88e320c6..8dba0aca6433 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -39,7 +39,7 @@ in implementation = mkOption { type = types.enum [ "dbus" "broker" ]; - default = "broker"; + default = "dbus"; description = '' The implementation to use for the message bus defined by the D-Bus specification. Can be either the classic dbus daemon or dbus-broker, which aims to provide high