Revert "network-manager: multiple outputs" · pyrox.dev/nixpkgs@c7db50e

lol

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.)

Bjørn Forsman 10 years ago c7db50e2 167272f0

+1 -3

2 changed files

expand all

nixos

modules

services

networking

networkmanager.nix

pkgs

tools

networking

network-manager

default.nix

+1 -1

nixos/modules/services/networking/networkmanager.nix

··· 114 114 # Ugly hack for using the correct gnome3 packageSet 115 115 basePackages = mkOption { 116 116 type = types.attrsOf types.package; 117 - default = { inherit networkmanager.out modemmanager wpa_supplicant 117 + default = { inherit networkmanager modemmanager wpa_supplicant 118 118 networkmanager_openvpn networkmanager_vpnc 119 119 networkmanager_openconnect 120 120 networkmanager_pptp networkmanager_l2tp; };

-2

pkgs/tools/networking/network-manager/default.nix

··· 13 13 sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; 14 14 }; 15 15 16 - outputs = [ "dev" "out" ]; 17 - 18 16 preConfigure = '' 19 17 substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname 20 18 substituteInPlace configure --replace /usr/bin/file ${file}/bin/file