svn merge ^/nixpkgs/trunk

Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

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

49 files changed, 761 insertions, 200 deletions

diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix
index 6d39c7f2a95fe..9e6d6fe492a3e 100644
--- a/pkgs/applications/graphics/wings/default.nix
+++ b/pkgs/applications/graphics/wings/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, erlang, esdl }:
 
 stdenv.mkDerivation rec {
-  name = "wings-1.3.0.1";
+  name = "wings-1.4.1";
   src = fetchurl {
     url = "mirror://sourceforge/wings/${name}.tar.bz2";
-    sha256 = "1zab1qxhgrncwqj1xg6z08m0kqbkdiqp4777p1bv2kczcf31isyp";
+    sha256 = "16kqy92rapmbvkc58mc50cidp1pm8nlwlwx69riyadc9w4qs9bji";
   };
 
   ERL_LIBS = "${esdl}/lib/erlang/addons";
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 05e62ba384464..bd86501c30e24 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
     license = "GPL";
     homepage = http://www.krusader.org;
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (kdelibs.meta) platforms;
   };
 }
diff --git a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
new file mode 100644
index 0000000000000..bf524dc957d03
--- /dev/null
+++ b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
@@ -0,0 +1,41 @@
+From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001
+From: Jonathan Daugherty <jtd@galois.com>
+Date: Tue, 21 Feb 2012 11:06:57 -0800
+Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework
+
+---
+ mathblog.cabal |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mathblog.cabal b/mathblog.cabal
+index ea5498c..371dd12 100644
+--- a/mathblog.cabal
++++ b/mathblog.cabal
+@@ -44,7 +44,7 @@ Executable mb
+     process >= 1.0,
+     time >= 1.1,
+     old-locale >= 1.0,
+-    SHA >= 1.4 && < 1.5,
++    SHA >= 1.4 && < 1.6,
+     bytestring >= 0.9 && < 1.0,
+     HStringTemplate >= 0.6 && < 0.7,
+     ConfigFile >= 1.1 && < 1.2
+@@ -79,12 +79,12 @@ Executable mb-tests
+     process >= 1.0 && < 1.1,
+     time >= 1.1,
+     old-locale >= 1.0 && < 1.1,
+-    SHA >= 1.4 && < 1.5,
++    SHA >= 1.4 && < 1.6,
+     bytestring >= 0.9 && < 1.0,
+     HStringTemplate >= 0.6 && < 0.7,
+     ConfigFile >= 1.1 && < 1.2,
+-    HUnit >= 1.2.2 && < 1.2.3,
+-    test-framework >= 0.3.3 && < 0.4,
++    HUnit >= 1.2.2 && < 1.2.5,
++    test-framework >= 0.3.3 && < 0.6,
+     test-framework-hunit >= 0.2.6 && < 0.3
+ 
+   GHC-Options: -Wall
+-- 
+1.7.8
+
diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix
new file mode 100644
index 0000000000000..fa9dec0496002
--- /dev/null
+++ b/pkgs/applications/misc/mathblog/default.nix
@@ -0,0 +1,27 @@
+{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc
+, pandocTypes, SHA, testFramework, testFrameworkHunit, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "mathblog";
+  version = "0.4";
+  sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
+    testFramework testFrameworkHunit time
+  ];
+  patches = [
+    ./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
+  ];
+  meta = {
+    description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
index ddb70e6d633e1..0ff7c92d3d895 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
-, GConf, gnome_mplayer, MPlayer
+, GConf, gnome_mplayer, MPlayer, gmtk
 }:
 
 stdenv.mkDerivation rec {
-  name = "gecko-mediaplayer-1.0.4";
+  name = "gecko-mediaplayer-1.0.5";
 
   src = fetchurl {
     url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "18asxxsqng303cxcww75k4r6syqjs7lylibv997kq0869kz4spsp";
+    sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
   };
 
-  buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner];
+  buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ];
 
   # !!! fix this
   preBuild =
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
new file mode 100644
index 0000000000000..6ccab87ebe743
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
+
+stdenv.mkDerivation rec {
+  name = "gmtk-1.0.5";
+
+  src = fetchurl {
+    url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
+    sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];
+}
+
diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
index 88ba5b9193e53..4b9cef2d50118 100644
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ b/pkgs/applications/networking/irc/xchat/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
   configureFlags = "--disable-nls";
 
   meta = {
+    description = "IRC client using GTK";
     homepage = http://www.xchat.org;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
index bf8f71eb5d3f5..6a00d76383c18 100644
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
-, kdelibs, automoc4, phonon, kde_baseapps }:
+{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "kdesvn-1.5.5";
+
   src = fetchurl {
-    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2;
+    url = "${meta.homepage}/downloads/${name}.tar.bz2";
     sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
   };
 
@@ -12,16 +12,19 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
   '';
 
-  patches = [ ./docbook.patch ];
+  patches = [ ./docbook.patch ./virtual_inheritance.patch ];
   
 
-  buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
+  buildInputs = [ apr aprutil subversion db4 kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = {
     description = "KDE SVN front-end";
     license = "GPL";
     homepage = http://kdesvn.alwins-world.de;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    inherit (kdelibs.meta) platforms;
     inherit (kdelibs.meta) platforms;
   };
 }
diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
new file mode 100644
index 0000000000000..faaf6afcd6ba3
--- /dev/null
+++ b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
@@ -0,0 +1,11 @@
+--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
+@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
+ /**
+ 	@author Rajko Albrecht <ral@alwins-world.de>
+ */
+-class RevGraphView : virtual public QGraphicsView
++class RevGraphView : public QGraphicsView
+ {
+     Q_OBJECT
+ public:
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 2a5e98a5687fd..43e41bd840d8b 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, xlibs, libdvdnav
+{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
 , pkgconfig, dbus, fribidi, qt4, freefont_ttf
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
@@ -10,18 +10,18 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "1.1.13";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2";
-    sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
+    url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
+    sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
   };
 
   patches = [ ./zlib.patch ];
 
   buildInputs =
-    [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-      dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+    [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+      libbluray 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
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preBuild = ''
-    substituteInPlace modules/misc/freetype.c --replace \
+    substituteInPlace modules/text_renderer/freetype.c --replace \
       /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
       ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
   '';
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 02a91cebb139e..0aaab91cd81e2 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,16 +1,17 @@
-{stdenv, fetchurl, yacc, flex, pkgconfig, glib}:
+{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
 
 stdenv.mkDerivation rec {
-  baseName = "vala";
-  baseVersion = "0.11";
-  revision = "2";
-  version = "${baseVersion}.${revision}";
-  name = "${baseName}-${version}";
+  name = "vala-0.14.2";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
-    sha256 = "489b60a49a03c8915b513a722ca08986c18ae0dc6489cce6bbb8415670612046";
+    url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz;
+    sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0";
   };
-  buildInputs = [ yacc flex glib pkgconfig ];
+
+  buildNativeInputs = [ yacc flex pkgconfig xz ];
+
+  buildInputs = [ glib ];
+
   meta = {
     description = "Compiler for the GObject type system";
     homepage = "http://live.gnome.org/Vala";
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 6bb3431668f44..9d7405a64f072 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
 libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
-fftw, fftwSinglePrec, zlib, curl }:
+fftw, fftwSinglePrec, zlib, curl, qrupdate }:
 
 stdenv.mkDerivation rec {
   name = "octave-3.4.3";
@@ -11,9 +11,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
     graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
-    fftw fftwSinglePrec ];
+    fftw fftwSinglePrec qrupdate ];
+
+  doCheck = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
+
+  # Keep a copy of the octave tests detailed results in the output
+  # derivation, because someone may care
+  postInstall = ''
+    cp test/fntests.log $out/share/octave/${name}-fntests.log
+  '';
 }
diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix
new file mode 100644
index 0000000000000..3bed95e26714c
--- /dev/null
+++ b/pkgs/development/libraries/aacskeys/default.nix
@@ -0,0 +1,45 @@
+{stdenv, fetchurl, openssl, jdk, premake}:
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "aacskeys";
+    version  = "0.4.0c";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  patchPhase = ''
+    substituteInPlace "premake.lua" \
+      --replace "/usr/lib/jvm/java-6-sun/include" "${jdk}/include"
+  '';
+
+  src = fetchurl {
+    url = "http://debian-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz";
+    sha256 = "54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43";
+  };
+
+  buildInputs = [openssl jdk premake];
+
+  installPhase = ''
+    ensureDir $out/{bin,lib,share/${baseName}}
+
+    # Install lib
+    install -Dm444 lib/linux/libaacskeys.so $out/lib
+
+    # Install program
+    install -Dm555 bin/linux/aacskeys $out/bin
+
+    # Install resources
+    install -Dm444 HostKeyCertificate.txt $out/share/${baseName}
+    install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
+  '';
+
+  meta = {
+    homepage = http://forum.doom9.org/showthread.php?t=123311;
+    description = "A library and program to retrieve decryption keys for HD discs";
+  };
+}
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 37350562eaccb..790ac305ac7d8 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -1,10 +1,10 @@
-{ cabal }:
+{ cabal, Cabal }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-file-th";
-  version = "0.2.1";
-  sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
-  patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
+  version = "0.2.2";
+  sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy";
+  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://github.com/nkpart/cabal-file-th";
     description = "Template Haskell expressions for reading fields from a project's cabal file";
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
index 60e93c81b9464..1f26b0847d231 100755
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "funcmp";
-  version = "1.5";
-  sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e";
+  version = "1.6";
+  sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0";
   buildDepends = [ filepath ];
   meta = {
     homepage = "http://savannah.nongnu.org/projects/funcmp/";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 613399fa75b53..20e4650d05b7c 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.7";
-  sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav";
+  version = "0.10.7.1";
+  sha256 = "0yi04ap2pl916ycs1wzaxrhjyx81lpmdad5in3qf1s4flfmi1h2k";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index b1dfc72ecec92..fc651a692824a 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.11.0.1";
-  sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk";
+  version = "0.11.1";
+  sha256 = "1sqkfl6pwwmn72xz5qf1bh58jr95w59ry6zmy939x73g9jgpzn6x";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 0a6d10539e151..270328441e1a1 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.26.3";
-  sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx";
+  version = "0.27.1";
+  sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
   buildDepends = [
     blazeBuilder httpTypes mtl network parsec text utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 132d3de4a8fd0..056b8d53e6526 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.2";
-  sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd";
+  version = "0.5.3";
+  sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
new file mode 100644
index 0000000000000..d8ace22bc2d8d
--- /dev/null
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, libgcrypt}:
+
+# library that allows libbluray to play AACS protected bluray disks
+# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "libaacs";
+    version  = "0.3.0";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c";
+  };
+
+  buildInputs = [libgcrypt];
+
+  meta = {
+    homepage = http://www.videolan.org/developers/libbluray.html;
+    description = "Library to access Blu-Ray disks for video playback";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
new file mode 100644
index 0000000000000..03bbcc933f4a3
--- /dev/null
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}:
+
+assert withAACS -> jdk != null && ant != null && libaacs != null;
+
+# Info on how to use:
+# https://wiki.archlinux.org/index.php/BluRay
+
+let baseName = "libbluray";
+    version  = "0.2.1";
+
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchgit {
+    url = git://git.videolan.org/libbluray.git;
+    rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87";
+    sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
+  };
+
+  buildInputs = [autoconf automake libtool] ++ stdenv.lib.optionals withAACS [jdk ant libaacs];
+  NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
+
+  preConfigure = "./bootstrap";
+  configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
+
+  meta = {
+    homepage = http://www.videolan.org/developers/libbluray.html;
+    description = "Library to access Blu-Ray disks for video playback";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index 17744bad32c58..d4fb593ca80c1 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }:
 
-let version = "4.5.1"; in
+let
+  version = "4.6.0";
+  pname = "phonon-backend-gstreamer";
+in
 
 stdenv.mkDerivation rec {
-  name = "phonon-backend-gstreamer-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
-    sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
   };
 
-  buildInputs =
-    [ cmake pkgconfig phonon qt4 automoc4
-      gst_all.gstreamer gst_all.gstPluginsBase
-    ];
+  buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ];
+
+  buildNativeInputs = [ cmake automoc4 xz pkgconfig ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix
index 3763c474e73b5..faa88f8854f92 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix
@@ -1,20 +1,22 @@
-a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }:
+{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
 
 let
-  pn = "phonon-backend-vlc";
-  v = "0.2.0";
-  vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version
+  pname = "phonon-backend-vlc";
+  v = "0.5.0";
+  vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
 in
 
 stdenv.mkDerivation {
-  name = "${pn}-${v}";
+  name = "${pname}-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pn}/${v}/src/${pn}-${v}.tar.gz";
-    sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv";
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
   };
 
-  buildInputs = [ qt4 vlc cmake automoc4 phonon ];
+  buildNativeInputs = [ cmake automoc4 xz ];
+
+  buildInputs = [ qt4 vlc_ phonon ];
 
   meta = {
     description = "VideoLAN backend for Phonon multimedia framework";
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index c7de1df719094..2c70957746d27 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }:
 
 let
-  v = "4.5.1";
+  v = "4.6.0";
 in
 
 stdenv.mkDerivation rec {
@@ -9,20 +9,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
-    sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001";
+    sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt4 pulseaudio ];
 
   buildNativeInputs = [ cmake automoc4 ];
 
-  cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
-  preConfigure =
-    ''
-      substituteInPlace designer/CMakeLists.txt \
-        --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
-    '';
-
   meta = {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index ee34161723083..465ec7eebb2b3 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,19 +1,29 @@
 { stdenv
 , fetchurl
 , gfortran
-, blas
 , liblapack
 }:
 stdenv.mkDerivation {
-  name = "qrupdate-1.1.1";
+  name = "qrupdate-1.1.2";
   src = fetchurl {
-    url = mirror://sourceforge/qrupdate/1.1/qrupdate-1.1.1.tar.gz ;
-    sha256 = "0ak68qd15zccr2d2qahxcxsrcdgxy7drg362jj9swv7rb39h00cz";  			
+    url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
+    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";  			
   };
   
-  preConfigure = ''
+  configurePhase = ''
     export PREFIX=$out
+    sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
+      -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
+      Makeconf
   '';
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  buildTarget = "lib";
+
+  installTarget = "install-staticlib";
   
-  buildInputs = [gfortran blas liblapack] ;
+  buildInputs = [ gfortran liblapack ];
 }
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 1c5e0d9068e8b..74d206210898c 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,24 +1,46 @@
-{ stdenv, fetchurl, gfortran }:
+{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }:
+
+let
+  optionalString = stdenv.lib.optionalString;
+in
 
 stdenv.mkDerivation {
   name = "atlas-3.9.67";
-  
+
   src = fetchurl {
     url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
     sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
   };
 
-  # configure outside of the source directory
+  # Configure outside of the source directory.
   preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
 
-  # the manual says you should pass -fPIC as configure arg .. It works
-  configureFlags = "-Fa alg -fPIC";
+  # * The manual says you should pass -fPIC as configure arg. Not sure why, but
+  #   it works.
+  #
+  # * Atlas aborts the build if it detects that some kind of CPU frequency
+  #   scaling is active on the build machine because that feature offsets the
+  #   performance timings. We ignore that check, however, because with binaries
+  #   being pre-built on Hydra those timings aren't accurate for the local
+  #   machine in the first place.
+  configureFlags = "-Fa alg -fPIC"
+    + optionalString stdenv.isi686 " -b 32"
+    + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0";
 
   buildInputs = [ gfortran ];
 
+  doCheck = true;
+
   meta = {
-    description = "Atlas library";
+    homepage = "http://math-atlas.sourceforge.net/";
+    description = "Automatically Tuned Linear Algebra Software (ATLAS)";
     license = "GPL";
-    homepage = http://math-atlas.sourceforge.net/;
+
+    longDescription = ''
+      The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing
+      research effort focusing on applying empirical techniques in order to provide
+      portable performance. At present, it provides C and Fortran77 interfaces to a
+      portably efficient BLAS implementation, as well as a few routines from LAPACK.
+    '';
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index acede395c84da..28bfa4df8019b 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake }:
+{ stdenv, fetchurl, gfortran, atlas, cmake, python }:
 
 stdenv.mkDerivation {
   name = "liblapack-3.4.0";
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ atlas ];
   buildInputs = [ gfortran cmake ];
+  buildNativeInputs = [ python ];
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
@@ -17,8 +18,19 @@ stdenv.mkDerivation {
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ];
 
+  doCheck = true;
+
+  checkPhase = "
+    sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
+    ctest
+  ";
+
   enableParallelBuilding = true;
 
+  passthru = {
+    blas = atlas;
+  };
+
   meta = {
     description = "Linear Algebra PACKage";
     license = "revised-BSD";
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
new file mode 100644
index 0000000000000..cd0eb3fcdcbef
--- /dev/null
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchsvn, curl }:
+
+let rev = "2262"; in
+stdenv.mkDerivation {
+  name = "xmlrpc-c-r${rev}";
+
+  buildInputs = [ curl ];
+
+  preInstall = "export datarootdir=$out/share";
+
+  src = fetchsvn {
+    url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
+    rev = "2262";
+    sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix
new file mode 100644
index 0000000000000..8924e8dd79331
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/264.nix
@@ -0,0 +1,60 @@
+{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
+, darwinInstallNameToolUtility }:
+
+with stdenv.lib;
+
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "2.6";
+  minorVersion = "4";
+  version = "${majorVersion}.${minorVersion}";
+in
+
+stdenv.mkDerivation rec {
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+
+  inherit majorVersion;
+
+  src = fetchurl {
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
+    sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw";
+  };
+
+  patches =
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path-264.patch;
+
+  buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
+    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
+    ++ optional useNcurses ncurses
+    ++ optional useQt4 qt4;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
+  postUnpack =
+    ''
+      dontUseCmakeConfigure=1
+      source $setupHook
+      fixCmakeFiles $sourceRoot
+    '';
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+    '';
+
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-264.patch b/pkgs/development/tools/build-managers/cmake/search-path-264.patch
new file mode 100644
index 0000000000000..97ad6f119d8b9
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/search-path-264.patch
@@ -0,0 +1,93 @@
+diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
+index 4e4c2cb..9784655 100644
+--- a/Modules/Platform/Linux.cmake
++++ b/Modules/Platform/Linux.cmake
+@@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+   # checking the platform every time.  This option is advanced enough
+   # that only package maintainers should need to adjust it.  They are
+   # capable of providing a setting on the command line.
+-  IF(EXISTS "/etc/debian_version")
+-    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  ELSE(EXISTS "/etc/debian_version")
+-    SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  ENDIF(EXISTS "/etc/debian_version")
++  SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
++    "Install .so files without execute permission.")
+ ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ 
+ INCLUDE(Platform/UnixPaths)
+ 
+-# Debian has lib64 paths only for compatibility so they should not be
+-# searched.
+-IF(EXISTS "/etc/debian_version")
+-  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-ENDIF(EXISTS "/etc/debian_version")
+-# always include the gcc compiler information
+ INCLUDE(Platform/gcc)
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 584d334..4fcf951 100755
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # List common installation prefixes.  These will be used for all
+ # search types.
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  # Standard
+-  / /usr /usr/local
+-
+-  # CMake install location
+-  "${_CMAKE_INSTALL_DIR}"
+-
+-  # Project install destination.
+-  "${CMAKE_INSTALL_PREFIX}"
+-  )
+-
+-# List common include file locations not under the common prefixes.
+-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /opt/local/include /usr/pkg/include
+-  /opt/csw/include /opt/include  
+-  /usr/openwin/include
+-  )
+-
+-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /opt/local/lib /usr/pkg/lib
+-  /opt/csw/lib /opt/lib 
+-  /usr/openwin/lib
+-  )
+-
+-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  "@glibc@"
+   )
+ 
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  "@glibc@/lib"
+   )
+ 
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  "@glibc@/include"
+   )
+ 
+ # Enable use of lib64 search path variants by default.
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
new file mode 100644
index 0000000000000..4f534bd8664ac
--- /dev/null
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+let baseName = "premake";
+    version  = "3.7";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    install -Dm755 bin/premake $out/bin/premake
+  '';
+
+  meta = {
+    homepage = http://industriousone.com/premake;
+    description = "A simple build configuration and project generation tool using lua";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 3978979d70200..326918dd55ef7 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -1,7 +1,7 @@
 # Packages that make up the GNU/Hurd operating system (aka. GNU).
 
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
-, texinfo, glibcCross, hurdPartedCross, libuuid
+, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
 , forceBuildDrv, callPackage, platform, config, crossSystem }:
 
