Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages

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

29 files changed, 499 insertions, 96 deletions

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 9dcec717861..5813fde815f 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, emacs}:
 
 stdenv.mkDerivation rec {
-  name = "haskell-mode-2.7.0";
+  name = "haskell-mode-2.8.0";
 
   src = fetchurl {
     url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
-    sha256 = "8b45c55ed5f2b498529a6d7e01b77fea899c1de93e24653cab188cb3a4f495bc";
+    sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1";
   };
 
   buildInputs = [emacs];
@@ -14,4 +14,12 @@ stdenv.mkDerivation rec {
     ensureDir "$out/share/emacs/site-lisp"
     cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
   '';
+
+  meta = {
+    homepage = "http://projects.haskell.org/haskellmode-emacs/";
+    description = "Haskell mode package for Emacs";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
 }
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
new file mode 100644
index 00000000000..ea86f9caf52
--- /dev/null
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -0,0 +1,31 @@
+{ avahiSupport ? false # build support for Avahi in libinfinity
+, gnomeSupport ? false # build support for Gnome(gnome-vfs)
+, stdenv, fetchurl, pkgconfig
+, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
+, gnomevfs ? null}:
+
+let
+  libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
+  
+in stdenv.mkDerivation rec {
+
+  name = "gobby-0.4.93";
+  src = fetchurl {
+    url = "http://releases.0x539.de/gobby/${name}.tar.gz";
+    sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4";
+  };
+
+  buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
+    ++ stdenv.lib.optional gnomeSupport gnomevfs;
+  
+  configureFlags = ''
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://gobby.0x539.de/;
+    description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat";
+    license = "GPLv2+";
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.all;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
new file mode 100644
index 00000000000..1b72f8f0b7f
--- /dev/null
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
+  kdebase_workspace, gettext, perl }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "4.0.2";
+  pname = "kdevelop";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc";
+  };
+
+  buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
+    kdebase_workspace gettext stdenv.gcc.libc perl ];
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.linux;
+    description = "KDE official IDE";
+    longDescription =
+      ''
+        A free, opensource IDE (Integrated Development Environment)
+        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
+        feature-full, plugin extendable IDE for C/C++ and other
+        programing languages. It is based on KDevPlatform, KDE and Qt
+        libraries and is under development since 1998.
+      '';
+    homepage = http://www.kdevelop.org;
+  };
+}
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
new file mode 100644
index 00000000000..e4270ef3f83
--- /dev/null
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -0,0 +1,95 @@
+{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper,
+ tex ? null,
+ aspell ? null,
+ ghostscriptX ? null,
+ extraFonts ? false,
+ chineseFonts ? false,
+ japaneseFonts ? false,
+ koreanFonts ? false }:
+
+let 
+  pname = "TeXmacs";
+  version = "1.0.7";
+  extraFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
+    sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
+  };
+
+  fullFontsSrc = fetchurl {
+   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
+   sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f";
+  };
+
+  chineseFontsSrc = fetchurl {
+   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz";
+   sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp";
+  };
+
+  japaneseFontsSrc = fetchurl {
+   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz";
+   sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn";
+  };
+
+  koreanFontsSrc = fetchurl {
+   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz";
+   sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
+    sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v";
+  };
+
+  buildInputs = [ guile libX11 libXext makeWrapper ];
+
+  patchPhase = (if tex == null then ''
+    gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else if extraFonts then ''
+    gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if chineseFonts then ''
+    gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if japaneseFonts then ''
+    gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if koreanFonts then ''
+    gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "");
+
+  postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
+        (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
+        (if aspell == null then "" else "${aspell}/bin:") +
+        (if tex == null then "" else "${tex}/bin:") +
+        "${xmodmap}/bin:${which}/bin";
+
+  meta = {
+    description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists";
+    longDescription =
+      '' GNU TeXmacs is a free wysiwyw (what you see is what you want)
+         editing platform with special features for scientists.  The software
+         aims to provide a unified and user friendly framework for editing
+         structured documents with different types of content (text,
+         graphics, mathematics, interactive content, etc.).  The rendering
+         engine uses high-quality typesetting algorithms so as to produce
+         professionally looking documents, which can either be printed out or
+         presented from a laptop.
+
+         The software includes a text editor with support for mathematical
+         formulas, a small technical picture editor and a tool for making
+         presentations from a laptop.  Moreover, TeXmacs can be used as an
+         interface for many external systems for computer algebra, numerical
+         analysis, statistics, etc.  New presentation styles can be written
+         by the user and new features can be added to the editor using the
+         Scheme extension language.  A native spreadsheet and tools for
+         collaborative authoring are planned for later.
+      '';
+    homepage = http://texmacs.org/;
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.roconnor ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
new file mode 100644
index 00000000000..a126402cadf
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
+kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
+liblqr1, lensfun, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "digikam-1.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/digikam/${name}.tar.bz2";
+    sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
+    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
+    pkgconfig ];
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
new file mode 100644
index 00000000000..22174333a4d
--- /dev/null
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
+kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "kipi-plugins-1.4.0";
+
+  src = fetchurl { 
+    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
+    sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
+    libxml2 libxslt gettext opencv libgpod gtk ];
+
+  KDEDIRS = kdegraphics;
+
+  patches = [ ./find-gdk.patch ];
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.kipi-plugins.org;
+    inherit (kdelibs.meta) platforms;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+  };
+}
diff --git a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch
new file mode 100644
index 00000000000..22dcf0323fc
--- /dev/null
+++ b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/FindGdk.cmake b/cmake/modules/FindGdk.cmake
+index 033959a..ff61961 100644
+--- a/cmake/modules/FindGdk.cmake
++++ b/cmake/modules/FindGdk.cmake
+@@ -23,8 +23,9 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+     set(GDK_DEFINITIONS ${_GDKCflags})
+   endif(NOT WIN32)
+ 
+-  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
+-    ${_GDKIncDir}
++  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h
++    HINTS ${_GDKIncDir}
++	PATH_SUFFIXES gtk-2.0
+   )
+   
+   FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
diff --git a/pkgs/applications/misc/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix
new file mode 100644
index 00000000000..c91fb13c862
--- /dev/null
+++ b/pkgs/applications/misc/filelight/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace,
+automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "filelight-1.9rc3";
+  src = fetchurl {
+    url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
+    sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
+  };
+  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon 
+    qimageblitz ];
+  meta = {
+    description = "Shows disk usage as an interactive map of concentric rings";
+    license = "GPL";
+    homepage = http://www.methylblue.com/filelight/;
+    maintainers = [ lib.maintainers.viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
new file mode 100644
index 00000000000..9e9c04acab2
--- /dev/null
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "krusader-2.0.0";
+  src = fetchurl {
+    url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
+    sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
+  };
+  buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
+  patches = [./krusader-gcc44.patch];
+  meta = {
+    description = "Norton/Total Commander clone for KDE";
+    license = "GPL";
+    homepage = http://www.krusader.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/applications/misc/krusader/krusader-gcc44.patch b/pkgs/applications/misc/krusader/krusader-gcc44.patch
new file mode 100644
index 00000000000..f8840d5f33c
--- /dev/null
+++ b/pkgs/applications/misc/krusader/krusader-gcc44.patch
@@ -0,0 +1,10 @@
+--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~	2009-04-29 17:13:43.000000000 +0000
++++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp	2009-04-29 17:14:01.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <kio/jobuidelegate.h>
+ #include <kio/job.h>
+ #include <qapplication.h>
++#include <cstdio>
+ #include <iostream>
+ #include <klocale.h>
+ #include "virtualcopyjob.h"
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 8e2abada55d..7b897e59d4e 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
     sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk";
   };
-  
+
   buildInputs =
     (if enableGUI then [x11 motif] else []) ++
     (if useT1Lib then [t1lib] else []);
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     })
     ./xpdf-3.02-protection.patch
   ];
