From d1463ac750da01e606c8cbfcb28dd500388e1011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 May 2016 11:55:08 +0200 Subject: [PATCH] Revert "nixos/networkmanager: fix syntax error" This reverts commit 2875293615adabba44dac3a222e3d483c3f9e6f7. 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e9eea6a2cae1..b83b8b91c678 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -114,12 +114,10 @@ in { # Ugly hack for using the correct gnome3 packageSet basePackages = mkOption { type = types.attrsOf types.package; - default = { inherit modemmanager wpa_supplicant + default = { inherit networkmanager modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect - networkmanager_pptp networkmanager_l2tp; - networkmanager = networkmanager.out; - }; + networkmanager_pptp networkmanager_l2tp; }; internal = true; };