diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-05-21 11:56:32 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-05-21 13:12:44 +0200 |
| commit | 167272f01d352768b0615dee4cc266a36c6d23d5 (patch) | |
| tree | d4a06846c6fe6cc7279819ea8dc0f4828b2b0616 /nixos/modules/services/networking/networkmanager.nix | |
| parent | d1463ac750da01e606c8cbfcb28dd500388e1011 (diff) | |
| download | nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar.gz nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar.bz2 nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar.lz nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar.xz nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.tar.zst nixpkgs-167272f01d352768b0615dee4cc266a36c6d23d5.zip | |
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).
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 4 |
1 files 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"; } |