Merge branch 'fix-NM-pptp'

pkgs/tools/networking/network-manager/pptp-purity.patch

@@ -0,0 +1,26 @@
+diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
+index 68a5759..568bbfe 100644
+--- a/src/nm-pptp-service.c
++++ b/src/nm-pptp-service.c
+@@ -729,9 +729,7 @@ nm_find_pppd (void)
+ {
+ 	static const char *pppd_binary_paths[] =
+ 		{
+-			"/sbin/pppd",
+-			"/usr/sbin/pppd",
+-			"/usr/local/sbin/pppd",
++			"@ppp@/sbin/pppd",
+ 			NULL
+ 		};
+ 
+@@ -751,9 +749,7 @@ nm_find_pptp (void)
+ {
+ 	static const char *pptp_binary_paths[] =
+ 		{
+-			"/sbin/pptp",
+-			"/usr/sbin/pptp",
+-			"/usr/local/sbin/pptp",
++			"@pptp@/sbin/pptp",
+ 			NULL
+ 		};
+ 

pkgs/tools/networking/network-manager/pptp.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
+{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll
 , withGnome ? false, gtk, libgnome_keyring }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.2.0";
+  version = "0.9.4.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1fj2v8pjc17m9calckgc2jm8wbimwga8if4r21walf9xysvhsd1b";
+    sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg";
   };
 
   buildInputs = [ networkmanager pptp ppp ]
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
   configureFlags =
     if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome";
 
+  patches =
+    [ ( substituteAll {
+        src = ./pptp-purity.patch;
+        inherit ppp pptp;
+      })
+    ];
+
   meta = {
     description = "PPtP plugin for NetworkManager";
     inherit (networkmanager.meta) maintainers platforms;

pkgs/tools/networking/networkmanagement/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "networkmanagement";
-  version = "0.9.0";
+  version = "0.9.0.4";
   name = "${pname}-${version}";
 in
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0bxb5hzygf4szv01903zirzxjb3r2nzza9ya3rag4lkxxpwaynpd";
+    sha256 = "0mp2jai6f2qpywjwgvxcl1nh27idgy740vwiahfamq8w2y90a3aj";
   };
 
   buildInputs = [ kdelibs kde_workspace networkmanager ];

pkgs/tools/networking/pptp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, ppp }:
+{ stdenv, fetchurl, perl, ppp, iproute }:
 
 stdenv.mkDerivation rec {
   name = "pptp-1.7.2";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   patchPhase =
     ''
       sed -e 's/install -o root/install/' -i Makefile
+      sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c
     '';
   preConfigure =
     ''