nixos/dnsmasq: remove deprecated option "extraConfig"

NixOS · Sep 20, 2024 · c26ca03 · c26ca03
1 parent 3ceb2f3
commit c26ca03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -463,6 +463,8 @@
 
 - The `openlens` package got removed, suggested replacment `lens-desktop`
 
+- The `services.dnsmasq.extraConfig` option has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`.
+
 - The NixOS installation media no longer support the ReiserFS or JFS file systems by default.
 
 - Minimal installer ISOs are no longer built on the small channel.

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
@@ -20,20 +20,15 @@ let
     listsAsDuplicateKeys = true;
   };
 
-  # Because formats.generate is outputting a file, we use of conf-file. Once
-  # `extraConfig` is deprecated we can just use
-  # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings`
-  dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
-    conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings}
-    ${cfg.extraConfig}
-  '';
+  dnsmasqConf = settingsFormat.generate "dnsmasq.conf" cfg.settings;
 
 in
 
 {
 
   imports = [
     (lib.mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ])
+    (lib.mkRemovedOptionModule [ "services" "dnsmasq" "extraConfig" ] "This option has been replaced by `services.dnsmasq.settings`")
   ];
 
   ###### interface
@@ -104,17 +99,6 @@ in
         '';
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
-        default = "";
-        description = ''
-          Extra configuration directives that should be added to
-          `dnsmasq.conf`.
-
-          This option is deprecated, please use {option}`settings` instead.
-        '';
-      };
-
     };
 
   };
@@ -124,8 +108,6 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config";
-
     services.dnsmasq.settings = {
       dhcp-leasefile = lib.mkDefault "${stateDir}/dnsmasq.leases";
       conf-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf");

diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixos/modules/services/networking/nixops-dns.nix
@@ -68,10 +68,10 @@ in
       servers = [
         "/${cfg.domain}/127.0.0.1#5300"
       ];
-      extraConfig = ''
-        bind-interfaces
-        listen-address=127.0.0.1
-      '';
+      settings = {
+        bind-interfaces = true;
+        listen-address = "127.0.0.1";
+      };
     };
 
   };