@@ -86,4 +86,9 @@ rec {
        }).stdenv;
      }
      else { });
+
+  smbfs = callPackage ./smbfs {
+    samba = samba_light;
+    hurd = hurdCross;
+  };
 }
diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix
new file mode 100644
index 0000000000000..f95b22a4669d1
--- /dev/null
+++ b/pkgs/os-specific/gnu/smbfs/default.nix
@@ -0,0 +1,41 @@
+{ fetchcvs, stdenv, hurd, machHeaders, samba }:
+
+let
+  date = "2011-11-14";
+in
+stdenv.mkDerivation rec {
+  name = "smbfs-${date}";
+
+  src = fetchcvs {
+    cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras";
+    module = "smbfs";
+    sha256 = "b36765fde77c6cafb04ab1ff44b19bb00b490064b5a02b9ced7828170ab47a70";
+    inherit date;
+  };
+
+  patchPhase =
+    '' sed -i "Makefile" \
+           -e 's|gcc|i586-pc-gnu-gcc|g ;
+               s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g'
+    '';
+
+  buildInputs = [ hurd machHeaders samba ];
+
+  installPhase =
+    '' mkdir -p "$out/hurd"
+       cp -v smbfs "$out/hurd"
+
+       mkdir -p "$out/share/doc/${name}"
+       cp -v README "$out/share/doc/${name}"
+    '';
+
+  meta = {
+    description = "SMB/CIFS file system translator for GNU/Hurd";
+
+    homepage = http://www.nongnu.org/hurdextras/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 502d24d32d8b5..a8f8a9d33ef3b 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, kernel }:
 
 let
-
-  version = "0.4.1";
-  name = "bbswitch-${version}-${kernel.version}";
+  baseName = "bbswitch-0.4.1";
+  name = "${baseName}-${kernel.version}";
 
 in
 
@@ -11,7 +10,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${name}.tar.gz";
+    url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz";
     sha256 = "d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23";
   };
 
diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix
index fb2c50a778d51..7894e86ded980 100644
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ b/pkgs/os-specific/linux/frandom/default.nix
@@ -1,10 +1,13 @@
 { stdenv, fetchurl, kernel }:
 
+let baseName = "frandom-1.1";
+in
+
 stdenv.mkDerivation rec {
-  name = "frandom-1.1-${kernel.version}";
+  name = "${baseName}-${kernel.version}";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz";
+    url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz";
     sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls";
   };
 
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
index 44a82e0836d16..64aa288c8c8e2 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
@@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
 let
   configWithPlatform = kernelPlatform :
     ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
+      # powermanagement and debugging for powertop
+      DEBUG_KERNEL y
+      PM_ADVANCED_DEBUG y
+      PM_RUNTIME y
+      TIMER_STATS y
+      USB_SUSPEND y
+      BACKTRACE_SELF_TEST n
+      CPU_NOTIFIER_ERROR_INJECT n
+      DEBUG_DEVRES n
+      DEBUG_NX_TEST n
+      DEBUG_STACK_USAGE n
+      DEBUG_STACKOVERFLOW n
+      RCU_TORTURE_TEST n
+      SCHEDSTATS n
 
       # Support drivers that need external firmware.
       STANDALONE n
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 557223e626048..95b3ef16699df 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
 let
   configWithPlatform = kernelPlatform :
     ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
+      # powermanagement and debugging for powertop
+      DEBUG_KERNEL y
+      PM_ADVANCED_DEBUG y
+      PM_RUNTIME y
+      TIMER_STATS y
+      USB_SUSPEND y
+      BACKTRACE_SELF_TEST n
+      CPU_NOTIFIER_ERROR_INJECT n
+      DEBUG_DEVRES n
+      DEBUG_NX_TEST n
+      DEBUG_STACK_USAGE n
+      DEBUG_STACKOVERFLOW n
+      RCU_TORTURE_TEST n
+      SCHEDSTATS n
 
       # Support drivers that need external firmware.
       STANDALONE n
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index f1f1aa7f8fc7d..2e48eb3e4602a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
 let
   configWithPlatform = kernelPlatform :
     ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
+      # powermanagement and debugging for powertop
+      DEBUG_KERNEL y
+      PM_ADVANCED_DEBUG y
+      PM_RUNTIME y
+      TIMER_STATS y
+      USB_SUSPEND y
+      BACKTRACE_SELF_TEST n
+      CPU_NOTIFIER_ERROR_INJECT n
+      DEBUG_DEVRES n
+      DEBUG_NX_TEST n
+      DEBUG_STACK_USAGE n
+      DEBUG_STACKOVERFLOW n
+      RCU_TORTURE_TEST n
+      SCHEDSTATS n
 
       # Support drivers that need external firmware.
       STANDALONE n
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index b77f6eb47885c..66643a3117efc 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
 let
   configWithPlatform = kernelPlatform :
     ''
-      # Don't include any debug features.
-      DEBUG_KERNEL n
+      # powermanagement and debugging for powertop
+      DEBUG_KERNEL y
+      PM_ADVANCED_DEBUG y
+      PM_RUNTIME y
+      TIMER_STATS y
+      USB_SUSPEND y
+      BACKTRACE_SELF_TEST n
+      CPU_NOTIFIER_ERROR_INJECT n
+      DEBUG_DEVRES n
+      DEBUG_NX_TEST n
+      DEBUG_STACK_USAGE n
+      DEBUG_STACKOVERFLOW n
+      RCU_TORTURE_TEST n
+      SCHEDSTATS n
 
       # Support drivers that need external firmware.
       STANDALONE n
@@ -214,7 +226,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.4";
+    version = "3.2.7";
     testing = false;
 
     modDirVersion = version;
@@ -222,10 +234,10 @@ import ./generic.nix (
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';
-  
+
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
-      sha256 = "1c648a7041e65a167d3fd8beda484a3d55c35cad9d6d189b9949d3c621887da7";
+      sha256 = "e80009e097e137b9a1f1efacabc482c1d4b3651b238bf733a41595d0b387ae12";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index fd5a27e0eace9..42c99f0d56cde 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -252,6 +252,20 @@ rec {
     features.aufs3 = true;
   };
 
+  aufs3_2 = rec {
+    name = "aufs3.2";
+    version = "3.2";
+    utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f";
+    utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4";
+    patch = makeAufs3StandalonePatch {
+      inherit version;
+      rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033";
+      sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea";
+    };
+    features.aufsBase = true;
+    features.aufs3 = true;
+  };
+
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
   cifs_timeout_2_6_15 =
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 42d577c55fa8c..037fa14491c21 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
   patches =
     [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
       ./readlink.patch
+
+      # Allow cross-builds for GNU/Hurd.
+      ./libnss-wins-pthread.patch
     ];
 
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
@@ -39,7 +42,7 @@ stdenv.mkDerivation rec {
     # XXX: Awful hack to allow cross-compilation.
     '' sed -i source3/configure \
            -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
-    '';
+    ''; # "
 
   preConfigure =
     '' cd source3
diff --git a/pkgs/servers/samba/libnss-wins-pthread.patch b/pkgs/servers/samba/libnss-wins-pthread.patch
new file mode 100644
index 0000000000000..63e1485c20dc6
--- /dev/null
+++ b/pkgs/servers/samba/libnss-wins-pthread.patch
@@ -0,0 +1,15 @@
+`libnss_wins' uses pthreads but is built without `-pthread'.  This is
+not a problem when building natively on GNU/Linux, but causes troubles
+when cross-building for GNU/Hurd (undefined references to libpthread
+functions.)
+
+--- samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:15.000000000 +0100
++++ samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:47.000000000 +0100
+@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+ 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
++		$(PTHREAD_LDFLAGS) \
+ 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+ 
+ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index b308e4e0d1e08..ba0d57b3654ba 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.16"; in
+let version = "8.3.17"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180";
+    sha256 = "0xq8yg8qwd4qvjk6764argaxl6fribyf1xnxmdsk4xfcmgmfw5gv";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index c3a34b3d43bd4..20b9bca5144c0 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.9"; in
+let version = "8.4.10"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x";
+    sha256 = "1yvwn2qpn2dpgfi496r1zl8b8xy52lb2pprg076pvc37sklq77vl";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
new file mode 100644
index 0000000000000..161c3dc2ccf04
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, zlib, readline }:
+
+let version = "9.1.2"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+  
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "0c6vwlfxppjvrikqfq6s87sxmxxvsx1qq03bwgk589sv9x8zym4d";
+  };
+
+  buildInputs = [ zlib readline ];
+
+  enableParallelBuilding = true;
+
+  LC_ALL = "C";
+
+  postInstall =
+    ''
+      mkdir -p $out/share/man
+      cp -rvd doc/src/sgml/man1 $out/share/man
+    '';
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.1";
+  };
+
+  meta = {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 3f0ff42109222..1f3240997d967 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -90,11 +90,13 @@ stdenv.mkDerivation rec {
     echo '#!/bin/sh
 initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
     echo '#!/bin/sh
-initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit
+initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"
+initctl emit -n ip-up' > $out/etc/scripts/postconnect/upstart-emit
     echo '#!/bin/sh
 initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
     echo '#!/bin/sh
-initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit
+initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"
+initctl emit -n ip-down' > $out/etc/scripts/postdisconnect/upstart-emit
     chmod a+x $out/etc/scripts/*/upstart-emit
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddaf60985a557..4895e0f353c6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2930,6 +2930,8 @@ let
 
   cmake = callPackage ../development/tools/build-managers/cmake { };
 
+  cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
+
   cmakeCurses = cmake.override { useNcurses = true; };
 
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
@@ -3082,6 +3084,8 @@ let
      */
   pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
 
+  premake = callPackage ../development/tools/misc/premake { };
+
   radare = callPackage ../development/tools/analysis/radare {
     inherit (gnome) vte;
     lua = lua5;
@@ -3155,6 +3159,8 @@ let
 
   a52dec = callPackage ../development/libraries/a52dec { };
 
+  aacskeys = callPackage ../development/libraries/aacskeys { };
+
   aalib = callPackage ../development/libraries/aalib { };
 
   acl = callPackage ../development/libraries/acl { };
@@ -3832,6 +3838,8 @@ let
 
   lib3ds = callPackage ../development/libraries/lib3ds { };
 
+  libaacs = callPackage ../development/libraries/libaacs { };
+
   libaal = callPackage ../development/libraries/libaal { };
 
   libao = callPackage ../development/libraries/libao {
@@ -3852,6 +3860,8 @@ let
 
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
+  libbluray = callPackage ../development/libraries/libbluray { };
+
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
@@ -4591,11 +4601,7 @@ let
 
   soprano = callPackage ../development/libraries/soprano { };
 
-  soqt = callPackage ../development/libraries/soqt {
-    qt4 = qt47;
-  };
-
-  soqtQt48 = soqt.override { qt4 = qt48; };
+  soqt = callPackage ../development/libraries/soqt { };
 
   speechd = callPackage ../development/libraries/speechd { };
 
@@ -4783,6 +4789,8 @@ let
     ];
   };
 
+  xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
+
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
   yajl = callPackage ../development/libraries/yajl { };
@@ -5126,6 +5134,8 @@ let
 
   postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
 
+  postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };
+
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
@@ -5550,24 +5560,6 @@ let
       ];
   };
 
