From 773c456ef49e84de75931ce7d95a565888bff096 Mon Sep 17 00:00:00 2001 From: pngwjpgh Date: Sun, 9 Apr 2017 14:14:04 +0200 Subject: [PATCH] networkmanager: fix dispatcher scripts (#24507) networkmanager used `source` to mean `text` and wrote dispatcher scripts with the default mode (0666), which means networkmanager wouldn't call them. --- nixos/modules/services/networking/networkmanager.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7255ffc5af4..7fb2be78698 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -162,9 +162,9 @@ in { type = types.listOf (types.submodule { options = { source = mkOption { - type = types.str; + type = types.path; description = '' - A script source. + A script. ''; }; @@ -224,7 +224,7 @@ in { target = "NetworkManager/dispatcher.d/02overridedns"; } ++ lib.imap (i: s: { - text = s.source; + inherit (s) source; target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; }) cfg.dispatcherScripts;