summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-05-21 11:55:08 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-05-21 13:12:44 +0200
commitd1463ac750da01e606c8cbfcb28dd500388e1011 (patch)
tree160fb357fd7c34f092bfa82db2c2b6ec0839c6c1 /nixos
parent6eafbecdd562a55142f5979191ef54059498ac99 (diff)
downloadnixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar.gz
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar.bz2
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar.lz
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar.xz
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.tar.zst
nixlib-d1463ac750da01e606c8cbfcb28dd500388e1011.zip
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).
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix6
1 files 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;
       };