* Another sync with the trunk.

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

20 files changed, 370 insertions, 144 deletions

diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
new file mode 100644
index 00000000000..511e284ed39
--- /dev/null
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "elvis-2.2_0";
+
+  src = fetchurl {
+    url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz;
+    sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
+  };
+
+  buildInputs = [ ncurses ];
+
+  patchPhase = ''
+    sed -i s/-lcurses/-lncurses/ configure
+  '';
+
+  preConfigure = ''
+    ensureDir $out/share/man/man1
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/elvis $out/share/elvis/doc
+    cp elvis ref elvtags elvfmt $out/bin
+    cp -R data/* $out/share/elvis
+    cp doc/* $out/share/elvis/doc
+
+    ensureDir $out/share/man/man1
+    for a in doc/*.man; do
+      cp $a $out/share/man/man1/`basename $a .man`.1
+    done
+  '';
+
+  configureFlags = "--ioctl=termios";
+
+  meta = {
+    homepage = http://elvis.vi-editor.org/;
+    description = "A vi clone for Unix and other operating systems";
+    license = "free";
+  };
+}
diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
new file mode 100644
index 00000000000..9e576bb9109
--- /dev/null
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -0,0 +1,26 @@
+{cabal, gtk2hs, binary, parsec, regexPosix, utf8String, libedit, makeWrapper}:
+
+cabal.mkDerivation (self : {
+  pname = "leksah";
+  version = "0.4.4.1";
+  sha256 = "092a8gi73jhalgs4ppg8ki761vwk3gdnjwlyd4chnahbv5i1wrjw";
+
+  # !!! The explicit libedit dependency shouldn't be necessary.
+  extraBuildInputs = [gtk2hs binary parsec regexPosix utf8String libedit makeWrapper];
+
+  preConfigure =
+    ''
+      substituteInPlace leksah.cabal --replace 'Cabal ==1.6.0.1' 'Cabal >=1.6.0.1' 
+    '';
+
+  postInstall =
+    ''
+      wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS : ${gtk2hs.gtksourceview}/share
+    '';
+  
+  meta = {
+    homepage = http://leksah.org/;
+    description = "An Integrated Development Environment for Haskell written in Haskell";
+  };
+})  
+
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
new file mode 100644
index 00000000000..6f33758ce4f
--- /dev/null
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -0,0 +1,49 @@
+{ fetchurl, stdenv, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "nvi-1.79";
+
+  src = fetchurl {
+    url = ftp://ftp.bostic.com/pub/nvi-1.79.tar.gz;
+    sha256 = "0cvf56rbylz7ksny6g2256sjg8yrsxrmbpk82r64rhi53sm8fnvm";
+  };
+
+  buildInputs = [ ncurses ];
+
+  # nvi tries to write to a usual tmp directory (/var/tmp),
+  # so we will force it to use /tmp.
+  patchPhase = ''
+    sed -i -e s/-lcurses/-lncurses/ \
+      -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \
+      -e s@/var/tmp@@ build/configure
+  '';
+
+  configurePhase = ''
+    mkdir mybuild
+    cd mybuild
+    ../build/configure --prefix=$out --disable-curses
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/vi/catalog
+    for a in dutch english french german ru_SU.KOI8-R spanish swedish; do
+      cp ../catalog/$a $out/share/vi/catalog
+    done
+    cp nvi $out/bin/nvi
+    ln -s $out/bin/nvi $out/bin/vi
+    ln -s $out/bin/nvi $out/bin/ex
+    ln -s $out/bin/nvi $out/bin/view
+
+    ensureDir $out/share/man/man1
+    cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1
+    ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi
+    ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex
+    ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/view
+  '';
+
+  meta = {
+    homepage = http://www.bostic.com/vi/;
+    description = "The Berkeley Vi Editor";
+    license = "free";
+  };
+}
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 4e767177e29..7c7fa4c88cc 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11}:
+{cabal, X11, mtl, parsec, stm}:
 
 cabal.mkDerivation (self : {
   pname = "xmobar";
   name = "${self.fname}";
-  version = "0.8";
-  sha256 = "88aa5bc0715e2592282e5897bc7938f16580804f56757bc71ed3762bf86c9415";
-  extraBuildInputs = [X11];
+  version = "0.9.2";
+  sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
+  extraBuildInputs = [X11 mtl parsec stm];
   meta = {
     description = "xmobar is a minimalistic text based status bar";
   };
diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 5077463f1b2..0c8ebc85139 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -5,6 +5,11 @@ export NO_HIDS=TRUE
 
 export PATH=$icu/sbin:$PATH
 
+postUnpack=postUnpack
+postUnpack() {
+  tar xvjf $src_system
+}
+
 preConfigure=preConfigure
 preConfigure() {
     for i in sysui/desktop/share/makefile.mk; do 
@@ -51,7 +56,7 @@ wrapSOffice() {
 # looks for it at runtime.
 export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
 export JAVA_HOME=$jdk
-exec $ooFiles/program/soffice $arg "\$@"
+exec $ooFiles/openoffice.org3/program/soffice $arg "\$@"
 EOF
     chmod +x $out/bin/$fn
 }
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index d525ab42fc6..a5a422e0f94 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
-, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
+{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
+, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl
+, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
+, libXinerama, openssl, gperf, cppunit
 }:
 
-let version = "2.4.1"; in
+let version = "3.0.1"; in
 stdenv.mkDerivation rec {
   name = "openoffice.org-${version}";
   builder = ./builder.sh;
 
-  src =
-    fetchurl {
+  src = fetchurl {
       url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=${version}";
       name = "OOo_${version}_src_core.tar.bz2";
-      sha256 = "1405l6xb1qy6l43n9nli8hhay917nyr8a69agj483aaiskrpdxdb";
+      sha256 = "0fgk7n766lzsxn09p8g5ddabw568jw56k9bcdc02nlmk6k3a9qq0";
+    };
+
+  patches = [ ./oo.patch ];
+
+  src_system = fetchurl {
+      url = "http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=system&version=${version}";
+      name = "OOo_${version}_src_system.tar.bz2";
+      sha256 = "1zp8lbn5x9wwbv82inqkanaip4l2jyiybjqv1dpx7wbh6nrasgdv";
     };
 
   configureFlags = "
@@ -28,7 +35,6 @@ stdenv.mkDerivation rec {
     --disable-mozilla
     --disable-odk
     --disable-pasf
-    --disable-qadevooo
     --with-cairo
     --with-system-libs
     --with-system-python
@@ -49,24 +55,24 @@ stdenv.mkDerivation rec {
     --without-system-xml-apis
     --without-system-xt
     --without-system-db
-    --with-system-hsqldb
-    --with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
+    --without-system-jars
+    --without-system-hunspell
+    --without-system-altlinuxhyph
+    --without-system-lpsolve
   ";
 
   LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
 
   buildInputs = [
-    pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
+    pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl
+    cups libXinerama openssl gperf
   ];
 
   inherit icu fontconfig libjpeg jdk cups;
 
-  patches = [./ooo-libtextcat.patch ];
-
   meta = {
     description = "OpenOffice.org is a multiplatform and multilingual office suite";
     homepage = http://www.openoffice.org/;
diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch
new file mode 100644
index 00000000000..1234d961fd1
--- /dev/null
+++ b/pkgs/applications/office/openoffice/oo.patch
@@ -0,0 +1,72 @@
+diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
+index 602b9b1..6be8427 100644
+--- a/libtextcat/makefile.mk
++++ b/libtextcat/makefile.mk
+@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
+ #CONFIGURE_DIR=$(BUILD_DIR)
+ 
+ #relative to CONFIGURE_DIR
+-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
++CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
+ CONFIGURE_FLAGS=
+ 
+ BUILD_ACTION=make
+diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
+index 0e64d50..547d66b 100644
+--- a/redland/raptor/makefile.mk
++++ b/redland/raptor/makefile.mk
+@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
+index 850ee9c..3293a79 100644
+--- a/redland/rasqal/makefile.mk
++++ b/redland/rasqal/makefile.mk
+@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
+index 5719272..75c31b7 100644
+--- a/redland/redland/makefile.mk
++++ b/redland/redland/makefile.mk
+@@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB)
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff --git a/hunspell/hunspell-1.1.12.patch b/hunspell/hunspell-1.1.12.patch
+index 37b7964..e6fd962 100644
+--- a/hunspell/hunspell-1.1.12.patch
++++ b/hunspell/hunspell-1.1.12.patch
+@@ -487,3 +487,15 @@
+  i68568utf.test \
+  1706659.test \
+  digits_in_words.test \
++diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
++index 90080f6..f069517 100755
++--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
+++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
++--- misc/hunspell-1.1.12/tests/test.sh	Sep  4 01:25:35 2007
+++++ misc/build/hunspell-1.1.12/tests/test.sh	Jun 18 11:53:11 2008
++@@ -1,4 +1,4 @@
++-#!/bin/bash
+++#!/bin/sh
++ export LC_ALL="C"
++ 
++ function check_valgrind_log () {
diff --git a/pkgs/applications/office/openoffice/ooo-libtextcat.patch b/pkgs/applications/office/openoffice/ooo-libtextcat.patch
deleted file mode 100644
index 6fe7b7108c3..00000000000
--- a/pkgs/applications/office/openoffice/ooo-libtextcat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- OOH680_m17/libtextcat/makefile.mk	2008-01-02 18:33:39.000000000 +0100
-+++ OOH680_m17/libtextcat/makefile.mk	2008-08-14 15:52:19.000000000 +0200
-@@ -62,6 +62,6 @@ ADDITIONAL_FILES= \
- 
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)"
--CONFIGURE_FLAGS=
-+CONFIGURE_FLAGS=--prefix="${out}"
- 
- BUILD_ACTION=make
diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index be68791cd2d..c0efa78553b 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, zlib, ncurses, curl, perl}:
+{cabal, html, mtl, parsec, regexCompat, zlib, curl} :
 
-stdenv.mkDerivation {
-  name = "darcs-2.1.0";
-  src = fetchurl {
-    url = http://www.darcs.net/darcs-2.1.0.tar.gz;
-    sha256 = "d5a63e62bceb45905163d508c6b25158dab6aca367015566d8c539ec37107ab4";
-  };
-
-  buildInputs = [ghc zlib ncurses curl perl];
+cabal.mkDerivation (self : {
+  pname = "darcs";
+  name = self.fname;
+  version = "2.2.1";
+  sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
-  NIX_LDFLAGS = "-lz";
+  extraBuildInputs = [html mtl parsec regexCompat zlib curl];
 
   meta = {
+    homepage = http://darcs.net/;
     description = "Patch-based version management system";
   };
 
   patches = ./bash-completion.patch; # I didn't have "have"
-}
+})
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
deleted file mode 100644
index 336d37ad2c8..00000000000
--- a/pkgs/applications/version-management/darcs/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, ghc, zlib, ncurses, curl, getConfig}:
-
-# you really should consider using darcs2 and updating your darcs-1 repos ..
-# many performance improvements have been made if you use the darcs-2 or hashed format
-# (darcs-2 is default now when runnig darcs 2.1.0)
-# lookup darcs convert and make sure you understand the one way conversion..
-assert getConfig ["darcs" "IreallyWantDarcsOne"] false;
-
-stdenv.mkDerivation {
-  name = "darcs-1.0.9";
-  src = fetchurl {
-    url = http://www.darcs.net/darcs-1.0.9.tar.gz;
-    sha256 = "a5fe4d5a743d8052d6cbfcea480a44593f821afd8a42e6d6d4ae37d40ed23cd8";
-  };
-  buildInputs = [ghc zlib ncurses curl];
-
-  NIX_LDFLAGS = "-lz";
-
-  meta = {
-    description = "Patch-based version management system";
-  };
-}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d16b166416f..562fd3a91f9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,7 @@ rec {
       cpio tcl tk makeWrapper subversion;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   gitGit = import ./git/git-git.nix {
@@ -26,7 +26,7 @@ rec {
     inherit (bleedingEdgeRepos) sourceByName;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/1.6.nix
index 6d40142c4bc..625a74b2bd8 100644
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/1.6.nix
@@ -20,13 +20,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.0";
+  version = "1.6.1";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha256 = "d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2";
+    sha256 = "1jp6i7vmz0vd1zf4y896f7jzabwv81x8brwzp5kpkrn6wajagm6d";
   };
 
   buildInputs = [zlib apr aprutil sqlite]
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 501c7c33df1..2029c98037f 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
 
   buildInputs =(with args; [
       automake autoconf libtool pkgconfig
-      X11 faad2 faac
+      faad2 faac
       a52dec alsaLib   fftw lame libavc1394 libiec61883
       libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
       mjpegtools x264 gettext openexr esound 
diff --git a/pkgs/applications/virtualization/virtualbox/1.5.2.nix b/pkgs/applications/virtualization/virtualbox/1.5.2.nix
deleted file mode 100644
index a0d4dc89b68..00000000000
--- a/pkgs/applications/virtualization/virtualbox/1.5.2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://www.virtualbox.org/download/1.5.2/VirtualBox-1.5.2_OSE.tar.bz2;
-			sha256 = "1g9rvkqjcsfx36gwk6i9c0bml6053xx2mdn1sn7vyyy0sgwkwk53";
-		};
-		buildInputs = [libXcursor bridge_utils umlutilities kernelHeaders 
-		      wine jre libxslt libIDL SDL qt3 openssl zlib];
-		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "VirtualBox-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Virtual Box is just software for running virtual machines. 
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/virtualization/virtualbox/2.1.2.nix b/pkgs/applications/virtualization/virtualbox/2.1.2.nix
deleted file mode 100644
index b33c58455fa..00000000000
--- a/pkgs/applications/virtualization/virtualbox/2.1.2.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel}:
-
-stdenv.mkDerivation {
-  name = "virtualbox-2.1.2";
-
-  src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/2.1.2/VirtualBox-2.1.2-OSE.tar.bz2;
-    sha256 = "d3c1ae8ed7594094aaf8496204c5415479e1943e5b5179c5baae8a66885362de";
-  };
-
-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel];
-
-  patchPhase = "
-    set -x
-    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
-    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
-        -i configure
-    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
-    export USER=nix
-    set +x
-  ";
-
-  configurePhase = ''
-    # It wants the qt utils from qt3, and it takes them from QTDIR
-    export QTDIR=${qt3}
-    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
-    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-        -i AutoConfig.kmk
-    sed -e 's@arch/x86/@@' \
-        -i Config.kmk
-    cat >> AutoConfig.kmk << END_PATHS
-    VBOX_PATH_APP_PRIVATE := $out
-    VBOX_PATH_APP_DOCS := $out/doc
-    END_PATHS
-  '';
-
-  buildPhase = "
-    source env.sh
-    kmk
-  ";
-    
-  
-  meta = {
-    description = "PC emulator";
-    homepage = http://www.virtualbox.org/;
-  };
-}
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
new file mode 100644
index 00000000000..fa1a0563339
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
+, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
+, python, which
+}:
+
+stdenv.mkDerivation {
+  name = "virtualbox-2.2.0-${kernel.version}";
+
+  src = fetchurl {
+    url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2;
+    sha256 = "8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71";
+  };
+
+  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python];
+
+  patchPhase = "
+    set -x
+    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
+    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
+        -i configure
+    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
+    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
+    export USER=nix
+    set +x
+  ";
+
+  configurePhase = ''
+    # It wants the qt utils from qt3, and it takes them from QTDIR
+    export QTDIR=${qt3}
+    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
+    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
+        -i AutoConfig.kmk
+    sed -e 's@arch/x86/@@' \
+        -i Config.kmk
+    cat >> AutoConfig.kmk << END_PATHS
+    VBOX_PATH_APP_PRIVATE := $out
+    VBOX_PATH_APP_DOCS := $out/doc
+    END_PATHS
+  '';
+
+  buildPhase = ''
+    source env.sh
+    kmk
+    cd out/linux.*/release/bin/src
+    export KERN_DIR=${kernel}/lib/modules/*/build
+    make
+    cd ../../../../..
+  '';
+    
+  installPhase = ''
+    cd out/linux.*/release/bin
+    ensureDir $out/virtualbox
+    cp -av * $out/virtualbox
+    cd src
+    kernelVersion=$(cd ${kernel}/lib/modules; ls)
+    export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
+    ensureDir $MODULE_DIR    
+    make install
+    ensureDir $out/bin
+    cp -v ${./VBox.sh} $out/bin/VBox.sh
+    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
+           -e "s|@QT4_PATH@|${qt4}/lib|" \
+	   -e "s|which|${which}/bin/which|" \
+	   -e "s|gawk|${stdenv.gawk}/bin/gawk|" \
+	   $out/bin/VBox.sh
+    chmod 755 $out/bin/VBox.sh
+    for file in VirtualBox VBoxManage VBoxSDL
+    do
+        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
+    done
+    ensureDir $out/share/applications
+    ln -sfv $out/virtualbox/VirtualBox.desktop $out/share/applications
+  '';
+  
+  meta = {
+    description = "PC emulator";
+    homepage = http://www.virtualbox.org/;
+  };
+}
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
new file mode 100644
index 00000000000..fa2e6efb30c
--- /dev/null
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm}:
+
+stdenv.mkDerivation {
+  name = "vwm-2.0.1";
+ 
+  src = fetchurl {
+    url = mirror://sourceforge/vwm/vwm-2.0.1.tar.gz;
+    sha256 = "1kn1ga35kvl10s3xvgr5ys18gd4pp0gwah4pnvmfkvg0xazjrc0h";
+  };
+
+  prePatch = ''
+    sed -i -e s@/usr/local@$out@ \
+      -e s@/usr/lib@$out/lib@ \
+      -e 's@tic vwmterm@tic -o '$out/lib/terminfo' vwmterm@' \
+      -e /ldconfig/d Makefile modules/*/Makefile vwm.h
+  '';
+
+  patches = [ ./signal.patch ];
+
+  preInstall = ''
+    ensureDir $out/bin $out/include
+  '';
+ 
+  buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm];
+ 
+  meta = {
+    homepage = http://vwm.sourceforge.net/;
+    description = "Dynamic window manager for the console";
+    license="GPLv2+";
+  };
+}
diff --git a/pkgs/applications/window-managers/vwm/signal.patch b/pkgs/applications/window-managers/vwm/signal.patch
new file mode 100644
index 00000000000..b6cac4d262a
--- /dev/null
+++ b/pkgs/applications/window-managers/vwm/signal.patch
@@ -0,0 +1,22 @@
+diff --git a/modules/vwmterm2/signals.c b/modules/vwmterm2/signals.c
+index 239e7f2..07d78fd 100644
+--- a/modules/vwmterm2/signals.c
++++ b/modules/vwmterm2/signals.c
+@@ -1,4 +1,5 @@
+ #include <vwm.h>
++#include <signal.h>
+ 
+ struct sigaction* vwmterm_sigset(int signum,sighandler_t handler)
+ {
+diff --git a/vwm_private.h b/vwm_private.h
+index 2d48ebf..46457bd 100644
+--- a/vwm_private.h
++++ b/vwm_private.h
+@@ -2,6 +2,7 @@
+ #define _H_VWM_PRIVATE_
+ 
+ #include <glib.h>
++#include <signal.h>
+ 
+ #ifdef _VIPER_WIDE
+ #include <ncursesw/curses.h>
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index ed01ddd3e33..1207f2627fa 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11, xmessage}:
+{cabal, X11, mtl, xmessage}:
 
 cabal.mkDerivation (self : {
   pname = "xmonad";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "d5ee338eb6d0680082e20eaafa0b23b32358fffe69e2ec4ad7bdf6e03c751d67";
-  extraBuildInputs = [X11];
+  version = "0.8.1";
+  sha256 = "9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c";
+  propagatedBuildInputs = [X11 mtl];
   meta = {
     description = "xmonad is a tiling window manager for X";
   };
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 2c0e250470f..9793eba3d76 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "xmonad-contrib";
   name = "${self.fname}";
-  version = "0.7";
-  sha256 = "4034d0c8ce092fc9b4e9d9ecf89bc9c16c4ac28aad190f074edc9e4201db0697";
+  version = "0.8.1";
+  sha256 = "dedbd2e7718f7383e403f5f0b40d411f27099625e7e1dcddd42f7c12bf6488a9";
   extraBuildInputs = [X11 xmonad];
   meta = {
     description = "a huge extension library for xmonad";