From c0a8a9205b590828c2a174f751c80908e632f734 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 9 Mar 2017 17:55:45 +0100 Subject: [PATCH] nixos/dnscrypt-proxy: inline option renamings In an effort to make the module more self-contained. --- nixos/modules/rename.nix | 3 --- nixos/modules/services/networking/dnscrypt-proxy.nix | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0b609287f63..af8b34b5e5c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -103,9 +103,6 @@ with lib; (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]) - # DNSCrypt-proxy - (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]) - (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ]) # Enlightenment diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 8520cc5e9eb..d65296f422e 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -307,4 +307,8 @@ in }; }) ]); + + imports = [ + (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]) + ]; }