From c7db50e24f2a3522abd98da7e605a06002e5cdba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 May 2016 11:57:04 +0200 Subject: [PATCH] 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.) --- nixos/modules/services/networking/networkmanager.nix | 2 +- pkgs/tools/networking/network-manager/default.nix | 2 -- 2 files changed, 1 insertion(+), 3 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; }; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 2d5477ee8e4..34506cb823d 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; - outputs = [ "dev" "out" ]; - preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file