* Sync with the trunk.

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

33 files changed, 241 insertions, 278 deletions

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 4467ae338e4..1c152195d68 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, clapack, mysql }:
+shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
   name = "digikam-2.5.0";
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 0c00553f271..ba67a755de4 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -3,7 +3,7 @@
 , mpich2
 , python
 , libxml2
-, mesa
+, mesa, libXt
 }:
 
 stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
+  buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
 
   meta = {
     homepage = "http://www.paraview.org/";
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 80c28461992..e4ab5798918 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "xfig-${version}";
 
   src = fetchurl {
-    url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";
+    url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
     sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
   };
 
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
   meta = {
     description = "An interactive drawing tool for X11";
     homepage = http://xfig.org;
+    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
   };
 }
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 534a00a357b..6f5d36f6aa7 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.2.0";
+  name = "svn2git-2.1.0-20111206";
 
   src = fetchgit {
     url = https://github.com/nirvdrum/svn2git;
-    rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
-    sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
+    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
+    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
   };
 
   buildInputs = [ ruby makeWrapper ];
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f873f4e7475..6bb3431668f 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,13 +1,19 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick}:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
+fftw, fftwSinglePrec, zlib, curl }:
 
-stdenv.mkDerivation {
-  name = "octave-3.2.4";
+stdenv.mkDerivation rec {
+  name = "octave-3.4.3";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
-    sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
+    url = "mirror://gnu/octave/${name}.tar.bz2";
+    sha256 = "0j61kpfbv8l8rw3r9cwcmskvvav3q2f6plqdq3lnb153jg61klcl";
   };
-  buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick ];
-  configureFlags = "--enable-readline --enable-dl";
+
+  buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
+    graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+    fftw fftwSinglePrec ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [ "--enable-readline" "--enable-dl" ];
 }
diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix
deleted file mode 100644
index d1c081f45d8..00000000000
--- a/pkgs/development/libraries/clapack/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, cmake}:
-
-stdenv.mkDerivation rec {
-  name = "clapack-3.2.1";
-
-  src = fetchurl {
-    url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz;
-    sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb";
-  };
-
-  buildNativeInputs = [ cmake ];
-
-  installPhase = ''
-    mkdir -p $out/include $out/lib
-    cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib
-    cp ../INCLUDE/* $out/include
-  '';
-
-  doCheck = true;
-  checkPhase = "ctest";
-
-  meta = {
-    homepage = http://www.netlib.org/clapack/;
-    description = "f2c'ed version of LAPACK";
-    license = "BSD";
-  };
-}
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 8adf60f938c..da1e8df9715 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SDL";
-  version = "0.6.2";
-  sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly";
+  version = "0.6.3";
+  sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp";
   extraLibraries = [ SDL ];
   meta = {
     description = "Binding to libSDL";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index d1a26389c7a..e2963b2ad20 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.2.1";
-  sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9";
+  version = "0.2.2";
+  sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 35b5a8d2440..d36f351fcf6 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.10.1.2";
-  sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn";
+  version = "0.10.2";
+  sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index f93da3ee549..c310637cacd 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.0.2";
-  sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r";
+  version = "1.1.1.0";
+  sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index ec3f63d1eaa..77cf2cf00e5 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -1,18 +1,19 @@
-{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData
-, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
-, sendfile, syb, text, time, utf8String, xhtml, zlib
+{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
+, filepath, hslogger, html, monadControl, mtl, network, parsec
+, sendfile, syb, text, time, transformers, transformersBase
+, utf8String, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.2.5";
-  sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
+  version = "6.6.3";
+  sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml extensibleExceptions filepath happstackData happstackUtil
-    hslogger html MaybeT mtl network parsec sendfile syb text time
-    utf8String xhtml zlib
+    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
+    html monadControl mtl network parsec sendfile syb text time
+    transformers transformersBase utf8String xhtml zlib
   ];
   meta = {
     homepage = "http://happstack.com";
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 3b7a197c49e..cc1827ac342 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.2.0";
-  sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc";
+  version = "9.2.1";
+  sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index d8a9bf24f55..2193b818868 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "0.6";
-  sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v";
+  version = "0.6.1";
+  sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
   buildDepends = [ dlist ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 7699e4d291b..208f4e82b0e 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.10.1";
-  sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0";
+  version = "0.10.2.1";
+  sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     shakespeareI18n shakespeareJs text time transformers
     transformersBase vector wai waiExtra waiLogger yesodRoutes
   ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 3b1d6e9170d..981f5500f49 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.4.1";
-  sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s";
+  version = "0.4.2";
+  sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index e2d9083eda4..1c5e0d9068e 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
-  name = "atlas-3.9.11";
+  name = "atlas-3.9.67";
   
   src = fetchurl {
-    url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
-    sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
+    url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
+    sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
   };
 
   # configure outside of the source directory
diff --git a/pkgs/development/libraries/science/math/liblapack/blas-link.patch b/pkgs/development/libraries/science/math/liblapack/blas-link.patch
deleted file mode 100644
index e1ff853a291..00000000000
--- a/pkgs/development/libraries/science/math/liblapack/blas-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile
---- lapack-3.2.old/SRC/Makefile	2009-02-04 11:33:35.006839507 +0100
-+++ lapack-3.2/SRC/Makefile	2009-02-04 11:33:51.987551506 +0100
-@@ -367,7 +367,7 @@
- 	$(ALLAUX)
- 
- ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB}
- 	$(RANLIB) $@
- 
- single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
-diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Makefile
---- lapack-3.2.old/TESTING/MATGEN/Makefile	2009-02-04 11:35:10.426806473 +0100
-+++ lapack-3.2/TESTING/MATGEN/Makefile	2009-02-04 11:34:42.850565181 +0100
-@@ -60,7 +60,7 @@
- 
- ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)	\
- 		$(ZMATGEN) $(DZATGEN)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB}
- 	$(RANLIB) $@
- 
- single: $(SMATGEN) $(SCATGEN)
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 3537dd3b4af..acede395c84 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,66 +1,23 @@
-{ stdenv, fetchurl, gfortran, blas }:
+{ stdenv, fetchurl, gfortran, atlas, cmake }:
 
 stdenv.mkDerivation {
-  name = "liblapack-3.2.1";
+  name = "liblapack-3.4.0";
   src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz";
-    sha256 = "5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d";
+    url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz";
+    sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
   };
 
-  buildInputs = [gfortran blas];
-  patches = [ ./blas-link.patch ];
+  propagatedBuildInputs = [ atlas ];
+  buildInputs = [ gfortran cmake ];
 
-  configurePhase = ''
-    echo >make.inc  "SHELL = ${stdenv.shell}"
-    echo >>make.inc "PLAT ="
-    echo >>make.inc "FORTRAN = gfortran"
-    echo >>make.inc "OPTS = -O2 -fPIC"
-    echo >>make.inc "DRVOPTS = \$(OPTS)"
-    echo >>make.inc "NOOPT = -O0 -fPIC"
-    echo >>make.inc "LOADER = gfortran"
-    echo >>make.inc "LOADOPTS ="
-    echo >>make.inc "TIMER = INT_ETIME"
-    echo >>make.inc "ARCH = gfortran"
-    echo >>make.inc "ARCHFLAGS = -shared -o"
-    echo >>make.inc "RANLIB = echo"
-    echo >>make.inc "BLASLIB = -lblas"
-    echo >>make.inc "LAPACKLIB = liblapack.so.3"
-    echo >>make.inc "TMGLIB = libtmglib.so.3"
-    echo >>make.inc "EIGSRCLIB = libeigsrc.so.3"
-    echo >>make.inc "LINSRCLIB = liblinsrc.so.3"
-  '';
+  cmakeFlags = [
+    "-DUSE_OPTIMIZED_BLAS=ON"
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
+    "-DCMAKE_Fortran_FLAGS=-fPIC"
+  ];
 
-  buildPhase = ''
-    make clean
-    make lib
-    echo >make.inc  "SHELL = ${stdenv.shell}"
-    echo >>make.inc "PLAT ="
-    echo >>make.inc "FORTRAN = gfortran"
-    echo >>make.inc "OPTS = -O2 -fPIC"
-    echo >>make.inc "DRVOPTS = \$(OPTS)"
-    echo >>make.inc "NOOPT = -O0 -fPIC"
-    echo >>make.inc "LOADER = gfortran"
-    echo >>make.inc "LOADOPTS = "
-    echo >>make.inc "TIMER = INT_ETIME"
-    echo >>make.inc "ARCH = ar rcs"
-    echo >>make.inc "RANLIB = ranlib"
-    echo >>make.inc "BLASLIB = "
-    echo >>make.inc "ARCHFLAGS ="
-    echo >>make.inc "LAPACKLIB    = liblapack.a"
-    echo >>make.inc "TMGLIB       = tmglib.a"
-    echo >>make.inc "EIGSRCLIB    = eigsrc.a"
-    echo >>make.inc "LINSRCLIB    = linsrc.a"
-    make clean
-    make lib
-  '';
-
-  installPhase = ''
-    mkdir -p "$out/lib"
-    install -m755 *.a* "$out/lib"
-    install -m755 *.so* "$out/lib"
-    ln -sf liblapack.so.3 "$out/lib/liblapack.so"
-    ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
-  '';
+  enableParallelBuilding = true;
 
   meta = {
     description = "Linear Algebra PACKage";
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index f5a7724c506..60b148f870e 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coin3d, qt4 }:
+{ fetchurl, stdenv, coin3d, qt4, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "soqt-${version}";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ coin3d qt4 ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     homepage = http://www.coin3d.org/;
     license = "GPLv2+";
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 76e102ff69c..0e5b1ae7aa0 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.23";
-  sha256 = "0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr";
+  version = "1.8.24";
+  sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index 0b54e828609..6234d3702f7 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
                           else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
              }
     else
-      abort "And Yet It Moves nix package only supports linux and intel cpu's.";
+      throw "And Yet It Moves nix package only supports linux and intel cpu's.";
 
   phases = "unpackPhase installPhase";
 
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 586bfc3e511..0f9da888382 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
-  asio, boost, SDL_gfx }:
+  asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "vdrift-2010-06-30";
+  name = "vdrift-2011-10-22";
 
   src = fetchurl {
     url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
-    sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
+    sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s";
   };
 
   buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
-    SDL_gfx ];
+    SDL_gfx pkgconfig bullet curl libarchive ];
 
   buildPhase = ''
     sed -i -e s,/usr/local,$out, SConstruct
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index eb5a51ae6ea..522478ed5b7 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,17 +1,15 @@
-{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
+{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
 
-let
+stdenv.mkDerivation rec {
   version = "0.7.3";
+  
+  name = "wpa_supplicant-${version}";
+
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
     sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
   };
-in
-
-(stdenv.mkDerivation rec {
-  name = "wpa_supplicant-${version}";
-  inherit src;
-
+  
   preBuild = ''
     cd wpa_supplicant
     cp -v defconfig .config
@@ -23,24 +21,25 @@ in
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [openssl dbus_libs libnl1];
+  buildInputs = [ openssl dbus_libs libnl1 ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  # Upstream patch required for NetworkManager-0.9
-  patches = [ (fetchurl {
-    url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
-    name = "wpa_supplicant-nm-0.9.patch";
-    sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
-    })
-    # wpa_supplicant crashes when controlled through dbus (wicd/nm)
-    # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
-    (fetchurl {
-      url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
-      name = "dbus-assertion-fix.patch";
-      sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
-    })
-  ];
+  patches =
+    [ # Upstream patch required for NetworkManager-0.9
+      (fetchurl {
+        url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
+        name = "wpa_supplicant-nm-0.9.patch";
+        sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
+      })
+      # wpa_supplicant crashes when controlled through dbus (wicd/nm)
+      # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
+      (fetchurl {
+        url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
+        name = "dbus-assertion-fix.patch";
+        sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+      })
+    ];
 
   postInstall = ''
     mkdir -p $out/share/man/man5 $out/share/man/man8
@@ -50,7 +49,7 @@ in
     cp -v dbus/*service $out/share/dbus-1/system-services
     sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
     cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
-  '';
+  ''; # */
 
   meta = {
     homepage = http://hostap.epitest.fi/wpa_supplicant/;
@@ -58,41 +57,4 @@ in
     maintainers = with stdenv.lib.maintainers; [marcweber urkud];
     platforms = stdenv.lib.platforms.linux;
   };
-}) // {
-gui = stdenv.mkDerivation {
-  name = "wpa_gui-${version}";
-
-  inherit src;
-
-  buildInputs = [ qt4 ];
-
-  buildNativeInputs = [ inkscape ];
-
-  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
-
-  configurePhase = ''
-    lrelease wpa_gui.pro
-    qmake'';
-
-# We do not install .xpm icons. First of all, I don't know where they should
-# be install. Second, this allows us to drop imagemagick build-time dependency.
-  postBuild = ''
-    sed -e '/ICONS.*xpm/d' -i icons/Makefile
-    make -C icons
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    cp -v wpa_gui $out/bin
-    mkdir -pv $out/share/applications
-    cp -v wpa_gui.desktop $out/share/applications
-    mkdir -pv $out/share/icons
-    cp -av icons/hicolor $out/share/icons
-  '';
-
-  meta = {
-    description = "Qt4 wpa_supplicant client";
-    inherit (qt4.meta) platforms;
-  };
-};
 }
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
deleted file mode 100644
index 7b587cdd623..00000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, qt4, imagemagick, inkscape}:
-
-stdenv.mkDerivation rec {
-  pkgname = "wpa_supplicant";
-  version = "0.6.9";
-  name = "${pkgname}-gui-qt4-${version}";
-
-  src = fetchurl {
-    url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz";
-    sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
-  };
-
-  buildInputs = [qt4 imagemagick inkscape];
-  builder = ./builder-gui-qt4.sh;  
-}
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
new file mode 100644
index 00000000000..12ec08361a6
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }:
+
+stdenv.mkDerivation {
+  name = "wpa_gui-${wpa_supplicant.version}";
+
+  inherit (wpa_supplicant) src;
+
+  buildInputs = [ qt4 ];
+
+  buildNativeInputs = [ inkscape ];
+
+  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
+
+  configurePhase =
+    ''
+      lrelease wpa_gui.pro
+      qmake
+    '';
+
+  # We do not install .xpm icons. First of all, I don't know where they should
+  # be install. Second, this allows us to drop imagemagick build-time dependency.
+  postBuild =
+    ''
+      sed -e '/ICONS.*xpm/d' -i icons/Makefile
+      make -C icons
+    '';
+
+  installPhase =
+    ''
+      mkdir -pv $out/bin
+      cp -v wpa_gui $out/bin
+      mkdir -pv $out/share/applications
+      cp -v wpa_gui.desktop $out/share/applications
+      mkdir -pv $out/share/icons
+      cp -av icons/hicolor $out/share/icons
+    '';
+
+  meta = {
+    description = "Qt-based GUI for wpa_supplicant";
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index df3fea05f77..864f11bee3e 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.7";
+  version = "1.8.10";
   
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
+    sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr";
   };
 
   preConfigure =
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index e71bd9f2a86..f23d0f41e11 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
   };
 
