rename daemonConfig -> daemon.settings

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

@@ -114,7 +114,7 @@
           If you previously used
           <literal>/etc/docker/daemon.json</literal>, you need to
           incorporate the changes into the new option
-          <literal>virtualisation.docker.daemonConfig</literal>.
+          <literal>virtualisation.docker.daemon.settings</literal>.
         </para>
       </listitem>
     </itemizedlist>

nixos/doc/manual/release-notes/rl-2205.section.md

@@ -41,7 +41,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 - The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
   Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
 
-- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemonConfig`.
+- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
 
 ## Other Notable Changes {#sec-release-22.05-notable-changes}
 

nixos/modules/virtualisation/docker.nix

@@ -8,8 +8,8 @@ let
 
   cfg = config.virtualisation.docker;
   proxy_env = config.networking.proxy.envVars;
-  daemonConfigJson = builtins.toJSON cfg.daemonConfig;
-  daemonConfigFile = pkgs.writeText "daemon.json" daemonConfigJson;
+  daemonSettingsJson = builtins.toJSON cfg.daemon.settings;
+  daemonSettingsFile = pkgs.writeText "daemon.json" daemonSettingsJson;
 in
 
 {
@@ -53,7 +53,7 @@ in
           '';
       };
 
-    daemonConfig =
+    daemon.settings =
       mkOption {
         type = types.anything;
         default = { };
@@ -188,7 +188,7 @@ in
               ${cfg.package}/bin/dockerd \
                 --group=docker \
                 --host=fd:// \
-                --config-file=${daemonConfigFile} \
+                --config-file=${daemonSettingsFile} \
                 --log-driver=${cfg.logDriver} \
                 ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
                 ${optionalString cfg.liveRestore "--live-restore" } \