diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-10-31 19:40:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 19:40:50 +0000 |
| commit | 303390600b7efb49b8f9e610308961398506acd7 (patch) | |
| tree | ce359f2ee5532c2d93db2950531fcef41740ed95 /nixos | |
| parent | f475aee5986dd6b76c171bf9f93540e547d52d13 (diff) | |
| parent | 1b4e3103bf5c2f298e72ea19a541c513071c123b (diff) | |
| download | nixlib-303390600b7efb49b8f9e610308961398506acd7.tar nixlib-303390600b7efb49b8f9e610308961398506acd7.tar.gz nixlib-303390600b7efb49b8f9e610308961398506acd7.tar.bz2 nixlib-303390600b7efb49b8f9e610308961398506acd7.tar.lz nixlib-303390600b7efb49b8f9e610308961398506acd7.tar.xz nixlib-303390600b7efb49b8f9e610308961398506acd7.tar.zst nixlib-303390600b7efb49b8f9e610308961398506acd7.zip | |
Merge pull request #49312 from typetetris/release-18.09
nixos/ddclient: Fix #49258
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index eb74b9bcac12..aa2b5c0b2dfb 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -28,7 +28,10 @@ with lib; (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; in if enabled then [ pkgs.gutenprint ] else [ ])) - (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]) + (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ] + (config: + let value = getAttrFromPath [ "services" "ddclient" "domain" ] config; + in if value != "" then [ value ] else [])) (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) |