+  configureFlags = "--sysconfdir=/etc";
+
   makeFlags = "PREFIX=\${out}";
 
   # Hack to make installation succeed.  dhcpcd will still use /var/db
   # at runtime.
-  installFlags = "DBDIR=\${TMPDIR}/db";
+  installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
 
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch
deleted file mode 100644
index e4bb0db3abf..00000000000
--- a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001
-From: "T.M. Abraham" <tabraham@novell.com>
-Date: Fri, 6 Jan 2012 21:58:55 -0500
-Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences
-
----
- nbd-server.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/nbd-server.c b/nbd-server.c
-index 0ecf0e8..2cd066d 100644
---- a/nbd-server.c
-+++ b/nbd-server.c
-@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) {
-  * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM)
-  */
- int exptrim(struct nbd_request* req, CLIENT* client) {
--#ifdef HAVE_FALLOC_PH
-+#if HAVE_FALLOC_PH
- 	FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0);
- 	FILE_INFO cur = prev;
- 	int i = 1;
--- 
-1.7.8
-
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index ea2fbe5bc57..929db017152 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.25";
+  name = "nbd-3.0";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4";
+    sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93";
   };
 
-  patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ];
-
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
-  postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
+  postInstall = ''
+    mkdir -p "$out/share/doc/${name}"
+    cp README "$out/share/doc/${name}/README"
+  '';
 
   # The test suite doesn't succeed on Hydra.
   doCheck = false;
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index 051d6c2d739..c4cd1ee3a05 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -3,7 +3,7 @@ rec {
   name = "moderncv-2012.01.16";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
+    sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
   };
 
   buildInputs = [texLive unzip];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 566b2b052ae..99e565bb00a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2639,10 +2639,7 @@ let
   maude = callPackage ../development/interpreters/maude { };
 
   octave = callPackage ../development/interpreters/octave {
-    # Needed because later gm versions require an initialization the actual octave is not
-    # doing.
-    # http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
-    graphicsmagick = graphicsmagick137;
+    fltk = fltk13;
   };
 
   # mercurial (hg) bleeding edge version
