From 3c77163d4668100fe6ffece20f94fac2cf008c4c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 31 Jul 2019 02:54:59 -0400 Subject: [PATCH 1/3] networkmanager: 1.18.1 -> 1.18.2 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.18.2/NEWS --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f2c83c661ae3..8a55e016a428 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -11,11 +11,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; + sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From ee409c1cc1622e37fd63d5af848760a1178f7837 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 19:22:16 -0500 Subject: [PATCH 2/3] networkmanager: disable dhcpcanon instead of assuming in /usr/* --- pkgs/tools/networking/network-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 8a55e016a428..1937132c0a01 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure "-Ddhcpcd=no" + "-Ddhcpcanon=no" "-Dpppd=${ppp}/bin/pppd" "-Diptables=${iptables}/bin/iptables" # to enable link-local connections From de3bbbf46cdddd988fec052c72ef07312073e77f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 19:53:27 -0500 Subject: [PATCH 3/3] networkmanager: libaudit yes but disabled by default --- pkgs/tools/networking/network-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1937132c0a01..c0e29c6538be 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -50,6 +50,7 @@ in stdenv.mkDerivation rec { "-Dqt=false" # Allow using iwd when configured to do so "-Diwd=true" + "-Dlibaudit=yes-disabled-by-default" ]; patches = [