public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16467 from groxxda/bump/networkmanager

Browse Source 
networkmanager: cleanup
This commit is contained in:
obadz 2016-06-23 23:41:44 +01:00 committed by GitHub
commit e13a76f978
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/networkmanager.nix
View File

@ -231,11 +231,6 @@ in {
users.extraUsers = [{ users.extraUsers = [{
name = "nm-openvpn"; name = "nm-openvpn";
uid = config.ids.uids.nm-openvpn; uid = config.ids.uids.nm-openvpn;
}
{
# to enable link-local connections
name = "avahi-autoipd";
uid = config.ids.uids.avahi-autoipd;
}]; }];
systemd.packages = cfg.packages; systemd.packages = cfg.packages;

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, dbus_glib, polkit, isocodes , libnotify, libsecret, polkit, isocodes
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, libgudev, hicolor_icon_theme }: , makeWrapper, udev, libgudev, hicolor_icon_theme }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--sysconfdir=/etc" ]; configureFlags = [ "--sysconfdir=/etc" ];
buildInputs = [ buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
]; ];

12
pkgs/tools/networking/network-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz { stdenv, fetchurl, intltool, pkgconfig, dbus_glib
, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , libgcrypt, dnsmasq, bluez5, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, coreutils, file, inetutils }: , ethtool, gnused, coreutils, file, inetutils }:
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
--replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \
--replace /bin/sed ${gnused}/bin/sed --replace /bin/sed ${gnused}/bin/sed
# to enable link-local connections # to enable link-local connections
substituteInPlace src/devices/nm-device.c --replace '("avahi-autoipd", NULL, NULL)' '("avahi-autoipd", &"${avahi}/sbin/avahi-autoipd", NULL)'
configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
''; '';
@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
"--with-dhclient=${dhcp}/bin/dhclient" "--with-dhclient=${dhcp}/bin/dhclient"
"--with-dnsmasq=${dnsmasq}/bin/dnsmasq" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
# Upstream prefers dhclient, so don't add dhcpcd to the closure # Upstream prefers dhclient, so don't add dhcpcd to the closure
#"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
"--with-dhcpcd=no" "--with-dhcpcd=no"
"--with-pppd=${ppp}/bin/pppd" "--with-pppd=${ppp}/bin/pppd"
"--with-iptables=${iptables}/bin/iptables" "--with-iptables=${iptables}/bin/iptables"
@ -56,8 +54,8 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes" "--with-libsoup=yes"
]; ];
buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];