about summary refs log tree commit diff
path: root/nixos/modules/services/system
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-11-17 16:02:34 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-11-17 16:14:33 +0100
commit65ddb0ef06abcd733bbed124ea2594b6491abd73 (patch)
tree1f10a879dd7f5ee4dc45a93a0f3e1c8a26d1ba4a /nixos/modules/services/system
parentb457130e8a21608675ddf12c7d85227b22a27112 (diff)
downloadnixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar.gz
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar.bz2
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar.lz
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar.xz
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.tar.zst
nixlib-65ddb0ef06abcd733bbed124ea2594b6491abd73.zip
nixos/dbus: Remove socketActivated option removal warning
It has been removed since 21.05:

https://github.com/NixOS/nixpkgs/commit/f292a27f442d10de4827800d064a3a8c64d05cee
Diffstat (limited to 'nixos/modules/services/system')
-rw-r--r--nixos/modules/services/system/dbus.nix20
1 files changed, 1 insertions, 19 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index c0de00bb914c..3cfdd74ea38e 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, options, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -65,30 +65,12 @@ in
         '';
         default = "disabled";
       };
-
-      socketActivated = mkOption {
-        type = types.nullOr types.bool;
-        default = null;
-        visible = false;
-        description = lib.mdDoc ''
-          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 ];
 
     environment.etc."dbus-1".source = configDir;