about summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-08-03 08:02:35 +0200
committerGitHub <noreply@github.com>2019-08-03 08:02:35 +0200
commit8fa3fb092e5839abbe6a61023162914f4f47a1db (patch)
tree9ae2f6dc3ba27147e24780f979b656f7fa4f5335 /pkgs/tools/networking/network-manager
parent65bba1f6224d17b7d61cd2299458fc3035b91003 (diff)
parentde3bbbf46cdddd988fec052c72ef07312073e77f (diff)
downloadnixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar.gz
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar.bz2
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar.lz
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar.xz
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.tar.zst
nixlib-8fa3fb092e5839abbe6a61023162914f4f47a1db.zip
Merge pull request #65624 from worldofpeace/bump-networkmanager
networkmanager: 1.18.1 -> 1.18.2 
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r--pkgs/tools/networking/network-manager/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index f2c83c661ae3..c0e29c6538be 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" ];
@@ -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
@@ -49,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 = [