* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15065

pkgs/development/compilers/dev86/default.nix

@@ -7,6 +7,8 @@ stdenv.mkDerivation {
     md5 = "e7bbfdbe61c2fb964994a087e29b0087";
   };
 
+  patches = [ ./dev86-0.16.17-noelks-1.patch ];
+  
   preBuild = "
     makeFlags=\"PREFIX=$out\"
   ";

pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch

@@ -0,0 +1,22 @@
+Submitted By: Andrew "Weibullguy" Rowland <darowland_at_ieee_dot_org>
+Date: 2007-10-23
+Initial Package Version: 0.16.17
+Origin: Fedora Project
+Description: Suppresses elksemu
+Upstream Status: Unknown
+
+--- dev86-0.16.17/makefile.in.noelks	2006-01-25 17:03:02.000000000 -0500
++++ dev86-0.16.17/makefile.in	2006-01-25 17:03:19.000000000 -0500
+@@ -89,10 +89,10 @@
+ 
+ #ifdef GNUMAKE
+ all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
+-     library lib-bsd alt-libs elksemu
++     library lib-bsd alt-libs 
+ 
+ install: check_config install-bcc install-man \
+-     install-lib install-emu
++     install-lib
+ 
+ install-all: install install-other
+ 

pkgs/development/libraries/avahi/default.nix

@@ -5,10 +5,10 @@
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.24";
+  name = "avahi-0.6.25";
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0l5rsi4s7az7cs9p4aqs77v7jrh95iiwwx0ivksmivc8c7a70016";
+    sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j";
   };
 
   buildInputs = [

pkgs/development/libraries/gnutls/default.nix

@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.6.3";
+  name = "gnutls-2.6.5";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "1rs0a9d5ag17ws7d442ywlsdm6nb8fdmxkpj5hv9byfwb7k7xpgd";
+    sha256 = "1jq1alccg4fzr3xnq5j3igwsyypw855jqx7iri4bf2ic0wvfd2z7";
   };
 
   patches = [ ./tmpdir.patch ];

pkgs/development/libraries/libgpod/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "libgpod-0.7";
+  src = fetchurl {
+    url = mirror://sourceforge/gtkpod/libgpod-0.7.0.tar.gz;
+    sha256 = "07jfxf4v6wd33aps9ry8kmp0k7lg1k933bag4f9vnpns3j5l63g1";
+  };
+
+  buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ];
+
+  meta = {
+    homepage = http://gtkpod.sourceforge.net/;
+    description = "Library used by gtkpod to access the contents of an ipod";
+    license = "LGPL";
+  };
+}

pkgs/development/libraries/loudmouth/default.nix

@@ -1,14 +1,15 @@
-args: with args;
-stdenv.mkDerivation rec {
-	name = "loudmouth-1.3.3";
+{stdenv, fetchurl, gnutls, libidn, glib, pkgconfig, zlib}:
 
-	src = fetchurl {
-		url = "http://ftp.imendio.com/pub/imendio/loudmouth/src/${name}.tar.bz2";
-		sha256 = "0f3xpp3pf5bxcp0kcmqa0g28vfl5gg8mj0hxhs2cx75hwgikd26x";
-	};
+stdenv.mkDerivation {
+  name = "loudmouth-1.4.3";
+    
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2;
+    md5 = "55339ca42494690c3942ee1465a96937";
+  };
+    
+  propagatedBuildInputs = [gnutls libidn glib zlib];
+  buildInputs = [pkgconfig];
 
-	propagatedBuildInputs = [gnutls libidn glib];
-	buildInputs = [pkgconfig];
-
-	configureFlags = "--enable-shared --disable-static";
+  configureFlags = "--enable-shared --disable-static";
 }

pkgs/development/python-modules/dbus/default.nix

@@ -0,0 +1,29 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.83.0" a; 
+  buildInputs = with a; [
+    pkgconfig
+  ];
+  propagatedBuildInputs = with a; [
+    dbus python dbus_glib
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz";
+    sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9";
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "python-dbus-" + version;
+  meta = {
+    description = "Python DBus bindings";
+  };
+}

pkgs/development/python-modules/irclib/default.nix

