svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32321

30 files changed, 273 insertions, 104 deletions

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 91307deb2203a..236c7574d5ec9 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -4,23 +4,18 @@
 , alsaLib
 }:
 
-# XXX: ?
-# - checking for alsa >= 1.0.0... no
-# - checking for Wand >= 6.2.8... no
-# - imagemagickBig instead of imagemagick?
-
 assert (gtk != null) -> (pkgconfig != null);
 assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-24.0.92";
+  name = "emacs-24.0.93";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
-    sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6";
+    sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe";
   };
 
   buildInputs = 
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
new file mode 100644
index 0000000000000..8934238ffa3aa
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix
@@ -0,0 +1,34 @@
+{ fetchgit, stdenv, emacs }:
+
+# TODO: byte-compile in build phase - a buildEmacsPackage that does
+# that would be nice
+
+stdenv.mkDerivation rec {
+  name = "calfw-1.3-5-ga9b6615";
+
+  src = fetchgit {
+    url = "git://github.com/kiwanami/emacs-calfw.git";
+    rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d";
+    sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393";
+  };
+
+  buildInputs = [ emacs ];
+
+  installPhase =
+    ''
+       ensureDir "$out/share/doc/${name}"
+       cp -v readme.md "$out/share/doc/${name}"
+
+       ensureDir "$out/share/emacs/site-lisp/"
+       cp *.el "$out/share/emacs/site-lisp/"
+    '';
+
+  meta = {
+    description = "A calendar framework for Emacs";
+
+    license = "GPLv3+";
+
+    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index a7ff4e624a110..751330550f1a7 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     inherit date;
     cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
     module = "emacs-w3m";
-    sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a";
+    sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
   };
 
   buildInputs = [ emacs w3m texinfo autoconf ];
diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix
new file mode 100644
index 0000000000000..e5958021aa27b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/js2/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "js2-mode-0-20120130";
+
+  src = fetchgit {
+    url = "git://github.com/mooz/js2-mode.git";
+    rev = "4c008b1987aa53769899e24808b6d74b41b4ff40";
+    sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile js2-mode.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/
+  '';
+}
diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index f8a5d6a712fea..6ce382884ac28 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -1,6 +1,6 @@
-{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2
-, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah
-, regexBase, regexTdfa, strict, time, utf8String
+{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
+, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
+, processLeksah, regexBase, regexTdfa, strict, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary binaryShared deepseq glib gtk gtksourceview2 hslogger
-    leksahServer ltk mtl network parsec processLeksah regexBase
-    regexTdfa strict time utf8String
+    binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
+    hslogger leksahServer ltk mtl network parsec processLeksah
+    regexBase regexTdfa strict time utf8String
   ];
   noHaddock = true;
   meta = {
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 85388ffa6012d..0ac499f2681a2 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, djvulibre, qt4 }:
+{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
 
-stdenv.mkDerivation {
-	name = "djview4-4.1-2";
+stdenv.mkDerivation rec {
+	name = "djview-4.8";
 	src = fetchurl {
-		url = mirror://sf/djvu/djview4-4.1-2.tar.gz;
-		sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1";
+		url = "mirror://sourceforge/djvu/${name}.tar.gz";
+		sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
 	};
 
 	buildInputs = [djvulibre qt4];
 
+  buildNativeInputs = [ pkgconfig ];
+
+  patches = [ ./djview4-qt-4.8.patch ];
+
   passthru = {
     mozillaPlugin = "/lib/netscape/plugins";
   };
diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
new file mode 100644
index 0000000000000..ce3694197f60f
--- /dev/null
+++ b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
@@ -0,0 +1,38 @@
+Origin: OpenSUSE
+Index: djview-4.8/src/qdjvuwidget.cpp
+===================================================================
+--- djview-4.8.orig/src/qdjvuwidget.cpp
++++ djview-4.8/src/qdjvuwidget.cpp
+@@ -153,7 +153,7 @@ all_numbers(const char *s)
+ }
+ 
+ template<class T> static inline void 
+-swap(T& x, T& y)
++myswap(T& x, T& y)
+ {
+   T tmp;
+   tmp = x;
+@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
+       /* Sort v[lo], v[m], v[hi] by insertion */
+       m = (lo+hi)/2;
+       if (v[lo]>v[m])
+-        swap(v[lo],v[m]);
++        myswap(v[lo],v[m]);
+       if (v[m]>v[hi]) {
+-        swap(v[m],v[hi]);
++        myswap(v[m],v[hi]);
+         if (v[lo]>v[m])
+-          swap(v[lo],v[m]);
++          myswap(v[lo],v[m]);
+       }
+       /* Extract pivot, place sentinel */
+       pivot = v[m];
+@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
+       do ++l; while (v[l]<pivot);
+       do --h; while (v[h]>pivot);
+       if (l < h) { 
+-        swap(v[l],v[h]); 
++        myswap(v[l],v[h]); 
+         goto loop; 
+       }
+       /* Finish up */
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 490793d29f6df..ad35b75123153 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.11";
+  name = "gimp-2.6.12";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
+    sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
   
   buildInputs = [
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 795417dbf5b35..27b3c0c9b0324 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,25 +1,29 @@
-{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
-  pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut,
- glew, libXmu, libXi }:
+{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost
+, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa
+, freeglut, glew, libXmu, libXi, tclap }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2010.4.0";
+  name = "hugin-2011.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l";
+    sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
-  NIX_LDFLAGS = "-lrt";
+#NIX_LDFLAGS = "-lrt";
 
-  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
+  buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
     exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
 
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
+
   postInstall = ''
-    ensureDir "$out/nix-support"
-    echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
+    mkdir -p "$out/nix-support"
+    echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages
   '';
 
   meta = {
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 88e3d32080c5e..0c00553f2711a 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -7,10 +7,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-3.10.1";
+  name = "paraview-3.12.0";
   src = fetchurl {
-    url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz";
-    sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5";
+    url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz";
+    sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim";
   };
 
   # [  5%] Generating vtkGLSLShaderLibrary.h
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
 #    "-DPYTHON_LIBRARY="
   ];
 
-  # I don't enable it due to memory bounds
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
 
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index feb507c873205..e4899bfc463f5 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
 , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
 , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
-, gitSupport ? false
-, git ? null
-, monotoneSupport ? false
-, monotone ? null
+, YAMLLibYAML
+, gitSupport ? false, git ? null
+, monotoneSupport ? false, monotone ? null
 , extraUtils ? []
 }:
 
@@ -13,19 +12,19 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20120115";
+  version = "3.20120202";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f";
+    sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
     TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-    RpcXML XMLSimple PerlMagick YAML]
+    RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ]
     ++ stdenv.lib.optionals gitSupport [git]
     ++ stdenv.lib.optionals monotoneSupport [monotone];
 
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 355deec4092fe..cec2da54cf061 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,4 +1,5 @@
-{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
+{ cabal, Cabal, filepath, libXrandr, mtl, parsec, stm, time
+, utf8String, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  buildDepends = [
+    Cabal filepath mtl parsec stm time utf8String X11 X11Xft
+  ];
   extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";
   meta = {
diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
index 79869b324b9b6..3a688cb6669ed 100644
--- a/pkgs/applications/networking/browsers/firefox/10.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "10.0";
+  firefoxVersion = "10.0.1";
   
-  xulVersion = "10.0"; # this attribute is used by other packages
+  xulVersion = "10.0.1"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
+    sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc";
   };
   
   commonConfigureFlags =
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 89c3a10a45e8f..637744fc18219 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -23,8 +23,8 @@
 stdenv.mkDerivation {
   name = "pidgin-2.9.0";
   src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2;
-    sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8";
+    url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2;
+    sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8";
   };
 
   inherit nss ncurses;
diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix
index 07ca19b63cc50..c98a8ae4fd90e 100644
--- a/pkgs/applications/networking/linphone/default.nix
+++ b/pkgs/applications/networking/linphone/default.nix
@@ -2,16 +2,18 @@
   readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }:
         
 stdenv.mkDerivation rec {
-  name = "linphone-3.4.3";
+  name = "linphone-3.5.0";
 
   src = fetchurl {
-    url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz";
-    sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj";
+    url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
+    sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
   };
 
-  buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline
+  buildInputs = [ intltool gtk libglade libosip libexosip speex readline
     ffmpeg alsaLib SDL libv4l libtheora libXv ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     homepage = http://www.linphone.org/;
     description = "Open Source video SIP softphone";
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index dc4c0531031c5..2815266f2a15a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -58,9 +58,8 @@ stdenv.mkDerivation rec {
   '';
 
   # XXX: emacs tests broken
-  #postBuild = ''
-  #  make test
-  #'';
+  doCheck = false;
+  checkTarget = "test";
 
   meta = {
     description = "Notmuch -- The mail indexer";
diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
index 67254084d8e2e..003157dd1291d 100644
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix
@@ -5,14 +5,14 @@
 , unrar, p7zip, par2cmdline, coreutils
 }:
 
-let version = "0.8.0";
+let version = "0.8.1";
     name = "kwooty-${version}";
 in stdenv.mkDerivation {
   inherit name;
   
   src = fetchurl {
     url = "mirror://sourceforge/kwooty/${name}.tar.gz";
-    sha256 = "bb50fb9b3d6c973f2abee62cfc11a7086900a4b676c12bf4e0a2adc170a977fc";
+    sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4";
   };
 
   patches = [ ./searchPath.patch ];
@@ -33,6 +33,6 @@ in stdenv.mkDerivation {
     ];
                   
   meta = with stdenv.lib; {
-    description = "Binary news reader for KDE";
+    description = "Binary news reader of KDE";
   };
 }
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index afd16dbb2a8ac..4e02eb9f1e6aa 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
+{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
+, enablePlayer ? false, vlc ? null }:
 
-let rev = "22523"; in
+let rev = "24912"; in
 
 stdenv.mkDerivation {
-  name = "tribler-5.4.3-pre${rev}";
+  name = "tribler-5.5.13-pre${rev}";
 
   src = fetchsvn {
-    url = http://svn.tribler.org/abc/branches/release-5.4.x;
+    url = http://svn.tribler.org/abc/branches/release-5.5.x;
     inherit rev;
-    sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
+    sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@@ -34,7 +35,10 @@ stdenv.mkDerivation {
           --set _TRIBLERPATH $out/share/tribler \
           --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
           --run 'cd $_TRIBLERPATH' \
-          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
+          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
+          ${stdenv.lib.optionalString enablePlayer ''
+            --prefix LD_LIBRARY_PATH : ${vlc}/lib
+          ''}
     '';
 
   meta = {
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
new file mode 100644
index 0000000000000..89eed7310c2c5
--- /dev/null
+++ b/pkgs/applications/office/calligra/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
+, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
+, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4
+, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }:
+
+stdenv.mkDerivation rec {
+  name = "calligra-2.3.87";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/${name}/${name}.tar.bz2";
+    sha256 = "1arrk2ww3bykv4y8fsn1dn25gq9bf7a4ygggkrczfrxlbv1s9p9v";
+  };
+
+  buildNativeInputs = [ cmake perl pkgconfig ];
+
+  buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
+    createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
+    sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
+    shared_desktop_ontologies ];
+
+  meta = {
+    description = "A Qt/KDE office suite, formely known as koffice";
+    homepage = http://calligra.org;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix
index a400730878ea3..6715df077bf27 100644
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ b/pkgs/applications/office/hledger-interest/default.nix
@@ -1,4 +1,4 @@
-{ cabal, hledgerLib, mtl, time }:
+{ cabal, Cabal, hledgerLib, mtl, time }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hledgerLib mtl time ];
+  buildDepends = [ Cabal hledgerLib mtl time ];
   meta = {
     homepage = "http://github.com/peti/hledger-interest";
     description = "computes interest for a given account";
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 8d1b5afe4d0bb..da815c5fb6b44 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
-  shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
+{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
+, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-4.6.1";
+  name = "kmymoney-4.6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
-    sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz";
+    sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
   };
 
   buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
-  buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
+  buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
 
   KDEDIRS = libalkimia;
 
-  patches = [ ./qgpgme.patch ];
+  patches = [ ./qgpgme.patch ./qt-4.8.patch ];
 
   meta = {
     homepage = http://kmymoney2.sourceforge.net/;
diff --git a/pkgs/applications/office/kmymoney/qt-4.8.patch b/pkgs/applications/office/kmymoney/qt-4.8.patch
new file mode 100644
index 0000000000000..7e9a44337cd9f
--- /dev/null
+++ b/pkgs/applications/office/kmymoney/qt-4.8.patch
@@ -0,0 +1,32 @@
+From: Christoph Feck <christoph@maxiom.de>
+Date: Thu, 10 Nov 2011 11:34:20 +0000
+Subject: Fix compile with Qt 4.8
+X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&amp;a=commitdiff&amp;h=8324cfb9657d8c03f83691402386e8c5bfb29981
+---
+Fix compile with Qt 4.8
+
+Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
+fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
+---
+
+
+--- a/libkdchart/src/KDChartBackgroundAttributes.cpp
++++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "KDChartBackgroundAttributes.h"
+ #include <QPixmap>
++#include <QVariant>
+ 
+ #include <KDABLibFakes>
+ 
+@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
++	<< "pixmap="<<QVariant(ba.pixmap())
+ 	<< ")";
+     return dbg;
+ }
+
diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 5fde0cfa28503..d90beecd967a6 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -6,10 +6,13 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
 , autoconf, openldap, postgresql, bash
 , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
+, force ? false
 }:
 
-throw "The expression for libreoffice is still not ready"
-
+if !force then
+  throw ''The expression for libreoffice is still not ready.
+  Set config.libreoffice.force = true; if you want to try it anyway.''
+else
 stdenv.mkDerivation rec {
   name = "libreoffice-3.4.5.2";
 
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 77fe32d1792dd..9592f8f987182 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "11.08.0";
+  version = "12.01.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
-    sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df";
+    sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index e3f1742ee594b..272b0aefc5fdd 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -1,6 +1,6 @@
-{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html
-, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar
-, terminfo, text, zlib
+{ cabal, Cabal, curl, extensibleExceptions, filepath, hashedStorage
+, haskeline, html, HTTP, mmap, mtl, network, parsec, random
+, regexCompat, tar, terminfo, text, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -10,8 +10,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions hashedStorage haskeline html HTTP mmap mtl
-    network parsec random regexCompat tar terminfo text zlib
+    Cabal extensibleExceptions filepath hashedStorage haskeline html
+    HTTP mmap mtl network parsec random regexCompat tar terminfo text
+    zlib
   ];
   extraLibraries = [ curl ];
   meta = {
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 6f5d36f6aa74a..534a00a357bed 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, ruby, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "svn2git-2.1.0-20111206";
+  name = "svn2git-2.2.0";
 
   src = fetchgit {
     url = https://github.com/nirvdrum/svn2git;
-    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
-    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
+    rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
+    sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
   };
 
   buildInputs = [ ruby makeWrapper ];
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 9e31e9906c62e..6e0f65d4caa9d 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.2";
+  version = "1.7.3";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
+    sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 8e11dd6068d67..02000ffeb2125 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -19,20 +19,23 @@ stdenv.mkDerivation rec {
     sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
   };
 
-  buildInputs = [
-    perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-    dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
-    libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-    udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass libdvbpsi
-  ]
-  ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
+  buildInputs =
+    [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+      dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+      libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
+      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
+    ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  configureFlags = [ "--enable-alsa"
-    "--with-kde-solid=$out/share/apps/solid/actions"
-  ];
+  configureFlags =
+    [ "--enable-alsa"
+      "--with-kde-solid=$out/share/apps/solid/actions"
+    ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 6bb06f7d4a561..5c443b6d3a25b 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -1,5 +1,5 @@
-{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
-, xmonad
+{ cabal, Cabal, extensibleExceptions, mtl, random, utf8String, X11
+, X11Xft, xmonad
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.10";
   sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
   buildDepends = [
-    extensibleExceptions mtl random utf8String X11 X11Xft xmonad
+    Cabal extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
   meta = {
     homepage = "http://xmonad.org/";
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 249310b6411cf..b88841426a330 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -1,4 +1,4 @@
-{ cabal, hint, HList, libmpd, mtl, network, parsec, random
+{ cabal, Cabal, hint, HList, libmpd, mtl, network, parsec, random
 , regexPosix, split, X11, xmonad, xmonadContrib
 }:
 
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.10.1";
   sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
   buildDepends = [
-    hint HList libmpd mtl network parsec random regexPosix split X11
-    xmonad xmonadContrib
+    Cabal hint HList libmpd mtl network parsec random regexPosix split
+    X11 xmonad xmonadContrib
   ];
   noHaddock = true;
   meta = {