summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager
diff options
context:
space:
mode:
authorPeter Hoeg <peter@speartail.com>2016-04-03 00:03:03 +0800
committerPeter Hoeg <peter@speartail.com>2016-04-03 18:40:51 +0800
commit64a9bd37e65cc7856a5ef4d74be395682699e1e8 (patch)
treefa2a429a1afb4e3bd9fa0cc012b6eb5e49ca5ab8 /pkgs/tools/networking/network-manager
parent32b7b0009f168cb7e020d297c2f336ef352e9ec1 (diff)
downloadnixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar.gz
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar.bz2
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar.lz
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar.xz
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.tar.zst
nixlib-64a9bd37e65cc7856a5ef4d74be395682699e1e8.zip
networkmanager: 1.0.6 -> 1.0.12
Also pulls in networkmanager-applet at 1.0.10 as it is no longer in sync with the NM version.
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 c23b818e048f..eeaff6337791 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -6,16 +6,18 @@
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "1.0.6";
+  version = "1.0.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";
-    sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd";
+    sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs";
   };
 
   preConfigure = ''
     substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
     substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    substituteInPlace data/84-nm-drivers.rules \
+      --replace /bin/sh ${stdenv.shell}
     substituteInPlace data/85-nm-unmanaged.rules \
       --replace /bin/sh ${stdenv.shell} \
       --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \