Update wicd to 1.7.0

svn path=/nixpkgs/trunk/; revision=24929

pkgs/tools/networking/wicd/default.nix

@@ -6,11 +6,11 @@
 # on urwid which has not been packaged at this time (2009-12-27).
 
 stdenv.mkDerivation rec {
-  name = "wicd-1.6.2.2";
+  name = "wicd-1.7.0";
   
   src = fetchurl {
-    url = "mirror://sourceforge/wicd/files/wicd-stable/${name}/${name}.tar.bz2";
-    sha256 = "1gpjrlanz7rrzkchnpm1dgik333rz1fsg4c4046c5pwdfpp1crxr";
+    url = "mirror://sourceforge/project/wicd/wicd-stable/${name}/${name}.tar.bz2";
+    sha256 = "0civfmpjlsvnaiw7fkpq34mh5ndhfzb9mkl3q2d3rjd4z0mnki8l";
   };
 
   buildInputs = [ python ];
@@ -19,24 +19,34 @@ stdenv.mkDerivation rec {
 
   # Should I be using pygtk's propogated build inputs?
   postPatch = ''
+    substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
     sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
     sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
     sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
+    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
+    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
   '';
 
   configurePhase = ''
     python setup.py configure \
     --lib=$out/lib/ \
-    --etc=/var/lib/wicd/ \
     --share=$out/share/ \
+    --etc=/var/lib/wicd/ \
     --scripts=$out/etc/scripts/ \
-    --images=$out/share/pixmaps/ \
+    --pixmaps=$out/share/pixmaps/ \
+    --images=$out/share/pixmaps/wicd/ \
     --encryption=$out/etc/encryption/templates/ \
     --bin=$out/bin/ \
     --sbin=$out/sbin/ \
-    --backends=$out/lib/backends/ \
+    --backends=$out/share/backends/ \
+    --daemon=$out/share/daemon/ \
+    --curses=$out/share/curses/ \
+    --gtk=$out/share/gtk/ \
+    --cli=$out/share/cli/ \
     --networks=/var/lib/wicd/configurations/ \
     --resume=$out/etc/acpi/resume.d/ \
     --suspend=$out/etc/acpi/suspend.d/ \
@@ -60,7 +70,11 @@ stdenv.mkDerivation rec {
     --no-install-ncurses \
   '';
 
-  installPhase = ''python setup.py install --prefix=$out'';
+  installPhase = ''
+    python setup.py install --prefix=$out
+    ensureDir $out/share/other
+    cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default
+  '';
 
   meta = {
     homepage = http://wicd.net/;
@@ -74,6 +88,7 @@ stdenv.mkDerivation rec {
       encryption types, such as WPA and WEP. Wicd will automatically
       connect at startup to any preferred network within range.
     '';
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
     license="GPLv2";
   };
 }

pkgs/tools/networking/wicd/mkdir-networks.patch

@@ -1,11 +1,12 @@
-wicd normally makes the NETWORKS directory at install time, but we cannot do that,
-so we make it at runtime instead.
+wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, 
+but we cannot do that, so we make it at runtime instead.
 
---- wicd-1.6.2.2/in/scripts=wicd.in	2009-09-01 11:05:31.000000000 -0400
-+++ wicd-1.6.2.2/in/scripts=wicd.in	2010-01-04 18:01:57.000000000 -0500
-@@ -1,3 +1,5 @@
+--- wicd-1.7.0/in/scripts=wicd.in       2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/in/scripts=wicd.in       2010-11-16 22:35:50.272555487 -0500
+@@ -1,3 +1,6 @@
  #!/bin/bash
  
 +mkdir -p %NETWORKS%
++ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default
 +
- exec python -O %LIB%wicd-daemon.py $@
+ exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@

pkgs/tools/networking/wicd/no-var-install.patch

@@ -1,21 +1,15 @@
-The install tries to create files in /var.  This patch removes those steps.
-
---- wicd-1.6.2.2/setup.py	2009-09-01 11:05:31.000000000 -0400
-+++ wicd-1.6.2.2/setup.py	2009-12-27 21:27:57.000000000 -0500
-@@ -464,8 +464,6 @@
-     data = [
-     (wpath.dbus, ['other/wicd.conf']),
-     (wpath.desktop, ['other/wicd.desktop']),
--    (wpath.log, []), 
--    (wpath.etc, []),
-     (wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']),
-     (wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']),
-     (wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']),
-@@ -481,7 +479,6 @@
-     (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]),
-     (wpath.encryption, [('encryption/templates/' + b) for b in 
-                         os.listdir('encryption/templates') if not b.startswith('.')]),
--    (wpath.networks, []),
-     (wpath.bin, ['scripts/wicd-client', ]), 
-     (wpath.sbin,  ['scripts/wicd', ]),  
-     (wpath.share, ['data/wicd.glade', ]),
+The install tries to create files in /var.  This patch removes those steps.
+
+--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500
+@@ -494,10 +494,8 @@
+     data = [
+     (wpath.dbus, ['other/wicd.conf']),
+     (wpath.log, [empty_file]), 
+-    (wpath.etc, ['other/dhclient.conf.template.default']),
+     (wpath.encryption, [('encryption/templates/' + b) for b in 
+                         os.listdir('encryption/templates') if not b.startswith('.')]),
+-    (wpath.networks, [empty_file]),
+     (wpath.sbin,  ['scripts/wicd']),  
+     (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
+                  'wicd/suspend.py', 'wicd/autoconnect.py']), 

pkgs/tools/networking/wicd/pygtk.patch

@@ -1,8 +1,8 @@
 For some reason nix's pygtk doesn't have a pygtk module so we remove the version check.
 If this ever changes we could remove this patch.
 
---- wicd-1.6.2.2/wicd/wicd-client.py	2009-09-01 11:05:31.000000000 -0400
-+++ wicd-1.6.2.2/wicd/wicd-client.py	2009-12-28 00:22:57.000000000 -0500
+--- wicd-1.7.0/gtk/wicd-client.py	2009-09-01 11:05:31.000000000 -0400
++++ wicd-1.7.0/gtk/wicd-client.py	2009-12-28 00:22:57.000000000 -0500
 @@ -43,9 +43,6 @@
  import atexit
  from dbus import DBusException