diff options
author | Gabriel Ebner <gebner@gebner.org> | 2020-10-25 09:16:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-25 09:16:28 +0100 |
commit | a8a018ddc0a8b5c3d4fa94c94b672c37356bc075 (patch) | |
tree | c60999f4a725d12a1c60abf9853e09651ccce99d /nixos/modules | |
parent | 0fc4bba48e1e02fd91169461adb72b72cd455012 (diff) | |
parent | e0fa72d04d75f7d7e5a0b3d45a69825f209589f9 (diff) |
Merge pull request #101409 from rycee/dbus-warning
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/system/dbus.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index d9dd26f0f189..f8d909a4a3cc 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -1,6 +1,6 @@ # D-Bus configuration and system bus daemon. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -18,13 +18,6 @@ let in { - - imports = [ - (mkRemovedOptionModule - [ "services" "dbus" "socketActivated" ] - "The user D-Bus session is now always socket activated and this option can safely be removed.") - ]; - ###### interface options = { @@ -57,12 +50,29 @@ in <filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename> ''; }; + + socketActivated = mkOption { + type = types.nullOr types.bool; + default = null; + visible = false; + description = '' + Removed option, do not use. + ''; + }; }; }; ###### implementation config = mkIf cfg.enable { + warnings = optional (cfg.socketActivated != null) ( + let + files = showFiles options.services.dbus.socketActivated.files; + in + "The option 'services.dbus.socketActivated' in ${files} no longer has" + + " any effect and can be safely removed: the user D-Bus session is" + + " now always socket activated." + ); environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; |