-  linux_2_6_39_powertop = linux_2_6_39.override {
-    extraConfig = ''
-        DEBUG_KERNEL y
-        PM_ADVANCED_DEBUG y
-        PM_RUNTIME y
-        TIMER_STATS y
-        USB_SUSPEND y
-        BACKTRACE_SELF_TEST n
-        CPU_NOTIFIER_ERROR_INJECT n
-        DEBUG_DEVRES n
-        DEBUG_NX_TEST n
-        DEBUG_STACK_USAGE n
-        DEBUG_STACKOVERFLOW n
-        RCU_TORTURE_TEST n
-        SCHEDSTATS n
-    '';
-  };
-
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5579,24 +5571,6 @@ let
       ];
   };
 
-  linux_3_0_powertop = linux_3_0.override {
-    extraConfig = ''
-        DEBUG_KERNEL y
-        PM_ADVANCED_DEBUG y
-        PM_RUNTIME y
-        TIMER_STATS y
-        USB_SUSPEND y
-        BACKTRACE_SELF_TEST n
-        CPU_NOTIFIER_ERROR_INJECT n
-        DEBUG_DEVRES n
-        DEBUG_NX_TEST n
-        DEBUG_STACK_USAGE n
-        DEBUG_STACKOVERFLOW n
-        RCU_TORTURE_TEST n
-        SCHEDSTATS n
-    '';
-  };
-
   linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5607,52 +5581,16 @@ let
       ];
   };
 
-  linux_3_1_powertop = linux_3_1.override {
-    extraConfig = ''
-        DEBUG_KERNEL y
-        PM_ADVANCED_DEBUG y
-        PM_RUNTIME y
-        TIMER_STATS y
-        USB_SUSPEND y
-        BACKTRACE_SELF_TEST n
-        CPU_NOTIFIER_ERROR_INJECT n
-        DEBUG_DEVRES n
-        DEBUG_NX_TEST n
-        DEBUG_STACK_USAGE n
-        DEBUG_STACKOVERFLOW n
-        RCU_TORTURE_TEST n
-        SCHEDSTATS n
-    '';
-  };
-
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
-        #kernelPatches.aufs3_1
+        kernelPatches.aufs3_2
         #kernelPatches.mips_restart_2_6_36
       ];
   };
 
-  linux_3_2_powertop = linux_3_2.override {
-    extraConfig = ''
-        DEBUG_KERNEL y
-        PM_ADVANCED_DEBUG y
-        PM_RUNTIME y
-        TIMER_STATS y
-        USB_SUSPEND y
-        BACKTRACE_SELF_TEST n
-        CPU_NOTIFIER_ERROR_INJECT n
-        DEBUG_DEVRES n
-        DEBUG_NX_TEST n
-        DEBUG_STACK_USAGE n
-        DEBUG_STACKOVERFLOW n
-        RCU_TORTURE_TEST n
-        SCHEDSTATS n
-    '';
-  };
-
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -5776,16 +5714,12 @@ let
   linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
   linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
