From c1319572d4d32297588c95234b37f73abab50d85 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 12 Jun 2016 18:02:24 +0200 Subject: [PATCH 1/3] networkmanager: Dependency on avahi-autoipd has been dropped. Native IPv4 link-local addressing configuration based on systemd network library is now used instead. --- nixos/modules/services/networking/networkmanager.nix | 5 ----- pkgs/tools/networking/network-manager/default.nix | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 9912ad9ae3f..8aac1360526 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -231,11 +231,6 @@ in { users.extraUsers = [{ name = "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; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 5b1d56c0184..d85fdadf897 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline +, libgcrypt, dnsmasq, bind, perl, bluez5, substituteAll, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils }: @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ --replace /bin/sed ${gnused}/bin/sed # 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" ''; From 64a9dc4dd7f6a00d05c1e855daead0b692e0e981 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 22 Jun 2016 13:49:26 +0200 Subject: [PATCH 2/3] networkmanager: cleanup --- pkgs/tools/networking/network-manager/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d85fdadf897..63740558a27 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz -, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, bind, perl, bluez5, substituteAll, readline +{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables +, libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils }: @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { "--with-dhclient=${dhcp}/bin/dhclient" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure - #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd" "--with-dhcpcd=no" "--with-pppd=${ppp}/bin/pppd" "--with-iptables=${iptables}/bin/iptables" @@ -55,8 +54,8 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp - xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; + buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; From a6a11b3852174e6c2c1940a8a67aa96546e1054b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 22 Jun 2016 17:38:44 +0200 Subject: [PATCH 3/3] network-manager-applet: remove unused dbus_glib dependency --- pkgs/tools/networking/network-manager-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index a24f350d3f0..62a46c15bc8 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,5 +1,5 @@ { 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 , makeWrapper, udev, libgudev, hicolor_icon_theme }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; 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 ];