From c25907d072742e9720b713d7116793e0d8a623c5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Apr 2016 19:17:55 -0500 Subject: network-manager: multiple outputs --- nixos/modules/services/networking/networkmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 9912ad9ae3fc..d0b86b4cbdba 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; }; -- cgit 1.4.1 From 7ac1ef05fa162d8e3c35925034df72288df77c8b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Apr 2016 13:51:43 +0300 Subject: networkmanager service: fixup --- nixos/modules/services/networking/networkmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d0b86b4cbdba..b83b8b91c678 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.out modemmanager wpa_supplicant + default = { inherit networkmanager 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 cfg.basePackages; [ + environment.etc = with mapAttrs (name: getBin) cfg.basePackages; [ { source = ipUpScript; target = "NetworkManager/dispatcher.d/01nixos-ip-up"; } -- cgit 1.4.1 From 2875293615adabba44dac3a222e3d483c3f9e6f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 25 Apr 2016 20:18:56 -0500 Subject: nixos/networkmanager: fix syntax error --- nixos/modules/services/networking/networkmanager.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index b83b8b91c678..e9eea6a2cae1 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -114,10 +114,12 @@ in { # Ugly hack for using the correct gnome3 packageSet basePackages = mkOption { type = types.attrsOf types.package; - default = { inherit networkmanager modemmanager wpa_supplicant + default = { inherit modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect - networkmanager_pptp networkmanager_l2tp; }; + networkmanager_pptp networkmanager_l2tp; + networkmanager = networkmanager.out; + }; internal = true; }; -- cgit 1.4.1