@@ -3269,8 +3266,6 @@ let
 
   clanlib = callPackage ../development/libraries/clanlib { };
 
-  clapack = callPackage ../development/libraries/clapack { };
-
   classads = callPackage ../development/libraries/classads { };
 
   classpath = callPackage ../development/libraries/java/classpath {
@@ -4600,7 +4595,11 @@ let
 
   soprano = callPackage ../development/libraries/soprano { };
 
-  soqt = callPackage ../development/libraries/soqt { };
+  soqt = callPackage ../development/libraries/soqt {
+    qt4 = qt47;
+  };
+
+  soqtQt48 = soqt.override { qt4 = qt48; };
 
   speechd = callPackage ../development/libraries/speechd { };
 
@@ -6100,7 +6099,7 @@ let
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
-  wpa_supplicant_gui = pkgs.wpa_supplicant.gui;
+  wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
   xf86_input_multitouch =
     callPackage ../os-specific/linux/xf86-input-multitouch { };
@@ -7015,7 +7014,7 @@ let
   merkaartor = callPackage ../applications/misc/merkaartor { };
 
   meshlab = callPackage ../applications/graphics/meshlab {
-    qt = qt4;
+    qt = qt47;
   };
 
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
@@ -7173,8 +7172,11 @@ let
   };
 
   paraview = callPackage ../applications/graphics/paraview {
+    qt4 = qt47;
   };
 
