network-manager: update all to 0.9.8.0

This should fix compilation with newer glib versions.

4 files changed, 8 insertions, 37 deletions

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index d9e73a706dbe..af35e3f71da2 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.6.4";
+  version = "0.9.8.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
-    sha256 = "1sx7h29j9h13qszcppja1p27zq2m7vdrylbcyb47n62x0lg426si";
+    sha256 = "0sq9yvln0yjff1sgk483m98ca2x2sqk5vh4kmn382k9msvgbqrn3";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch
index 998c2f25b2b2..5736009571e7 100644
--- a/pkgs/tools/networking/network-manager/nixos-purity.patch
+++ b/pkgs/tools/networking/network-manager/nixos-purity.patch
@@ -1,19 +1,3 @@
-diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c
-index d027789..ef6b646 100644
---- a/src/backends/NetworkManagerExherbo.c
-+++ b/src/backends/NetworkManagerExherbo.c
-@@ -41,9 +41,9 @@ void nm_backend_update_dns (void)
- 	/* Make glibc/nscd aware of any changes to the resolv.conf file by
- 	 * restarting nscd. Only restart if already running.
- 	 */
--	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
-+	if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
- 		nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
--		nm_spawn_process ("/usr/sbin/nscd -i hosts");
-+		nm_spawn_process ("@glibc@/sbin/nscd -i hosts");
- 	}
- }
- 
 diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
 index 0932139..5b5aee8 100644
 --- a/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -44,21 +28,6 @@ index 237661f..48bc33f 100644
  		NULL
  	};
  	const char **path = dhcpcd_paths;
-diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c
-index 1a3243b..a47dccd 100644
---- a/src/dns-manager/nm-dns-bind.c
-+++ b/src/dns-manager/nm-dns-bind.c
-@@ -51,9 +51,7 @@ static inline const char *
- find_bind (void)
- {
- 	static const char *paths[] = {
--		"/usr/local/sbin/named",
--		"/usr/sbin/named",
--		"/sbin/named",
-+		"@bind@/sbin/named",
- 		NULL
- 	};
- 	const char **binary = 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
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 15da0236172b..9817a8cddd12 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openvpn";
-  version = "0.9.6.0";
+  version = "0.9.8.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "18w7mlgnm7y5kg3s2jfm8biymh33ggw97bz27m5mg69kg42qgf4g";
+    sha256 = "1klmhcizp6fmbxjbyihsk2w0alnkyiw2a3ldgijq8s224k0z95j1";
   };
 
   buildInputs = [ openvpn networkmanager ]
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index b71e41c8b56a..a60199aab2d0 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.4.0";
+  version = "0.9.8.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg";
+    sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l";
   };
 
   buildInputs = [ networkmanager pptp ppp ]
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   configureFlags =
     if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome";
 
+  postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile";
+
   patches =
     [ ( substituteAll {
         src = ./pptp-purity.patch;