diff options
| author | Alexander Ried <ried@mytum.de> | 2016-06-12 18:02:24 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-06-23 23:12:41 +0200 |
| commit | c1319572d4d32297588c95234b37f73abab50d85 (patch) | |
| tree | a2c7c5b80ae32a5048e7c4a51c956f81dfd294ee | |
| parent | a48f1472f56b660e898e7c8e8475fbc390c64126 (diff) | |
| download | nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar.gz nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar.bz2 nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar.lz nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar.xz nixlib-c1319572d4d32297588c95234b37f73abab50d85.tar.zst nixlib-c1319572d4d32297588c95234b37f73abab50d85.zip | |
networkmanager: Dependency on avahi-autoipd has been dropped.
Native IPv4 link-local addressing configuration based on systemd network library is now used instead.
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 9912ad9ae3fc..8aac1360526f 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 5b1d56c0184c..d85fdadf8977 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" ''; |