+  paraviewQt48 = paraview.override { qt4 = qt48; };
+
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 53d495eb4c5..85f76d42787 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     GLUT         = self.GLUT_2_3_0_0;           # 7.4.1 ok
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.4.1 ok
     html         = self.html_1_0_1_2;           # 7.4.1 ok
-    HUnit        = self.HUnit_1_2_2_3;          # 7.4.1 ok
+    HUnit        = self.HUnit_1_2_4_2;          # 7.4.1 ok
     network      = self.network_2_3_0_11;       # 7.4.1 ok
     OpenGL       = self.OpenGL_2_5_0_0;         # 7.4.1 ok
     parallel     = self.parallel_3_2_0_2;       # 7.4.1 ok
@@ -907,7 +907,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
   HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};
   HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
-  HUnit = self.HUnit_1_2_0_3;
+  HUnit = self.HUnit_1_2_4_2;
 
   hxt = callPackage ../development/libraries/haskell/hxt {};
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd5c4d6e672..8f912ce4abb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1822,6 +1822,35 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  skype4py = buildPythonPackage (rec {
+    name = "Skype4Py-1.0.32.0";
+
+    src = fetchurl {
+      url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
+      sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
+    };
+
+    unpackPhase = ''
+      tar xf $src
+      find . -type d -exec chmod +rx {} \;
+      sourceRoot=`pwd`/`ls -d S*`
+    '';
+
+    doCheck = false;
+
+    propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ];
+
+    meta = {
+      description = "High-level, platform independent Skype API wrapper for Python";
+
+      # The advertisement says https://developer.skype.com/wiki/Skype4Py
+      # but that url does not work. This following web page points to the
+      # download link and has some information about the package.
+      homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
+
+      license = "BSD";
+    };
+  });
 
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.0.7";
@@ -1888,6 +1917,32 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  taskcoach = buildPythonPackage rec {
+    name = "TaskCoach-1.3.7";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
+      sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8";
+    };
+
+    propagatedBuildInputs = [ wxPython ];
+
+    # I don't know why I need to add these libraries. Shouldn't they
+    # be part of wxPython?
+    postInstall = ''
+      libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib
+      wrapProgram $out/bin/taskcoach.py \
+        --prefix LD_LIBRARY_PATH : $libspaths
+    '';
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://taskcoach.org/;
+      description = "Todo manager to keep track of personal tasks and todo lists";
+      license = "GPLv3+";
+    };
+  };
 
   tempita = buildPythonPackage rec {
     version = "0.4";
@@ -2059,6 +2114,28 @@ let pythonPackages = python.modules // rec {
     wxGTK = pkgs.wxGTK28;
   };
 
+  xlib = buildPythonPackage (rec {
+    name = "xlib-0.15rc1";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2";
+      sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m";
+    };
+
+    # Tests require `pyutil' so disable them to avoid circular references.
+    doCheck = false;
+
+    propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
+
+    meta = {
+      description = "Fully functional X client library for Python programs";
+
+      homepage = http://python-xlib.sourceforge.net/;
+
+      license = "GPLv2+";
+    };
+  });
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";