summary refs log tree commit diff
path: root/nixos/modules/services/networking/networkmanager.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
committerSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
commit4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch)
tree79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/services/networking/networkmanager.nix
parentcd9ace689274fedd7e95dabdc99041d4c799c3dc (diff)
downloadnixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 90d1032c41b..53029b59067 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -336,6 +336,7 @@ in {
   };
 
   imports = [
+    (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
     (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''
       This option was removed because allowing (multiple) regular users to
       override host entries affecting the whole system opens up a huge attack