From 34ca304f58ffeeb2f4b095c9e41b015e0e99aa18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Nov 2014 12:09:52 +0100
Subject: [PATCH] network-manager: 0.9.8.8 -> 0.9.8.10

---
 .../network-manager-applet/default.nix        |  2 +-
 .../networking/network-manager/default.nix    |  4 +--
 .../network-manager/nixos-purity.patch        | 30 -------------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 850981c5d338..d289695398cd 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq";
+    sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 671f7ec4ff91..ed4b3812e282 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.8.8";
+  version = "0.9.8.10";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
-    sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la";
+    sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch
index 5736009571e7..505dd8b2b3c4 100644
--- a/pkgs/tools/networking/network-manager/nixos-purity.patch
+++ b/pkgs/tools/networking/network-manager/nixos-purity.patch
@@ -28,36 +28,6 @@ index 237661f..48bc33f 100644
  		NULL
  	};
  	const char **path = dhcpcd_paths;
-diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
-index 8e216f4..6e00210 100644
---- a/src/dns-manager/nm-dns-dnsmasq.c
-+++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -52,9 +52,7 @@ static inline const char *
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
--		"/usr/local/sbin/dnsmasq",
--		"/usr/sbin/dnsmasq",
--		"/sbin/dnsmasq",
-+		"@dnsmasq@/bin/dnsmasq",
- 		NULL
- 	};
- 	const char **binary = paths;
-diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-index ca2f9dc..ce718d0 100644
---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
-+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
-@@ -170,9 +170,7 @@ static inline const char *
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
--		"/usr/local/sbin/dnsmasq",
--		"/usr/sbin/dnsmasq",
--		"/sbin/dnsmasq",
-+		"@dnsmasq@/bin/dnsmasq",
- 		NULL
- 	};
- 
 diff --git a/src/nm-device.c b/src/nm-device.c
 index 1dc94ee..e60f3c8 100644
 --- a/src/nm-device.c