summary refs log tree commit diff
path: root/nixos/modules/services/networking/networkmanager.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-05-21 11:57:04 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-05-21 13:12:44 +0200
commitc7db50e24f2a3522abd98da7e605a06002e5cdba (patch)
treefe0e7df4a6fa38bb9b29da56f2c1bb5939947f27 /nixos/modules/services/networking/networkmanager.nix
parent167272f01d352768b0615dee4cc266a36c6d23d5 (diff)
downloadnixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar.gz
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar.bz2
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar.lz
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar.xz
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.tar.zst
nixpkgs-c7db50e24f2a3522abd98da7e605a06002e5cdba.zip
Revert "network-manager: multiple outputs"
This reverts commit c25907d072742e9720b713d7116793e0d8a623c5.

I think this commit broke the NixOS service for NetworkManager. At least
with this, and the two previous reverts, everything is back to normal.
(With multiple-outputs split, it would have reduced the closure size by
3 MiB.)
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d0b86b4cbdb..9912ad9ae3f 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; };