-    
+
   configureFlags =
     [ "--enable-a4-paper" ] /* We obey ISO standards! */
     ++ (if enablePDFtoPPM then [
@@ -53,4 +53,12 @@ stdenv.mkDerivation {
         --replace '#displayFontT1' displayFontT1
     fi
   ";
+
+  meta = {
+    homepage = "http://www.foolabs.com/xpdf/";
+    description = "viewer for Portable Document Format (PDF) files";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [];
+  };
 }
diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix
new file mode 100644
index 00000000000..7b2a585e465
--- /dev/null
+++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase, gettext  }:
+
+stdenv.mkDerivation rec {
+  name = "konq-plugins-${version}";
+  version = "4.4.0";
+
+  src = fetchurl { 
+    url = http://ftp.riken.go.jp/pub/FreeBSD/distfiles/KDE/extragear/konq-plugins-4.4.0.tar.bz2;
+    sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi";
+  };
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ];
+
+  meta = with stdenv.lib; {
+    description = "Various plugins for Konqueror";
+    license = "GPL";
+    homepage = http://kde.org/;
+    maintainers = [ maintainers.phreedom ];
+    platforms =  kdelibs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index e136670a589..f207eaed703 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig }:
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "bitlbee-1.2.4";
+  name = "bitlbee-1.2.8";
 
   src = fetchurl {
-    url = "mirror://bitlbee/src/" + name + ".tar.gz";
-    sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2";
+    url = "mirror://bitlbee/src/${name}.tar.gz";
+    sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is";
   };
 
-  buildInputs = [ gnutls glib pkgconfig ];
+  buildInputs = [ gnutls glib pkgconfig ]
+    ++ stdenv.lib.optional doCheck check;
+
+  doCheck = true;
 
   meta = {
     description = "BitlBee, an IRC to other chat networks gateway";
@@ -26,5 +29,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.bitlbee.org/;
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index a9b5e0d7a86..c35d71fbca0 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }:
+{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
+, libX11, alsaLib }:
 
 stdenv.mkDerivation {
 
@@ -10,19 +11,13 @@ stdenv.mkDerivation {
   };
   
   buildInputs = [
-    cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib
+    cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
   ];
 
-  cmakeFlags = "-Wno-dev";
+  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
 
-  NIX_LDFLAGS="-lX11";
-
-  patches = [ ./more-icons.patch ];
-
-  patchPhase = ''
-    unset patchPhase; patchPhase
-    sed 's=/bin/bash=/${stdenv.shell}=g' -i \
-      `find -type f -name '*.sh' -or -name 'autodownload'`
+  prePatch = ''
+    patchShebangs .
   '';
 
   meta = { 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index d94c00daed9..2be964db331 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,12 +1,10 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, kde ? true # enable KDE integration
+, withKDE ? true # enable KDE integration
 , ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
-, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }:
-
-assert kde -> kdelibs != null && automoc4 != null && phonon != null;
+, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
 
 let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@@ -21,9 +19,9 @@ in with stdenv; mkDerivation rec {
   };
 
   buildInputs = [ cmake qt4 ]
-    ++ lib.optional kde kdelibs
-    ++ lib.optional kde automoc4
-    ++ lib.optional kde phonon;
+    ++ lib.optional withKDE kdelibs
+    ++ lib.optional withKDE automoc4
+    ++ lib.optional withKDE phonon;
 
   cmakeFlags = [
     "-DWITH_DBUS=OFF"
@@ -34,7 +32,7 @@ in with stdenv; mkDerivation rec {
     ++ edf monolithic "WANT_MONO"
     ++ edf daemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
-    ++ edf kde "WITH_KDE"
+    ++ edf withKDE "WITH_KDE"
     ++ edf ssl "WITH_OPENSSL"
     ++ edf previews "WITH_WEBKIT"  ;
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index b0e9347a764..3c2e94c0595 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
 
-stdenv.mkDerivation {
-  name = "wireshark-1.4.0rc2";
+stdenv.mkDerivation rec {
+  version = "1.4.0";
+  name = "wireshark-${version}";
   src = fetchurl {
-    url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2";
-    sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79";
+    url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
+    sha256 = "1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743";
   };
   configureFlags = "--with-pcap=${libpcap}";
   buildInputs = [perl pkgconfig gtk libpcap flex bison];
diff --git a/pkgs/applications/office/texmacs/default.nix b/pkgs/applications/office/texmacs/default.nix
deleted file mode 100644
index 6172c055c07..00000000000
--- a/pkgs/applications/office/texmacs/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ fetchurl, stdenv, texLive, guile, libX11, libXext }:
-
-let version = "1.0.7"; in
-stdenv.mkDerivation {
-  name = "texmacs-${version}";
-
-  src = fetchurl {
-    url = "ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${version}-src.tar.gz";
-    sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v";
-  };
-
-  buildInputs = [ texLive guile libX11 libXext ];
-
-  meta = {
-    description = "GNU TeXmacs, a WYSIWYW editing platform with special features for scientists";
-
-    longDescription =
-      '' GNU TeXmacs is a free wysiwyw (what you see is what you want)
-         editing platform with special features for scientists.  The software
-         aims to provide a unified and user friendly framework for editing
-         structured documents with different types of content (text,
-         graphics, mathematics, interactive content, etc.).  The rendering
-         engine uses high-quality typesetting algorithms so as to produce
-         professionally looking documents, which can either be printed out or
-         presented from a laptop.
-
-         The software includes a text editor with support for mathematical
-         formulas, a small technical picture editor and a tool for making
-         presentations from a laptop.  Moreover, TeXmacs can be used as an
-         interface for many external systems for computer algebra, numerical
-         analysis, statistics, etc.  New presentation styles can be written
-         by the user and new features can be added to the editor using the
-         Scheme extension language.  A native spreadsheet and tools for
-         collaborative authoring are planned for later.
-      '';
-
-    homepage = http://texmacs.org/;
-
-    license = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 05b33f2bcf2..73d90afb93b 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -20,4 +20,12 @@ stdenv.mkDerivation {
     '';
 
   buildInputs = [ nano ];
+
+  meta = {
+    homepage = "http://cvs.nongnu.org";
+    description = "Concurrent Versions System - a source control system";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [];
+  };
 }
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 3cd2711581d..edb90e6ad46 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 
 let
-  version = "20100918155143";
+  version = "20101005035549";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "1xkk5girwvhayl54fmya48k4akzpsdcg2qllgp1c6ckv169kggb9";
+    sha256 = "14d7sibz9vfmb96xsaia5x6x0059xpn09x3la0xph0ym9gjqp8kb";
   };
 
   buildInputs = [ zlib openssl ];
diff --git a/pkgs/applications/version-management/kdesvn/builder.sh b/pkgs/applications/version-management/kdesvn/builder.sh
new file mode 100644
index 00000000000..ed3b06c00c8
--- /dev/null
+++ b/pkgs/applications/version-management/kdesvn/builder.sh
@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
new file mode 100644
index 00000000000..141bf938e3a
--- /dev/null
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
+, kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdesvn-1.5.2";
+  src = fetchurl {
+    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.2.tar.bz2;
+    sha256 = "1svblxi70ks816zj1w4cc87x72b628g7xjx4hvx57zw8d9hr463h";
+  };
+  builder = ./builder.sh;
+  inherit subversion;
+  buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
+  meta = {
+    description = "KDE SVN front-end";
+    license = "GPL";
+    homepage = http://kdesvn.alwins-world.de;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index bc5af2f37c7..f3d18036d07 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,11 +2,11 @@
 , guiSupport ? false, tk ? null }:
 
 stdenv.mkDerivation rec {
-  name = "mercurial-1.5.1";
+  name = "mercurial-1.6.4";
   
   src = fetchurl {
     url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
-    sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
+    sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
           --prefix PYTHONPATH : "$(toPythonPath $out)" \
           $WRAP_TK
       done
+
+      # copy hgweb.cgi to allow use in apache
+      ensureDir $out/share/cgi-bin
+      cp -v hgweb.cgi $out/share/cgi-bin
+      chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
   meta = {
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 7a3e72c940f..097bb5974aa 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.3.1.10298";
-   name="veracity-0.3.1.10298";
-   hash="1mqlmh01qv6y1sd9zc89caig4j8b8h7lbrqsm4d171fq4qzgq5s5";
+   version="0.3.1.10304";
+   name="veracity-0.3.1.10304";
+   hash="0izbs3v7incy9799sh6idfy7r2mchq2v152k8qc1k5l2r1jq4vik";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10298.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10304.tar.gz";
   
   
 }
diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
new file mode 100644
index 00000000000..8af0db2fcc8
--- /dev/null
+++ b/pkgs/applications/video/kdenlive/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext,
+shared_mime_info, soprano}:
+
+stdenv.mkDerivation {
+  name = "kdenlive-0.7.7.1";
+  src = fetchurl {
+    url = mirror://sourceforge/kdenlive/kdenlive-0.7.7.1.tar.gz;
+    sha256 = "047kpzfdmipgnnkbdhcpy5c0kqgpg7yn3qhyd7inlplmyd3i1pfx";
+  };
+
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
+    shared_mime_info soprano ];
+
+  meta = {
+    description = "Free and open source video editor";
+    license = "GPLv2+";
+    homepage = http://www.kdenlive.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/video/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh
new file mode 100644
index 00000000000..92c7515c9a9
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "s|files.length|files.size|" \
+           -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
new file mode 100644
index 00000000000..51ae56cc8e4
--- /dev/null
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kmplayer-0.11.2a";
+  src = fetchurl {
+    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2a.tar.bz2;
+    sha256 = "1ddrghwsz11nhdxkca7jz0q2z1ajdb47n325h32jp5q7rm2qz80k";
+  };
+  builder = ./builder.sh;
+  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
+  meta = {
+    description = "MPlayer front-end for KDE";
+    license = "GPL";
+    homepage = http://kmplayer.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d03e30c6603..13b523648c5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
+{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
 , python, which, alsaLib, curl, gawk
 }:
 
 stdenv.mkDerivation {
-  name = "virtualbox-3.1.8-${kernel.version}";
+  name = "virtualbox-3.2.8-${kernel.version}";
 
   src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/3.1.8/VirtualBox-3.1.8-OSE.tar.bz2;
-    sha256 = "118y12k9kv8nfhgnzn3z4d8v75jz6nvy7y1il84cj09lnkkqlz5p";
+    url = http://download.virtualbox.org/virtualbox/3.2.8/VirtualBox-3.2.8-OSE.tar.bz2;
+    sha256 = "00qvgaqg4gsabrc0rba5rh0jxqrjzk2vn6qbkc6nlxvngha95klh";
   };
 
-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];
+  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam];
 
   patchPhase = "
     set -x
diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 0a0bf9d431d..b7a7d1ed31f 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -1,8 +1,36 @@
 { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
 , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
-, lvm2, utillinux, procps }:
+, lvm2, utillinux, procps, texinfo, perl }:
+
+with stdenv.lib;
+
+let
+
+  version = "4.0.1";
+
+  libDir = if stdenv.is64bit then "lib64" else "lib";
+
+  # Sources needed to build the stubdoms.
+
+  stubdomSrcs =
+    [ { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz;
+        sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp";
+      }
+      { url = http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz;
+        sha256 = "0pmh8kifb6sfkqfxc23wqp3f2wzk69sl80yz7w8p8cd4cz8cg58p";
+      }
+      { url = http://xenbits.xensource.com/xen-extfiles/newlib-1.16.0.tar.gz;
+        sha256 = "01rxk9js833mwadq92jx0flvk9jyjrnwrq93j39c2j2wjsa66hnv";
+      }
+      { url = http://xenbits.xensource.com/xen-extfiles/grub-0.97.tar.gz;
+        sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
+      }
+      { url = http://xenbits.xensource.com/xen-extfiles/pciutils-2.2.9.tar.bz2;
+        sha256 = "092v4q478i1gc7f3s2wz6p4xlf1wb4gs5shbkn21vnnmzcffc2pn";
+      }
+    ];
 
-let version = "4.0.1"; in 
+in 
 
 stdenv.mkDerivation {
   name = "xen-${version}";
@@ -20,12 +48,12 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ which zlib pkgconfig SDL openssl python libuuid gettext ncurses
-      dev86 iasl pciutils bzip2 xz
+      dev86 iasl pciutils bzip2 xz texinfo perl
     ];
 
   makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
 
-  buildFlags = "xen tools";
+  buildFlags = "xen tools stubdom";
 
   preBuild =
     ''
@@ -55,6 +83,29 @@ stdenv.mkDerivation {
 
       substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
         --replace /usr/sbin/qcow-create $out/sbin/qcow-create
+
+      substituteInPlace tools/python/xen/remus/save.py \
+        --replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save
+
+      substituteInPlace tools/python/xen/remus/device.py \
+        --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt
+
+      # Allow the location of the xendomains config file to be
+      # overriden at runtime.
+      substituteInPlace tools/hotplug/Linux/init.d/xendomains \
+        --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
+        --replace /bin/ls ls
+
+      # Xen's stubdoms need various sources that it usually fetches at
+      # build time using wget.  We can't have that.
+      ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
+        cp ${src} stubdom/${src.name}
+      '')}
+    '';
+
+  postBuild =
+    ''
+      make -C docs man-pages
     '';
 
   installPhase =
@@ -62,6 +113,7 @@ stdenv.mkDerivation {
       cp -prvd dist/install/nix/store/* $out
       cp -prvd dist/install/boot $out/boot
       cp -prvd dist/install/etc $out/etc
+      cp -dR docs/man1 docs/man5 $out/share/man/
     ''; # */
 
   postFixup =
@@ -80,5 +132,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.xen.org/;
     description = "Xen hypervisor and management tools for Dom0";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 741fcfd14c2..4bc0610082b 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,11 +4,11 @@
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 stdenv.mkDerivation rec {
-  name = "awesome-3.4.7";
+  name = "awesome-3.4.8";
  
   src = fetchurl {
-    url = http://awesome.naquadah.org/download/awesome-3.4.7.tar.xz;
-    sha256 = "1l5c730y17wxqm6p9fybjg84nk01jpg30wg14qjpc7xs5pd11993";
+    url = http://awesome.naquadah.org/download/awesome-3.4.8.tar.xz;
+    sha256 = "1mrdk8q0kj1p7zp5mchr2zl3cnja4z4ir0wx3yz5y361py5bjy78";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango