From 167272f01d352768b0615dee4cc266a36c6d23d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 May 2016 11:56:32 +0200 Subject: [PATCH] Revert "networkmanager service: fixup" This reverts commit 7ac1ef05fa162d8e3c35925034df72288df77c8b. One of a few reverts needed to unbreak networkmanager NixOS service since the multiple-output split (to save 3 MiB of closure size). --- nixos/modules/services/networking/networkmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index b83b8b91c67..d0b86b4cbdb 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -114,7 +114,7 @@ in { # Ugly hack for using the correct gnome3 packageSet basePackages = mkOption { type = types.attrsOf types.package; - default = { inherit networkmanager modemmanager wpa_supplicant + default = { inherit networkmanager.out modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect networkmanager_pptp networkmanager_l2tp; }; @@ -187,7 +187,7 @@ in { boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = with mapAttrs (name: getBin) cfg.basePackages; [ + environment.etc = with cfg.basePackages; [ { source = ipUpScript; target = "NetworkManager/dispatcher.d/01nixos-ip-up"; }