-  linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
-  linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
-  linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop);
   linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
   linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
   linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
-  linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop);
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
@@ -6820,6 +6754,11 @@ let
 
   gqview = callPackage ../applications/graphics/gqview { };
 
+  gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
+    inherit (gnome) GConf;
+    inherit (gtkLibs) gtk;
+  };
+
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
@@ -7167,11 +7106,7 @@ let
     inherit (gnome) libglademm;
   };
 
-  paraview = callPackage ../applications/graphics/paraview {
-    qt4 = qt47;
-  };
-
-  paraviewQt48 = paraview.override { qt4 = qt48; };
+  paraview = callPackage ../applications/graphics/paraview { };
 
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
@@ -8185,7 +8120,13 @@ let
 
   ### SCIENCE/MATH
 
-  atlas = callPackage ../development/libraries/science/math/atlas { };
+  atlas = callPackage ../development/libraries/science/math/atlas {
+    # The build process measures CPU capabilities and optimizes the
+    # library to perform best on that particular machine. That is a
+    # great feature, but it's of limited use with pre-built binaries
+    # coming from a central build farm.
+    tolerateCpuTimingInaccuracy = true;
+  };
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 85f76d427874a..fa4c6ac4d9b5d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1622,6 +1622,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   leksah = callPackage ../applications/editors/leksah {};
 
+  mathblog = callPackage ../applications/misc/mathblog {};
+
   xmobar = callPackage ../applications/misc/xmobar {
     parsec = self.parsec3;
   };
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 3e3cb3e32297a..71e4944b303c4 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -182,6 +182,7 @@ in {
     gnu.hurdCross = nativePlatforms;
     gnu.mach.hostDrv = nativePlatforms;
     gnu.mig = nativePlatforms;
+    gnu.smbfs = nativePlatforms;
 
     coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
@@ -205,6 +206,7 @@ in {
     nixUnstable.hostDrv = nativePlatforms;
     openssl.hostDrv = nativePlatforms;            # dependency of Nix
     patch.hostDrv = nativePlatforms;
+    samba_light.hostDrv = nativePlatforms;      # needed for `runInGenericVM'
     zile.hostDrv = nativePlatforms;
   };
 }) // (