@@ -0,0 +1,32 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.4.8" a; 
+  buildInputs = with a; [
+    python
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+    sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
+  };
+  patches = [(fetchurl {
+    url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
+    name = "irclib.py.diff";
+    sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
+  })];
+  patchFlags = "irclib.py";
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doPatch" "installPythonPackage"];
+      
+  name = "python-irclib-" + version;
+  meta = {
+    description = "Python IRC library";
+  };
+}

pkgs/development/python-modules/libsexy/default.nix

@@ -0,0 +1,32 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.1.9" a; 
+  buildInputs = with a; [
+    pkgconfig pygtk
+  ];
+  propagatedBuildInputs = with a; [
+    libsexy python gtk glib pango libxml2
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
+    sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
+  postInstall = a.FullDepEntry (''
+    ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
+  '') ["minInit"];
+
+  name = "python-libsexy-" + version;
+  meta = {
+    description = "Python libsexy bindings";
+  };
+}

pkgs/development/python-modules/pygtk/default.nix

@@ -1,4 +1,5 @@
-{stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo}:
+{stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
+  , libglade ? null}:
 
 stdenv.mkDerivation {
   name = "pygtk-2.10.4";
@@ -8,7 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1xg8vng42lql29aa5ryva8icc8dwdc7h2y3yn96qjdgl394d96mb";
   };
   
-  buildInputs = [python pkgconfig glib gtk];
+  buildInputs = [python pkgconfig glib gtk]
+    ++ (if libglade != null then [libglade] else [])
+  ;
 
   propagatedBuildInputs = [pygobject pycairo];
 }

pkgs/development/python-modules/pyopenssl/default.nix

@@ -0,0 +1,26 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.8" a; 
+  propagatedBuildInputs = with a; [
+    openssl python
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-${version}.tar.gz";
+    sha256 = "1qzzycjyp1qsw87msj9kg2q3h7il1bf4jkrwy841y0zi44fl3112";
+  };
+
+  inherit propagatedBuildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["installPythonPackage"];
+      
+  name = "pyOpenSSL-" + version;
+  meta = {
+    description = "Python OpenSSL wrapper capable of checking certificates";
+  };
+}

pkgs/development/python-modules/xmpppy/default.nix

@@ -0,0 +1,30 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.5.0rc1" a; 
+  buildInputs = with a; [
+    python setuptools
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+    sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["mkDirs" "installPythonPackage"];
+  mkDirs = a.FullDepEntry(''
+    ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
+    export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
+  '') ["defEnsureDir" "addInputs"];
+      
+  name = "xmpp.py-" + version;
+  meta = {
+    description = "XMPP python library";
+  };
+}

pkgs/development/tools/documentation/docutils/default.nix

@@ -0,0 +1,27 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "0.5" a; 
+  buildInputs = with a; [
+    python pil makeWrapper 
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
+    sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
+      
+  name = "python-docutils-" + version;
+  meta = {
+    description = "Processor of ReStructured Text";
+  };
+}
+  

pkgs/development/tools/misc/unifdef/default.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "unifdef-1.0";
 
   src = fetchurl {
-    url = http://freshmeat.net/redir/unifdef/10933/url_tgz/unifdef-1.0.tar.gz;
-    sha256 = "d14c30b1e2e9745e4b067ab86337c93ad907b4e9ee1c414d45291bf7f0c19dad";
+    url = http://www.cs.cmu.edu/~ajw/public/dist/unifdef-1.0.tar.gz;
+    sha256 = "1bcxq7qgf6r98m6l277fx6s0gn9sr4vn7f3s0r5mwx79waqk0k6i";
   };
 
   buildPhase = ''

pkgs/development/tools/selenium/remote-control/default.nix

@@ -28,10 +28,10 @@ in stdenv.mkDerivation {
     # this snapshot version starts a firefox from a script file. It only issues a warning about it
     # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such..
     name = "selenium-remote-control-${version}-dist";
-    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2639 
+    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2450
     src = fetchurl {
       url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar";
-      sha256 = "1g59g5y8lyjjj3fda30cm9gmjncdz70slrp03rqmnrkzp7z6khnc";
+      sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38";
     };
     phases = "buildPhase";
     buildPhase = ''