Merge remote-tracking branch 'origin/stdenv-updates' into illumos

Conflicts: pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/mpc/default.nix pkgs/development/libraries/mpfr/default.nix pkgs/development/libraries/ppl/default.nix pkgs/tools/misc/coreutils/default.nix
2024-11-22 15:03:28 +00:00 · 2013-03-17 13:22:24 +01:00 · 2013-03-17 13:22:24 +01:00 · d007a78ccb
commit d007a78ccb
parent 242b4d23a7 3c472d53aa
388 changed files with 6760 additions and 2009 deletions
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@ -1,49 +1,42 @@
-{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
+{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2
 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, lilv, lv2, serd, sord, sratom, suil # these are probably optional
 , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas,  liblo, aubio
-, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:
+, gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio
+, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }:

 stdenv.mkDerivation rec {
  name = "ardour-${version}";
-  version = "2.8.12";
+  version = "2.8.16";

-  # svn is the source to get official releases from their site?
-  # alternative: wget  --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
-  # but hash is changing ?
-
-  # TODO: see if this is also true when using a tag (~goibhniu)
-
-  # This version does not run it exits with the following error:
-  # raptor_new_uri_for_rdf_concept called with Raptor V1 world object
-  # raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
-  src = fetchsvn {
-    url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
-    sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
+  src = fetchurl {
+    url = "mirror://gentoo/distfiles/${name}.tar.bz2";
+    sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip";
  };

-  patchPhase = ''
-    sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
+  postPatch = ''
+    #sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
    echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
    echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
  '';

  buildInputs = [
-    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
+    scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio
    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
-    liblo aubio fftwSinglePrec libmad autoconf automake libtool
+    #lilv lv2 serd sord sratom suil
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf
+    liblo aubio fftwSinglePrec libmad autoconf automake libtool curl
  ];

  buildPhase = ''
    mkdir -p $out
    export CXX=g++
-    scons PREFIX=$out install
+    scons PREFIX=$out SYSLIBS=1 install
  '';
-  
+
  installPhase = ":";

-  meta = { 
+  meta = {
    description = "Multi-track hard disk recording software";
    longDescription = ''
      Broken: use ardour3-svn instead
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "caps-${version}";
+  version = "0.9.7";
+  src = fetchurl {
+    url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
+    sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0";
+  };
+  configurePhase = ''
+    echo "PREFIX = $out" > defines.make
+  '';
+
+  meta = {
+    description = "A selection of LADSPA plugins implementing classic effects";
+    longDescription = ''
+      The C* Audio Plugin Suite is a selection of classic effects,
+      unique filters and signal generators.  The digital guitarist
+      finds in CAPS a range of processors recreating key aspects of
+      the formation of tone in traditional electronic instrument
+      amplification.  Beyond sound quality, central design
+      considerations are latency-free realtime operation, modesty of
+      resource demands and meaningful control interfaces.
+    '';
+    homepage = http://www.quitte.de/dsp/caps.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "drumkv1-${version}";
+  version = "0.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
+    sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl";
+  };
+
+  buildInputs = [ jackaudio libsndfile lv2 qt4 ];
+
+  meta = with stdenv.lib; {
+    description = "An old-school drum-kit sampler synthesizer with stereo fx";
+    homepage = http://drumkv1.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "jack_oscrolloscope-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
+  };
+
+  buildInputs = [ SDL jackaudio mesa pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv jack_oscrolloscope $out/bin/
+  '';
+
+  meta = with stdenv.lib; { 
+    description = "A simple waveform viewer for JACK";
+    homepage = http://das.nasophon.de/jack_oscrolloscope;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
+stdenv.mkDerivation rec {
+  name = "jack-rack-1.4.7";
+  src = fetchurl {
+    url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
+    sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
+  };
+  buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
+
+  meta = {
+    description = ''An effects "rack" for the JACK low latency audio API'';
+    longDescription = ''
+      JACK Rack is an effects "rack" for the JACK low latency audio
+      API. The rack can be filled with LADSPA effects plugins and can
+      be controlled using the ALSA sequencer. It's phat; it turns your
+      computer into an effects box.
+    '';
+    homepage = http://jack-rack.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python
+, serd, sord , sratom, suil }:
+
+stdenv.mkDerivation  rec {
+  name = "jalv-${version}";
+  version = "1.4.0";
+
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0";
+  };
+
+  buildInputs = [
+    gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil
+  ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "A simple but fully featured LV2 host for Jack";
+    homepage = http://drobilla.net/software/jalv;
+    license = licenses.isc;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@ -0,0 +1,44 @@
+{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+, gst_plugins_good, gst_plugins_base
+}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "mopidy-${version}";
+
+  version = "0.11.1";
+
+  src = fetchgit {
+    url = "https://github.com/mopidy/mopidy.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+   gst_python pygobject pykka pyspotify pylast cherrypy ws4py
+  ];
+
+  # python zip complains about old timestamps
+  preConfigure = ''
+    find -print0 | xargs -0 touch
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  postInstall = ''
+    for p in $out/bin/mopidy $out/bin/mopidy-scan; do
+      wrapProgram $p \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+    done
+  '';
+
+  meta = {
+    homepage = http://www.mopidy.com/;
+    description = ''
+      A music server which can play music from Spotify and from your
+      local hard drive.
+    '';
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
--- a/pkgs/applications/audio/mopidy/git.nix
+++ b/pkgs/applications/audio/mopidy/git.nix
@ -0,0 +1,44 @@
+{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+, gst_plugins_good, gst_plugins_base
+}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "mopidy-${version}";
+
+  version = "git-20130226";
+
+  src = fetchgit {
+    url = "https://github.com/mopidy/mopidy.git";
+    rev = "86a7c2d7519680c6b9130795d35c4654958f4c04";
+    sha256 = "00fxcfkpl19nslv4f4bspzw0kvjjp6hhcwag7rknmb8scfinqfac";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+   gst_python pygobject pykka pyspotify pylast cherrypy ws4py
+  ];
+
+  # python zip complains about old timestamps
+  preConfigure = ''
+    find -print0 | xargs -0 touch
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  postInstall = ''
+    for p in $out/bin/mopidy $out/bin/mopidy-scan; do
+      wrapProgram $p \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+    done
+  '';
+
+  meta = {
+    homepage = http://www.mopidy.com/;
+    description = ''
+      A music server which can play music from Spotify and from your
+      local hard drive.
+    '';
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "samplv1-${version}";
+  version = "0.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/samplv1/${name}.tar.gz";
+    sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m";
+  };
+
+  buildInputs = [ jackaudio libsndfile lv2 qt4 ];
+
+  meta = with stdenv.lib; {
+    description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
+    homepage = http://samplv1.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@ -1,52 +1,79 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:

 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

-let version = "0.8.3.278"; in
+let 
+  version = "0.8.8.323"; 
+  qt4webkit = 
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        name = "libqtwebkit4_2.2_i386.deb";
+        url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb;
+        sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924";
+      }
+    else 
+      fetchurl {
+        name = "libqtwebkit4_2.2_amd64.deb";
+        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb;
+        sha256 = "0bvy6qz9y19ck391z8c049v07y4vdyvgykpxi7x1nvn078p1imiw";
+      };
+in

 stdenv.mkDerivation {
  name = "spotify-${version}";

  src =
-    if stdenv.system == "i686-linux" then 
+    if stdenv.system == "i686-linux" then
      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_i386.deb";
-        sha256 = "7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_i386.deb";
+        sha256 = "13q803qlvq16yrr7f95izp9mqqdb8kpcsyrb5gc5i2pya68ra906";
      }
-    else if stdenv.system == "x86_64-linux" then 
+    else if stdenv.system == "x86_64-linux" then
      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_amd64.deb";
-        sha256 = "a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_amd64.deb";
+        sha256 = "0ny3z499wks1dhrd3qq4d6cp0zd33198z9vak8ffgm5x24sdpghf";
      }
    else throw "Spotify not supported on this platform.";

  buildInputs = [ dpkg makeWrapper ];

  unpackPhase = "true";
-  
+
  installPhase =
    ''
      mkdir -p $out
      dpkg-deb -x $src $out
-      mv $out/usr/* $out/
-      rmdir $out/usr
+      mv $out/opt/spotify/* $out/
+      rm -rf $out/usr $out/opt

      # Work around Spotify referring to a specific minor version of
      # OpenSSL.
      mkdir $out/lib
      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
+      ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
+      ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
+      ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
+      ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
+      ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d

+      mkdir -p $out/bin
+
+      ln -s $out/spotify-client/spotify $out/bin/spotify
      patchelf \
        --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \
-        $out/bin/spotify
+        --set-rpath $out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
+        $out/spotify-client/spotify
+
+      dpkg-deb -x ${qt4webkit} ./
+      mkdir -p $out/lib/
+      cp -v usr/lib/*/* $out/lib/

      preload=$out/libexec/spotify/libpreload.so
      mkdir -p $out/libexec/spotify
      gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC

-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
    ''; # */

  dontStrip = true;
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
+
+stdenv.mkDerivation rec {
+  name = "synthv1-${version}";
+  version = "0.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/synthv1/${name}.tar.gz";
+    sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9";
+  };
+
+  buildInputs = [ qt4 jackaudio lv2 ];
+
+  meta = with stdenv.lib; {
+    description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
+    homepage = http://synthv1.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/editors/emacs-24/builder.sh
+++ b/pkgs/applications/editors/emacs-24/builder.sh
@ -29,6 +29,4 @@ preConfigure() {
    done
 }

-preBuild="make bootstrap"
-
 genericBuild
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise

 stdenv.mkDerivation rec {
-  name = "emacs-24.2";
+  name = "emacs-24.3";

  builder = ./builder.sh;

  src = fetchurl {
-    url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k";
+    url = "mirror://gnu/emacs/${name}.tar.xz";
+    sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
  };

  buildInputs =
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gettext, glib, gtk, json_c, lcms2, libpng
+, makeWrapper, pkgconfig, pygtk, python, pythonPackages, scons, swig
+}:
+
+stdenv.mkDerivation rec {
+  name = "mypaint-${version}";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "http://download.gna.org/mypaint/${name}.tar.bz2";
+    sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq";
+  };
+
+  buildInputs = [ 
+    gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk
+    python scons swig
+  ];
+ 
+  propagatedBuildInputs = [ pythonPackages.numpy ];
+
+  buildPhase = "scons prefix=$out";
+
+  installPhase = ''
+    scons prefix=$out install
+    wrapProgram $out/bin/mypaint --prefix PYTHONPATH : $PYTHONPATH
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A graphics application for digital painters";
+    homepage = http://mypaint.intilinux.com;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/pkgs/applications/graphics/panotools/default.nix
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ perl libjpeg libpng libtiff ];

-  doCheck = true;
+  # one of the tests succeeds on my machine but fails on Hydra (no idea why)
+  #doCheck = true;

  meta = {
    homepage = http://panotools.sourceforge.net/;
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@ -1,30 +1,35 @@
-{ stdenv, fetchurl, makeWrapper, boost, file, gettext
+{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
 , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
 , libctemplate, libglade
+, libiodbc
 , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
 }:

 stdenv.mkDerivation rec {
  pname = "mysql-workbench";
-  version = "5.2.39";
+  version = "5.2.47";
  name = "${pname}-${version}";

  src = fetchurl {
-    url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
-    sha256 = "0e4e14f1b39dca2b65f924381d82b406dc25a530fbd25631b4cd05bddc4ab5bd";
+    url = "http://mirror.cogentco.com/pub/mysql/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
+    sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
  };

-  buildInputs = [ boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
-    libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
+  buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
+    libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
    mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];

  preConfigure = ''
    substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
  '';

+  postConfigure = ''
+    autoreconf -fi
+  '';
+
  postInstall = ''
-    wrapProgram "$out/bin/mysql-workbench-bin" \
+    wrapProgram "$out/bin/mysql-workbench" \
      --prefix LD_LIBRARY_PATH : "${python}/lib" \
      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \
      --prefix PATH : "${gnome_keyring}/bin" \
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@ -1,15 +1,15 @@
-{stdenv, fetchurl, gtk, webkit, pkgconfig, glib, libsoup, patches ? null}:
+{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}:

 stdenv.mkDerivation rec {
  name = "surf-${version}";
-  version="0.5";
+  version="0.6";

  src = fetchurl {
    url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx";
+    sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx";
  };

-  buildInputs = [ gtk webkit pkgconfig glib libsoup ];
+  buildInputs = [ gtk makeWrapper webkit pkgconfig glib libsoup ];

  # Allow users set their own list of patches
  inherit patches;
@ -19,8 +19,14 @@ stdenv.mkDerivation rec {
 # `-lX11' to make sure libX11's store path is in the RPATH
  NIX_LDFLAGS = "-lX11";
  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+  installPhase = ''
+    make PREFIX=/ DESTDIR=$out install
+    wrapProgram "$out/bin/surf" \
+      --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+  '';

-  meta = { 
+  meta = {
      description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties.";
      homepage = http://surf.suckless.org;
      license = "MIT";
--- a/pkgs/applications/misc/xmobar/add-freeration-variable.patch
+++ b/pkgs/applications/misc/xmobar/add-freeration-variable.patch
@ -0,0 +1,58 @@
+diff --git a/readme.md b/readme.md
+index f4f07e8..de679c7 100644
+--- a/readme.md
+++ b/readme.md
+@@ -645,7 +645,7 @@ something like:
+ - Args: default monitor arguments
+ - Variables that can be used with the `-t`/`--template` argument:
+              `total`, `free`, `buffer`, `cache`, `rest`, `used`,
+-             `usedratio`, `usedbar`, `freebar`
+             `usedratio`, `usedbar`, `freeratio`, `freebar`
+ - Default template: `Mem: <usedratio>% (<cache>M)`
+ 
+ ### `Swap Args RefreshRate`
+diff --git a/src/Plugins/Monitors/Mem.hs b/src/Plugins/Monitors/Mem.hs
+index 5c55ee2..3cf46c7 100644
+--- a/src/Plugins/Monitors/Mem.hs
+++ b/src/Plugins/Monitors/Mem.hs
+@@ -19,8 +19,8 @@ import Plugins.Monitors.Common
+ memConfig :: IO MConfig
+ memConfig = mkMConfig
+        "Mem: <usedratio>% (<cache>M)" -- template
+-       ["usedbar", "freebar", "usedratio", "total",
+-        "free", "buffer", "cache", "rest", "used"]  -- available replacements
+       ["usedbar", "freebar", "usedratio", "freeratio", "total",
+        "free", "buffer", "cache", "rest", "used"] -- available replacements
+ 
+ fileMEM :: IO String
+ fileMEM = readFile "/proc/meminfo"
+@@ -33,7 +33,8 @@ parseMEM =
+            rest = free + buffer + cache
+            used = total - rest
+            usedratio = used / total
+-       return [usedratio, total, free, buffer, cache, rest, used]
+           freeratio = free / total
+       return [usedratio, freeratio, total, free, buffer, cache, rest, used, freeratio]
+ 
+ totalMem :: IO Float
+ totalMem = fmap ((*1024) . (!!1)) parseMEM
+@@ -42,15 +43,16 @@ usedMem :: IO Float
+ usedMem = fmap ((*1024) . (!!6)) parseMEM
+ 
+ formatMem :: [Float] -> Monitor [String]
+-formatMem (r:xs) =
+formatMem (r:fr:xs) =
+     do let f = showDigits 0
+            rr = 100 * r
+        ub <- showPercentBar rr r
+        fb <- showPercentBar (100 - rr) (1 - r)
+        rs <- showPercentWithColors r
+       fs <- showPercentWithColors fr
+        s <- mapM (showWithColors f) xs
+-       return (ub:fb:rs:s)
+-formatMem _ = return $ replicate 9 "N/A"
+       return (ub:fb:rs:fs:s)
+formatMem _ = return $ replicate 10 "N/A"
+ 
+ runMem :: [String] -> Monitor String
+ runMem _ =
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
  ];
  extraLibraries = [ libXrandr wirelesstools ];
  configureFlags = "-fwith_xft -fwith_iwlib";
+  patches = [ ./add-freeration-variable.patch ];
  meta = {
    homepage = "http://projects.haskell.org/xmobar/";
    description = "A Minimalistic Text Based Status Bar";
--- a/pkgs/applications/misc/zathura/builder.sh
+++ b/pkgs/applications/misc/zathura/builder.sh
@ -1,11 +1,21 @@
 source $stdenv/setup

 mkdir -pv $out/bin/
+mkdir -pv $out/share/
+mkdir -pv $out/share/applications/
+mkdir -pv $out/share/pixmaps/

 cat > $out/bin/zathura <<EOF
 #!/bin/sh
-exec $zathura --plugins-dir=$plugins_path "\$@"
+exec $zathura_core/bin/zathura --plugins-dir=$plugins_path "\$@"
 EOF

+cp -rv $zathura_core/share/man $out/share
+cp -rv $zathura_core/share/locale $out/share
+cp -rv $icon $out/share/pixmaps/pwmt.xpm
+
+cat $zathura_core/share/applications/zathura.desktop > $out/share/applications/zathura.desktop
+echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
+
 chmod 755 $out/bin/zathura

--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }:

 stdenv.mkDerivation rec {

@ -13,7 +13,14 @@ stdenv.mkDerivation rec {

  buildInputs = [ pkgconfig gtk girara gettext ];

-  makeFlags = "PREFIX=$(out)";
+  # Bug in zathura build system: we should remove empty manfiles in order them
+  # to be compiled properly
+  preBuild = ''
+    rm zathura.1
+    rm zathurarc.5
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];

  meta = {
    homepage = http://pwmt.org/projects/zathura/;
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@ -1,4 +1,4 @@
-{ callPackage, pkgs }:
+{ callPackage, pkgs, fetchurl }:

 rec {
  inherit (pkgs) stdenv;
@ -11,7 +11,9 @@ rec {

  zathura_ps = callPackage ./ps { };

-  zathuraWrapper = stdenv.mkDerivation rec {
+  zathuraWrapper = stdenv.mkDerivation {
+
+    inherit zathura_core;

    name = "zathura-${zathura_core.version}";

@ -21,7 +23,7 @@ rec {
      zathura_ps
    ];

-    zathura = "${zathura_core}/bin/zathura";
+    icon = ./icon.xpm;

    builder = ./builder.sh;

@ -36,7 +38,7 @@ rec {
      '';
      license = stdenv.lib.licenses.zlib;
      platforms = stdenv.lib.platforms.linux;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.smironov ];
    };
  };
 }
--- a/pkgs/applications/misc/zathura/icon.xpm
+++ b/pkgs/applications/misc/zathura/icon.xpm
@ -0,0 +1,120 @@
+/* XPM */
+static char *freeimage[] = {
+/* width height num_colors chars_per_pixel */
+"16 16 96 2",
+/* colors */
+"   c #1e1e1e",
+" . c #222222",
+" X c #212121",
+" o c #535353",
+" O c #a4a4a4",
+" + c #202020",
+" @ c #252525",
+" # c #3c3c3c",
+" $ c #292929",
+" % c #979797",
+" & c #cccccc",
+" * c #303030",
+" = c #1f1f1f",
+" - c #494949",
+" ; c #dddddd",
+" : c #696969",
+" > c #232323",
+" , c #262626",
+" < c #adadad",
+" 1 c #bbbbbb",
+" 2 c #1d1d1d",
+" 3 c #1c1c1c",
+" 4 c #5e5e5e",
+" 5 c #e8e8e8",
+" 6 c #9c9c9c",
+" 7 c #242424",
+" 8 c #b1b1b1",
+" 9 c #b3b3b3",
+" 0 c #090909",
+" q c #161616",
+" w c #131313",
+" e c #4d4d4d",
+" r c #dedede",
+" t c #afafaf",
+" y c #282828",
+" u c #393939",
+" i c #c4c4c4",
+" p c #dcdcdc",
+" a c #9a9a9a",
+" s c #a2a2a2",
+" d c #ababab",
+" f c #313131",
+" g c #a7a7a7",
+" h c #e4e4e4",
+" j c #f2f2f2",
+" k c #eaeaea",
+" l c #e2e2e2",
+" z c #f0f0f0",
+" x c #d5d5d5",
+" c c #737373",
+" v c #323232",
+" b c #808080",
+" n c #7a7a7a",
+" m c #d3d3d3",
+" M c #e5e5e5",
+" N c #8a8a8a",
+" B c #cbcbcb",
+" V c #b5b5b5",
+" C c #b9b9b9",
+" Z c #272727",
+" A c #b4b4b4",
+" S c #bababa",
+" D c #2d2d2d",
+" F c #414141",
+" G c #444444",
+" H c #f4f4f4",
+" J c #838383",
+" K c #cfcfcf",
+" L c #fafafa",
+" P c #efefef",
+" I c #e3e3e3",
+" U c #8d8d8d",
+" Y c #656565",
+" T c #ffffff",
+" R c #fbfbfb",
+" E c #e9e9e9",
+" W c #bdbdbd",
+" Q c #e1e1e1",
+" ! c #dfdfdf",
+" ~ c #646464",
+" ^ c #3a3a3a",
+" / c #a1a1a1",
+" ( c #999999",
+" ) c #c0c0c0",
+" _ c #3b3b3b",
+" ` c #acacac",
+" ' c #050505",
+" ] c #151515",
+" [ c #1b1b1b",
+" { c #1a1a1a",
+" } c #b2b2b2",
+" | c #a5a5a5",
+".  c #c5c5c5",
+".. c #a6a6a6",
+".X c #bfbfbf",
+".o c #747474",
+/* pixels */
+"                                ",
+"   . . . X X X X . o O + X . .  ",
+"   . . X @ # $ . @ % & * = . .  ",
+"   . .   - ; : > , < 1 2 X . .  ",
+"   . . 3 4 5 6 7 7 8 9 0 q q 3  ",
+"   . + w e r t y u i p a s d 4  ",
+"   X f g h j k p l z z x g c v  ",
+"   X f b n m M N c B V 3 , > X  ",
+"   X X   w V C $ Z A S + $ , .  ",
+"   D F G u S H 1 J K L P I U @  ",
+"   Y T T T R E & W Q ! d g ~ 7  ",
+"   ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X  ",
+"   + > 7 { A } 7 @ |.  $ + . .  ",
+"   X X X ].. 8 Z 7 n.X + X . .  ",
+"   . . . { n.o 7 . @ y X X . .  ",
+"                                "
+};
+
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@ -13,13 +13,11 @@
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
 , libXScrnSaver, libXcursor, mesa
-
-# dependencies for v25
-, libvpx
-
-# dependencies for >= v25
 , protobuf

+# dependencies for v25 only
+, libvpx
+
 # dependencies for >= v26
 , speechd, libXdamage

@ -59,7 +57,7 @@ let
    use_system_libexpat = true;
    use_system_libexif = true;
    use_system_libjpeg = true;
-    use_system_libpng = !post24;
+    use_system_libpng = false; # PNG dlopen() version conflict
    use_system_libusb = true;
    use_system_libxml = true;
    use_system_speex = true;
@ -76,7 +74,7 @@ let
    use_system_skia = false;
    use_system_sqlite = false; # http://crbug.com/22208
    use_system_v8 = false;
-  } // optionalAttrs (post24 && !post25) {
+  } // optionalAttrs pre26 {
    use_system_libvpx = true;
    use_system_protobuf = true;
  };
@ -89,14 +87,8 @@ let
    libusb1 libexif
  ];

-  post23 = !versionOlder sourceInfo.version "24.0.0.0";
-  post24 = !versionOlder sourceInfo.version "25.0.0.0";
-  post25 = !versionOlder sourceInfo.version "26.0.0.0";
-  only24 = post23 && !post24;
-  only25 = post24 && !post25;
-
-  maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
-    ./pulse_audio_fix.patch;
+  pre26 = versionOlder sourceInfo.version "26.0.0.0";
+  post25 = !pre26;

 in stdenv.mkDerivation rec {
  name = "${packageName}-${version}";
@ -119,13 +111,13 @@ in stdenv.mkDerivation rec {
    krb5
    glib gtk dbus_glib
    libXScrnSaver libXcursor mesa
+    pciutils protobuf
  ] ++ optional gnomeKeyringSupport libgnome_keyring
    ++ optionals gnomeSupport [ gconf libgcrypt ]
    ++ optional enableSELinux libselinux
    ++ optional cupsSupport libgcrypt
    ++ optional pulseSupport pulseaudio
-    ++ optionals post24 [ pciutils protobuf ]
-    ++ optional only25 libvpx
+    ++ optional pre26 libvpx
    ++ optionals post25 [ speechd libXdamage ];

  opensslPatches = optional useOpenSSL openssl.patches;
@ -134,14 +126,13 @@ in stdenv.mkDerivation rec {

  patches = optional cupsSupport ./cups_allow_deprecated.patch
         ++ optional pulseSupport ./pulseaudio_array_bounds.patch
-         ++ maybeFixPulseAudioBuild
         ++ optional post25 ./clone_detached.patch
         ++ [ ./glibc-2.16-use-siginfo_t.patch ];

-  postPatch = optionalString useOpenSSL ''
+  postPatch = ''
+    sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
+  '' + optionalString useOpenSSL ''
    cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-  '' + optionalString post24 ''
-    sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
  '' + optionalString post25 ''
    sed -i -e 's|/usr/bin/gcc|gcc|' \
      third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
@ -224,6 +215,4 @@ in stdenv.mkDerivation rec {
    license = licenses.bsd3;
    platforms = platforms.linux;
  };
-} // optionalAttrs only25 {
-  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 }
--- a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch
+++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch
@ -1,11 +0,0 @@
--- chromium-build/media/audio/pulse/pulse_output.cc.orig	2012-10-26 09:44:38.509209905 -0700
-+++ chromium-build/media/audio/pulse/pulse_output.cc	2012-10-26 09:45:32.178819603 -0700
-@@ -86,7 +86,7 @@
- 
-   // All channel maps have the same size array of channel positions.
-   for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
-    int channel_position = kChannelOrderings[channel_layout][channel];
-+    int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
-     if (channel_position > -1) {
-       channel_map.map[channel_position] = ChromiumToPAChannelPosition(
-           static_cast<Channels>(channel));
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  dev = {
-    version = "26.0.1410.10";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.10.tar.xz";
-    sha256 = "1s5c69j0g2nanapvq3fmkc5iv7s53x2q5d8fxgdzd7c5c8pzlbby";
+    version = "26.0.1410.28";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
+    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
  };
  beta = {
-    version = "25.0.1364.84";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.84.tar.bz2";
-    sha256 = "1p5k7vpk4v2m5yhhdkplq4iq4mm1vv297m9sp7max1sjbngwq6m5";
+    version = "26.0.1410.28";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
+    sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
  };
  stable = {
-    version = "24.0.1312.70";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.70.tar.bz2";
-    sha256 = "01z2xdfrlw2iynh9ink3d7hddldh2krgx3w9qnq9nq9z54vwwzfq";
+    version = "25.0.1364.152";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
+    sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
  };
 }
--- a/pkgs/applications/networking/browsers/firefox/19.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/19.0.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, libnotify
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite

 , # If you want the resulting program to call itself "Firefox" instead
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "19.0";
+  firefoxVersion = "19.0.2";

-  xulVersion = "19.0"; # this attribute is used by other packages
+  xulVersion = "19.0.2"; # this attribute is used by other packages


  src = fetchurl {
@ -27,7 +27,7 @@ rec {
        # Fall back to this url for versions not available at releases.mozilla.org.
        "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
    ];
-    sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
+    sha1 = "d108d356225379a86d69a4906c706289135f6342";
  };

  commonConfigureFlags =
@ -39,9 +39,9 @@ rec {
      "--with-system-zlib"
      "--with-system-bz2"
      "--with-system-nspr"
-      # "--with-system-nss" # Too old in nixpkgs
+      "--with-system-nss"
      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
+      # "--enable-system-cairo" # <-- doesn't build
      "--enable-system-sqlite"
      "--disable-crashreporter"
      "--disable-tests"
@ -60,7 +60,7 @@ rec {
      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr libnotify xlibs.pixman yasm mesa
+        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
      ];
@ -125,7 +125,7 @@ rec {

    buildInputs =
      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
        xlibs.pixman yasm mesa sqlite file unzip pysqlite
      ];

--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@ -19,6 +19,7 @@
 , cairo
 , atk
 , gdk_pixbuf
+, nss
 , debug ? false

 /* you have to add ~/mm.cfg :
@ -43,9 +44,9 @@ let
        throw "no x86_64 debugging version available"
      else rec {
        # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.262";
+        version = "11.2.202.273";
        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j";
+        sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
      }
    else if stdenv.system == "i686-linux" then
      if debug then {
@ -54,9 +55,9 @@ let
        url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
        sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
      } else rec {
-        version = "11.2.202.262";
+        version = "11.2.202.273";
        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx";
+        sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
      }
    else throw "Flash Player is not supported on this platform";

@ -78,7 +79,7 @@ stdenv.mkDerivation {
  rpath = stdenv.lib.makeLibraryPath
    [ zlib alsaLib curl nspr fontconfig freetype expat libX11
      libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
-      libvdpau
+      libvdpau nss
    ];

  buildPhase = ":";
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@ -1,14 +1,16 @@
-{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }:
+{ stdenv, fetchurl, kde4, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }:
+
+assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077

 stdenv.mkDerivation rec {
-  name = "rekonq-1.1";
+  name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0

  src = fetchurl {
    url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
-    sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l";
+    sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad";
  };

-  buildInputs = [ kdelibs qca2 qoauth ];
+  buildInputs = [ kde4.kdelibs qca2 qoauth ];

  nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ];

--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@ -1,17 +1,26 @@
-{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
-  pkgconfig, webkit }:
+{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
+  pkgconfig, webkit, gsettings_desktop_schemas }:

-stdenv.mkDerivation {
-  name = "vimprobable2-1.2.0";
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "vimprobable2-${version}";
  src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
-    sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
+    sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p";
  };
+
+  # Nixos default ca bundle
+  patchPhase = ''
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ca-bundle.crt, config.h
+  '';
+
  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
+
  installPhase = ''
    make PREFIX=/ DESTDIR=$out install
-    wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
-      ${glib_networking}/lib/gio/modules
+    wrapProgram "$out/bin/vimprobable2" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
  '';

  meta = {
--- a/pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch
+++ b/pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch
@ -0,0 +1,11 @@
+--- bip-0.8.8/src/lex.l.orig
+++ bip-0.8.8/src/lex.l
+@@ -16,7 +16,7 @@
+ int linec;
+ #include "util.h"
+ extern list_t *root_list;
+-void yyparse(void);
+int yyparse(void);
+ void free_conf(list_t*);
+ int conf_error;
+ typedef struct bip bip_t;
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@ -36,6 +36,10 @@ in stdenv.mkDerivation {
    }
  ];

+  postPatch = ''
+    patch -p1 < ${./bip-0.8.8-yyparse.patch}
+  '';
+
  configureFlags = [ "--disable-pie" ];

  buildInputs = [ bison flex autoconf automake openssl ];
@ -45,4 +49,4 @@ in stdenv.mkDerivation {
    homepage = http://bip.milkypond.org/;
    license = stdenv.lib.licenses.gpl2;
  };
-}
+}
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@ -1,17 +1,18 @@
-{stdenv, fetchurl, openssl}:
-stdenv.mkDerivation {
-  name = "msmtp-1.4.21";
+{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
+stdenv.mkDerivation rec {
+  name = "msmtp-1.4.30";

  src = fetchurl {
-    url = mirror://sourceforge/msmtp/msmtp-1.4.21.tar.bz2;
-    sha256 = "1yjgy56n02qs25728psg296amhbdkxq2pv1q3l484f3r9pjrpcrg";
+    url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
+    sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi";
  };

-  buildInputs = [ openssl ];
+  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];

-  meta = { 
+  meta = {
      description = "a MUA";
-      homepage = http://msmtp.sourceforge.net/;
-      license = "GPL";
-    }; 
+      homepage = "http://msmtp.sourceforge.net/";
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+    };
 }
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@ -1,20 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }:
+{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
+  file, inotifyTools, gtk ? null }:

 stdenv.mkDerivation rec {
-  name = "transmission-2.52";
+  name = "transmission-2.60"; # transmission >= 2.61 requires gtk3

  src = fetchurl {
    url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw";
+    sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
  };

-  buildInputs = [ pkgconfig openssl curl intltool libevent ] ++
-                stdenv.lib.optional gtkClient gtk;
+  buildInputs = [ pkgconfig openssl curl intltool libevent
+                  file inotifyTools gtk ];

-  configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
+  preConfigure = ''
+    sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
+  '';

  postInstall = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
+    rm -f $out/share/icons/hicolor/icon-theme.cache
  '';

  meta = {
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@ -3,20 +3,20 @@
 , heimdal, python, lynx, lua5
 }:

-let
-  version = "1.8.3";
-in
+let version = "1.8.5"; in
+
 stdenv.mkDerivation {
  name = "wireshark-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
-    sha256 = "1crg59kkxb7lw1wpfg52hd4l00hq56pyg7f40c7sgqmm0vsmza43";
+    sha256 = "0wp33qa5yvi60b08iiz55wflhr1vwd7680sbwx2kqjlp2s17kr6l";
  };

-  buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
-    glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
-  ];
+  buildInputs =
+    [ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
+      glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
+    ];

  configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";

--- a/pkgs/applications/office/koffice/default.nix
+++ b/pkgs/applications/office/koffice/default.nix
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
    license = "GPL";
    homepage = http://www.koffice.org;
    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (kdelibs.meta) platforms;
+    # doesn't build, seems dead and superseded by calligra
+    #inherit (kdelibs.meta) platforms;
  };
 }
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@ -14,7 +14,7 @@ let
    version="5.4.0";
    name="${baseName}-${version}";
    url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
-    hash="0nyq2kkiphwgj3hczc7zglzqjj6hxxsh6zcygpy4yhxh9a9rpkg1";
+    hash="0rvrmh3vw4bk7mj29bx1pi76g2bsqyc13gsnpa1cbjs5pzyhm780";
  };
 in
 rec {
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -43,13 +43,16 @@ rec {
  });

  gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh;
-    inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP
-      blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
-      network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
-      extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
-      transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
-      SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob;
+    inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync;
+    inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter
+      caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns
+      editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
+      hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
+      monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
+      QuickCheck random regexCompat SafeSemaphore SHA stm text time
+      transformers transformersBase utf8String uuid wai waiLogger warp
+      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
+      cabalInstall;
  };

  qgit = import ./qgit {
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -1,49 +1,50 @@
-{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync
-, findutils, curl, ikiwiki, which, openssh
-, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive
-, clientsession, cryptoApi, dataDefault, dataenc, dbus
-, editDistance, extensibleExceptions, filepath, hamlet, hinotify
-, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase
-, MissingH, monadControl, mtl, network, networkInfo
-, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
-, transformers, transformersBase, utf8String, wai, waiLogger, warp
-, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
-, networkProtocolXmpp, async, dns, DAV, uuid, Glob
+{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder
+, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
+, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git
+, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit
+, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network
+, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
+, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
+, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
+, yesod, yesodDefault, yesodForm, yesodStatic, testpack
+, cabalInstall		# TODO: remove this build input at the next update
 }:

 let
-  version = "3.20130216";
+  version = "4.20130227";
 in
 stdenv.mkDerivation {
  name = "git-annex-${version}";

  src = fetchurl {
    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
-    sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr";
+    sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6";
    name = "git-annex-${version}.tar.gz";
  };

-  buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which
-    openssh blazeBuilder blazeHtml bloomfilter caseInsensitive
-    clientsession cryptoApi dataDefault dataenc dbus editDistance
-    extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP
-    httpTypes IfElse json liftedBase MissingH monadControl mtl network
-    networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
-    transformers transformersBase utf8String wai waiLogger warp yesod
-    yesodDefault yesodStatic testpack SafeSemaphore networkProtocolXmpp
-    async dns DAV uuid Glob ];
+  buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki
+    caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus
+    dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet
+    hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase
+    lsof MissingH monadControl mtl network networkInfo networkMulticast
+    networkProtocolXmpp openssh QuickCheck random regexCompat rsync
+    SafeSemaphore SHA stm text time transformers transformersBase utf8String
+    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
+    yesodStatic which perl testpack cabalInstall ];

-  checkTarget = "test";
-  doCheck = true;
-
-  preConfigure = ''
+  configurePhase = ''
    makeFlagsArray=( PREFIX=$out )
-    sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
-    sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
-    # Remove this patch after the next update!
-    sed -i -e '9i #define WITH_OLD_URI' Utility/Url.hs
+    patchShebangs .
+
+    # cabal-install wants to store stuff in $HOME
+    mkdir ../tmp
+    export HOME=$PWD/../tmp
+
+    cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
  '';

+  checkPhase = "./git-annex test";
+
  meta = {
    homepage = "http://git-annex.branchable.com/";
    description = "Manage files with git without checking them into git";
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -31,6 +31,9 @@ stdenv.mkDerivation {
         docbook_xsl docbook_xml_dtd_45 libxslt ]
    ++ stdenv.lib.optionals guiSupport [tcl tk];

+  # required to support pthread_cancel()
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+
  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "");
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@ -0,0 +1,25 @@
+{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
+, MissingH, mtl, network, prettyShow
+}:
+
+cabal.mkDerivation (self: {
+  pname = "github-backup";
+  version = "1.20120314";
+  src = fetchurl {
+    url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
+    sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
+    name = "github-backup-${self.pname}.tar.gz";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    extensibleExceptions filepath github hslogger IfElse MissingH mtl
+    network prettyShow
+  ];
+  meta = {
+    homepage = "https://github.com/joeyh/github-backup";
+    description = "backs up everything github knows about a repository, to the repository";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/applications/video/makemkv/builder.sh
+++ b/pkgs/applications/video/makemkv/builder.sh
@ -0,0 +1,38 @@
+source $stdenv/setup
+set -x
+
+lib=" \
+  makemkv-oss-${ver}/out/libdriveio.so.0 \
+  makemkv-oss-${ver}/out/libmakemkv.so.1 \
+  "
+
+bin=" \
+  makemkv-oss-${ver}/out/makemkv \
+  makemkv-bin-${ver}/bin/amd64/makemkvcon \
+  "
+
+tar xzf ${src_bin}
+tar xzf ${src_oss}
+
+(
+  cd makemkv-oss-${ver}
+  make -f makefile.linux
+)
+
+chmod +x ${bin}
+
+libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file?
+
+for i in ${bin} ; do
+  patchelf \
+    --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    --set-rpath $libPath \
+    ${i}
+done 
+
+ensureDir $out/bin
+ensureDir $out/lib
+ensureDir $out/share/MakeMKV
+cp ${lib} ${out}/lib
+cp ${bin} ${out}/bin
+cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchurl
+, openssl, qt4, mesa, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "makemkv-${ver}";
+  ver = "1.8.0";
+  builder = ./builder.sh;
+
+  src_bin = fetchurl {
+    url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
+    sha256 = "1f465rdv5ibnh5hnfmvmlid0yyzkansjw8l1mi5qd3bc6ca4k30c";
+  };
+
+  src_oss = fetchurl { 
+    url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
+    sha256 = "0kj1mpkzz2cvi0ibdgdzfwbh9k2jfj3ra5m3hd7iyc5ng21v4sk3";
+  };
+
+  buildInputs = [openssl qt4 mesa zlib];
+
+  libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] 
+          + ":" + stdenv.gcc.gcc + "/lib64";
+
+  meta = {
+    description = "convert blu-ray and dvd to mkv";
+    longDescription = ''
+      makemkv is a one-click QT application that transcodes an encrypted
+      blu-ray or DVD disc into a more portable set of mkv files, preserving
+      subtitles, chapter marks, all video and audio tracks.
+
+      Program is time-limited -- it will stop functioning after 60 days. You
+      can always download the latest version from makemkv.com that will reset the
+      expiration date.
+    '';
+    license = "unfree";
+    homepage = http://makemkv.com;
+  };
+}
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@ -16,11 +16,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "mkvtoolnix-5.9.0";
+  name = "mkvtoolnix-6.1.0";

  src = fetchurl {
-    url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
-    sha256 = "1qdxzi72w5p77brlpp7y7llsgzlvl4p8fk1kzg934cqw6cqza4yr";
+    url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
+    sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x";
  };

  buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
@ -39,4 +39,3 @@ stdenv.mkDerivation rec {
    homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
  };
 }
-
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@ -152,6 +152,8 @@ stdenv.mkDerivation rec {

  NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";

+  installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui";
+
  enableParallelBuilding = true;

  # Provide a reasonable standard font.  Maybe we should symlink here.
@ -159,6 +161,9 @@ stdenv.mkDerivation rec {
    ''
      mkdir -p $out/share/mplayer
      cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
+      if test -f $out/share/applications/mplayer.desktop ; then
+        echo "NoDisplay=True" >> $out/share/applications/mplayer.desktop
+      fi
    '';

  crossAttrs = {
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@ -2,7 +2,7 @@
 , pkgconfig, cmake, gnumake, yasm, python
 , boost
 , gettext, pcre, yajl, fribidi
-, openssl, gperf
+, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
 , libX11, xproto, inputproto
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
@ -30,11 +30,11 @@ assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;

 stdenv.mkDerivation rec {
-    name = "xbmc-11.0";
+    name = "xbmc-12.0";

    src = fetchurl {
      url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19";
+      sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
    };

    buildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
      pkgconfig cmake gnumake yasm python
      boost
      gettext pcre yajl fribidi
-      openssl gperf
+      openssl gperf tinyxml2 taglib libssh swig jre
      libX11 xproto inputproto
      libXt libXmu libXext xextproto
      libXinerama libXrandr randrproto
@ -86,5 +86,7 @@ stdenv.mkDerivation rec {
      homepage = http://xbmc.org/;
      description = "XBMC Media Center";
      license = "GPLv2";
+      platforms = stdenv.lib.platforms.linux; 
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
    };
 }
--- a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
+++ b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
@ -0,0 +1,22 @@
+commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb
+Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date:   Thu Feb 28 13:46:12 2013 +0000
+
+    Linux 3.9.0 rc0 compile fix
+
+    git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f
+
+diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+index ec9b502..7a208d1 100644
+--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -90,6 +90,9 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/sched.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+# include <linux/sched/rt.h>
+#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
+ # include <linux/jiffies.h>
+ #endif
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -11,8 +11,8 @@ with stdenv.lib;

 let

-  version = "4.2.6";
-  extpackRevision = "82870";
+  version = "4.2.8";
+  extpackRevision = "83876";

  forEachModule = action: ''
    for mod in \
@ -35,7 +35,7 @@ let
    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
         + ".vbox-extpack";
    # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582";
+    sha256 = "fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c";
    url = "https://www.virtualbox.org/wiki/Downloads";
  };

@ -44,7 +44,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3";
+    sha256 = "f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78";
  };

  buildInputs =
@ -54,6 +54,11 @@ in stdenv.mkDerivation {
    ++ optional javaBindings jdk
    ++ optional pythonBindings python;

+  patches = [
+    ./strict_types.patch
+    ./build_fix_3.9.0.patch
+  ];
+
  prePatch = ''
    set -x
    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@ -2,14 +2,14 @@
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
 , dbus }:

-let version = "4.2.6"; in
+let version = "4.2.8"; in

 stdenv.mkDerivation {
  name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr";
+    sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
  };

  KERN_DIR = "${kernel}/lib/modules/*/build";
--- a/pkgs/applications/virtualization/virtualbox/strict_types.patch
+++ b/pkgs/applications/virtualization/virtualbox/strict_types.patch
@ -0,0 +1,68 @@
+diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+index 9cc124c..d86da0c 100644
+--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice =
+ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+    return from_kuid(current_user_ns(), current_uid());
+# else
+     return current->cred->uid;
+# endif
+ #else
+     return current->uid;
+ #endif
+@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
+ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+    return from_kgid(current_user_ns(), current_gid());
+# else
+     return current->cred->gid;
+# endif
+ #else
+     return current->gid;
+ #endif
+@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
+ DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+    return from_kuid(current_user_ns(), current_euid());
+# else
+     return current->cred->euid;
+# endif
+ #else
+     return current->euid;
+ #endif
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+index 575f739..8909e79 100644
+--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns)
+         if (!pNewCreds)
+                 goto done;
+ 
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
+# else
+         pNewCreds->fsuid = 0;
+# endif
+         pOldCreds = override_creds(pNewCreds);
+ #endif
+ 
+@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns)
+         if (!pNewCreds)
+             goto done;
+ 
+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
+# else
+         pNewCreds->fsuid = 0;
+# endif
+         pOldCreds = override_creds(pNewCreds);
+ #endif
+         RTStrPrintf(szFileBuf, cMaxBuf,
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig
+, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
+, libXpm, librsvg, libpng, fribidi, perl
+}:
+
+stdenv.mkDerivation rec {
+  name = "fvwm-2.6.5";
+
+  src = fetchurl {
+    url = "ftp://ftp.fvwm.org/pub/fvwm/version-2/${name}.tar.bz2";
+    sha256 = "1ks8igvmzm0m0sra05k8xzc8vkqy3gv1qskl6davw1irqnarjm11";
+  };
+
+  buildInputs = [
+    pkgconfig cairo fontconfig freetype
+    libXft libXcursor libXinerama libXpm
+    librsvg libpng fribidi perl
+  ];
+
+  meta = {
+    homepage = "http://fvwm.org";
+    description = "A multiple large virtual desktop window manager";
+    license = "GPLv2+";
+  };
+}
+
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@ -88,17 +88,16 @@
            jailbreak = false;

            # pass the '--enable-split-objs' flag to cabal in the configure stage
-            enableSplitObjs = true;
+            enableSplitObjs = !stdenv.isDarwin;         # http://hackage.haskell.org/trac/ghc/ticket/4013

            # pass the '--enable-tests' flag to cabal in the configure stage
            # and run any regression test suites the package might have
-            doCheck = true;
+            doCheck = stdenv.lib.versionOlder "7" ghc.ghcVersion;

            extraConfigureFlags = [
              (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
              (stdenv.lib.enableFeature self.enableSplitObjs "split-objs")
-              (stdenv.lib.enableFeature self.doCheck "tests")
-            ];
+            ] ++ stdenv.lib.optional (stdenv.lib.versionOlder "7" ghc.ghcVersion) (stdenv.lib.enableFeature self.doCheck "tests");

            # compiles Setup and configures
            configurePhase = ''
@ -122,7 +121,7 @@
              done

              echo "configure flags: $extraConfigureFlags $configureFlags"
-              ./Setup configure --verbose --prefix="$out" $extraConfigureFlags $configureFlags
+              ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' --libsubdir='$pkgid' $extraConfigureFlags $configureFlags

              eval "$postConfigure"
            '';
@ -157,7 +156,7 @@

              ensureDir $out/bin # necessary to get it added to PATH

-              local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
+              local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
              local installedPkgConf=$confDir/${self.fname}.installedconf
              local pkgConf=$confDir/${self.fname}.conf
              ensureDir $confDir
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -223,6 +223,20 @@ rec {
    ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/
  ];

+  xfce = [
+    http://archive.xfce.org/
+    http://mirror.netcologne.de/xfce/
+    http://archive.se.xfce.org/xfce/
+    http://archive.be.xfce.org/xfce/
+    http://mirror.perldude.de/archive.xfce.org/
+    http://archive.be2.xfce.org/
+    http://ftp.udc.es/xfce/
+    http://archive.al-us.xfce.org/
+    http://mirror.yongbok.net/X11/xfce-mirror/
+    http://mirrors.tummy.com/pub/archive.xfce.org/
+    http://xfce.mirror.uber.com.au/
+  ];
+
  # X.org.
  xorg = [
    http://xorg.freedesktop.org/releases/
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@ -83,7 +83,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
    ''; # */

    meta = (if args ? meta then args.meta else {}) // {
-      description = "Build of a Deb package on ${diskImage.fullName} (${diskImage.name})";
+      description = "Deb package for ${diskImage.fullName}";
    };
  }

--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@ -111,7 +111,7 @@ stdenv.mkDerivation (
      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];

    meta = (if args ? meta then args.meta else {}) // {
-      description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
+      description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.system}";
    };

  }
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@ -33,21 +33,21 @@ vmTools.buildRPM (
      rpm -Up ''${rpms[*]} --excludepath /nix/store

      eval "$postRPMInstall"
-      
+
      echo "uninstalling ''${rpmNames[*]}..."
      rpm -e ''${rpmNames[*]} --nodeps

      for i in $out/rpms/*/*.src.rpm; do
        echo "file srpm $i" >> $out/nix-support/hydra-build-products
      done
-      
+
      for rpmdir in $extraRPMs ; do
        echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
      done
    ''; # */

    meta = (if args ? meta then args.meta else {}) // {
-      description = "Build of an RPM package on ${diskImage.fullName} (${diskImage.name})";
+      description = "RPM package for ${diskImage.fullName}";
    };
  }

--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@ -6,23 +6,15 @@
 , buildInputs ? []
 , name ? "source-tarball"
 , version ? "0"
-, versionSuffix ? 
+, versionSuffix ?
    if officialRelease
    then ""
    else "pre${toString (src.rev or src.revCount or "")}"
 , src, stdenv, autoconf, automake, libtool
+, # By default, provide all the GNU Build System as input.
+  bootstrapBuildInputs ? [ autoconf automake libtool ]
 , ... } @ args:

-let
-
-  # By default, provide all the GNU Build System as input.
-  bootstrapBuildInputs =
-    if (args ? bootstrapBuildInputs)
-    then args.bootstrapBuildInputs
-    else [ autoconf automake libtool ];
-
-in
-
 stdenv.mkDerivation (

  # First, attributes that can be overriden by the caller (via args):
@ -82,17 +74,17 @@ stdenv.mkDerivation (
  }

  # Then, the caller-supplied attributes.
-  // args // 
+  // args //

  # And finally, our own stuff.
  {
    name = name + "-" + version + versionSuffix;

    buildInputs = buildInputs ++ bootstrapBuildInputs;
-    
+
    preUnpack = ''
      mkdir -p $out/nix-support
-    '';  
+    '';

    postUnpack = ''
      # Set all source files to the current date.  This is because Nix
@ -126,7 +118,7 @@ stdenv.mkDerivation (
    };

    meta = (if args ? meta then args.meta else {}) // {
-      description = "Build of a source distribution from a checkout";
+      description = "Source distribution";

      # Tarball builds are generally important, so give them a high
      # default priority.
--- a/pkgs/build-support/upstream-updater/urls-from-page.sh
+++ b/pkgs/build-support/upstream-updater/urls-from-page.sh
@ -9,6 +9,6 @@ relpath="${path#$server}"
 
 echo "URL: $url" >&2

-curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \
+curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|([^" <>&]+)[ <>&])/\n+\2\3\n-/g' | \
  sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
  sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`"
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1367,22 +1367,22 @@ rec {
    };

    debian60i386 = {
-      name = "debian-6.0.6-squeeze-i386";
-      fullName = "Debian 6.0.6 Squeeze (i386)";
+      name = "debian-6.0.7-squeeze-i386";
+      fullName = "Debian 6.0.7 Squeeze (i386)";
      packagesList = fetchurl {
        url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
-        sha256 = "18c0473jacd877nkky1x21dkmp4992d8qra6wj07sq0yz5gdc9c4";
+        sha256 = "a770f26b5fce1a16460b68f135dfe97f4f4a9894b538ece0104a508c83ec65d5";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
    };

    debian60x86_64 = {
-      name = "debian-6.0.6-squeeze-amd64";
-      fullName = "Debian 6.0.6 Squeeze (amd64)";
+      name = "debian-6.0.7-squeeze-amd64";
+      fullName = "Debian 6.0.7 Squeeze (amd64)";
      packagesList = fetchurl {
        url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
-        sha256 = "1n1h3pz6axcaraxq8gfzq0jywlpdrqand1dnd4q79dy6cl788bi2";
+        sha256 = "b2bb561bde59ac67e07c70aa7c86a33f237436e6891796a93c6ed6ffb032080e";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "man-pages-3.45";
+  name = "man-pages-3.48";

  src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
-    sha256 = "1lwqrp79xcyhnjlyg1n0imz5wc88lpgv909xxz8bdgbk7c1mky0h";
+    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
+    sha256 = "6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682";
  };

  preBuild =
--- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix
+++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "mousepad-0.2.16";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2";
-    sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
-  };
-
-  buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ];
-
-  meta = {
-    homepage = http://www.xfce.org/projects/mousepad/;
-    description = "A simple text editor for Xfce";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix
+++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
-, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
-
-stdenv.mkDerivation rec {
-  name = "ristretto-0.2.3";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/ristretto/0.2/${name}.tar.bz2";
-    sha1 = "5a34b865cb9013b67467b0e8d51970f0a1e977d1";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool libexif gtk dbus_glib libxfce4util
-      libxfce4ui xfconf
-    ];
-
-  meta = {
-    homepage = http://goodies.xfce.org/projects/applications/ristretto;
-    description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/applications/terminal.nix
+++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix
@ -1,25 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig, ncurses
-, intltool, vte
-, exo, libxfce4util
-, gtk
-}:
-
-stdenv.mkDerivation {
-  name = "xfce-terminal-0.4.8";
-
-  src = fetchurl {
-    url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2;
-    sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
-  };
-
-  buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];
-
-  meta = {
-    homepage = http://www.xfce.org/projects/terminal;
-    description = "A modern terminal emulator primarily for the Xfce desktop environment";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-notifyd-0.2.2";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2";
-    sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
-  };
-
-  buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ];
-
-  meta = {
-    homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
-    description = "The Xfce Notify Daemon";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-taskmanager-1.0.0";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2";
-    sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
-  };
-
-  buildInputs = [ intltool pkgconfig gtk ];
-
-  meta = {
-    homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager;
-    description = "Easy to use task manager for XFCE";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/exo.nix
+++ b/pkgs/desktops/xfce-4.8/core/exo.nix
@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util }:
-
-stdenv.mkDerivation rec {
-  name = "exo-0.6.2";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/exo/0.6/${name}.tar.bz2";
-    sha1 = "2486f12c814630068665e22cdf417f0f0f05dab1";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool URI glib gtk libxfce4util ];
-
-  meta = {
-    homepage = http://www.xfce.org/projects/exo;
-    description = "Application library for the Xfce desktop environment";
-    license = "GPLv2+";
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
-, libstartup_notification }:
-
-stdenv.mkDerivation rec {
-  name = "libxfce4ui-4.8.1";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2";
-    sha1 = "408645581e589135aa03d2e9b84f4eede68596b2";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util xfconf
-      libstartup_notification
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Basic GUI library for Xfce";
-    license = "LGPLv2+";
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/thunar.nix
+++ b/pkgs/desktops/xfce-4.8/core/thunar.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }:
-
-stdenv.mkDerivation rec {
-  version = "1.2.3";
-  name = "thunar-${version}";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2";
-    sha1 = "a05d0e14515d70c5ad94cca881822a707d366863";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool gtk exo libxfce4util libxfce4ui
-      dbus_glib libstartup_notification xfconf xfce4panel udev libnotify
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://thunar.xfce.org/;
-    description = "Xfce file manager";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, garcon
-, libxfce4ui, xfconf, libwnck, exo }:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-panel-4.8.6";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2";
-    sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
-  };
-
-  patches = [ ./xfce4-panel-datadir.patch ];
-  patchFlags = "-p1";
-
-  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf
-      exo libwnck
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Xfce panel";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, dbus_glib, xfconf, xorg, xfce4panel }:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-session-4.8.2";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2";
-    sha1 = "636c2983552861a959225e554898675152a4d812";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
-      xfconf xorg.iceauth xfce4panel
-    ];
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Session manager for Xfce";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, xfconf, xorg, libnotify, libxklavier }:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-settings-4.8.3";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2";
-    sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool exo gtk libxfce4util libxfce4ui
-      xfconf libnotify xorg.libXcursor libxklavier
-    ];
-
-  configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Settings manager for Xfce";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfconf.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfconf.nix
@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
-
-stdenv.mkDerivation rec {
-  name = "xfconf-4.8.1";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2";
-    sha1 = "aeab124f7c548e387b37a5476e594ef559515533";
-  };
-
-  buildInputs = [ pkgconfig intltool glib libxfce4util ];
-
-  propagatedBuildInputs = [ dbus_glib ];
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Simple client-server configuration storage and query system for Xfce";
-    license = "GPLv2";
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, libxfce4util
-, libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }:
-
-stdenv.mkDerivation rec {
-  name = "xfdesktop-4.8.3";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2";
-    sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool gtk dbus_glib libxfce4util libxfce4ui libwnck xfconf
-      garcon libnotify exo
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Xfce desktop manager";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfwm4.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libxfce4util
-, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
-
-stdenv.mkDerivation rec {
-  name = "xfwm4-4.8.3";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2";
-    sha1 = "6d27deca383e0c2fba0cede0bbe0e9aee18e9257";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf
-      libwnck libstartup_notification
-      xorg.libXcomposite xorg.libXfixes xorg.libXdamage
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Window manager for Xfce";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@ -1,94 +0,0 @@
-{ callPackage, pkgs }:
-
-rec {
-  inherit (pkgs) gtk glib;
-
-  #### SUPPORT
-
-  # The useful bits from ‘gnome-disk-utility’.
-  libgdu = callPackage ./support/libgdu.nix { };  
-
-  # Gvfs is required by Thunar for the trash feature and for volume
-  # mounting.  Should use the one from Gnome, but I don't want to mess
-  # with the Gnome packages (or pull in a zillion Gnome dependencies).
-  gvfs = callPackage ./support/gvfs.nix { };
-
-  
-  #### CORE
-
-  libxfce4util = callPackage ./core/libxfce4util.nix { };
-
-  exo = callPackage ./core/exo.nix {
-    inherit (pkgs.perlPackages) URI;
-  };
-
-  xfconf = callPackage ./core/xfconf.nix { };
-  
-  libxfcegui4 = callPackage ./core/libxfcegui4.nix {
-    inherit (pkgs.gnome) libglade;
-  };
-
-  libxfce4ui = callPackage ./core/libxfce4ui.nix { };
-
-  xfwm4 = callPackage ./core/xfwm4.nix {
-    inherit (pkgs.gnome) libwnck;
-  };
-
-  xfceutils = callPackage ./core/xfce-utils.nix { };
-
-  garcon = callPackage ./core/garcon.nix { };
-
-  xfce4panel = callPackage ./core/xfce4-panel.nix {
-    inherit (pkgs.gnome) libwnck;
-  };
-
-  xfce4session = callPackage ./core/xfce4-session.nix {
-    inherit (pkgs.gnome) libwnck;
-  };
-
-  xfce4settings = callPackage ./core/xfce4-settings.nix { };
-
-  xfdesktop = callPackage ./core/xfdesktop.nix {
-    inherit (pkgs.gnome) libwnck;
-  };
-
-  thunar = callPackage ./core/thunar.nix { };
-
-  thunar_volman = callPackage ./core/thunar-volman.nix { };
-
-  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
-
-  xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
-
-
-  #### APPLICATIONS
-  
-  terminal = callPackage ./applications/terminal.nix {
-    inherit (pkgs.gnome) vte;
-  };
-
-  gigolo = callPackage ./applications/gigolo.nix { };
-
-  mousepad = callPackage ./applications/mousepad.nix { };
-
-  ristretto = callPackage ./applications/ristretto.nix { };
-
-  xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { };
-
-  xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
-
-  xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
-
-  xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
-
-  
-  #### ART
-
-  xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
-
-  #### PANEL PLUGINS
-  
-  xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {};
-  xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {};
-  
-}
--- a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix
+++ b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
-
-stdenv.mkDerivation rec {
-  name = "xfce4-cpufreq-plugin-1.0.0";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2";
-    sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";
-  };
-
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "CPU Freq load panel plugin for Xfce";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/desktops/xfce-4.8/applications/gigolo.nix
+++ b/pkgs/desktops/xfce-4.8/applications/gigolo.nix
@ -1,12 +1,15 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}:
+{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:

 stdenv.mkDerivation rec {
-  name = "gigolo-0.4.1";
-  
+  p_name  = "gigolo";
+  ver_maj = "0.4";
+  ver_min = "1";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2";
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
    sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs = [ python gettext intltool gtk pkgconfig gvfs];

@ -15,8 +18,8 @@ stdenv.mkDerivation rec {
  '';

  meta = {
-    homepage = http://goodies.xfce.org/projects/applications/gigolo;
-    description = "Gigolo is a frontend to easily manage connections to remote filesystems";
+    homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
+    description = "A frontend to easily manage connections to remote filesystems";
    platforms = stdenv.lib.platforms.linux;
  };
-}
+}
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/pkgs/desktops/xfce/applications/mousepad.nix
@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4
+, gtk, gtksourceview, dbus, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  p_name  = "mousepad";
+  ver_maj = "0.3";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [
+    pkgconfig intltool libxfce4util libxfcegui4
+    gtk gtksourceview dbus dbus_glib
+  ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "A simple text editor for Xfce";
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/desktops/xfce/applications/ristretto.nix
+++ b/pkgs/desktops/xfce/applications/ristretto.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
+, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
+
+stdenv.mkDerivation rec {
+  p_name  = "ristretto";
+  ver_maj = "0.6";
+  ver_min = "3";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs =
+    [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util
+      libxfce4ui xfconf
+    ];
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
+    description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
--- a/pkgs/desktops/xfce/applications/terminal.nix
+++ b/pkgs/desktops/xfce/applications/terminal.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib
+, exo, libxfce4util, libxfce4ui
+}:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-terminal";
+  ver_maj = "0.6";
+  ver_min = "1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ];
+
+  meta = {
+    homepage = http://www.xfce.org/projects/terminal;
+    description = "A modern terminal emulator primarily for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
@ -1,8 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
-, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk
+, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }:

 let
-
  # The usual Gstreamer plugins package has a zillion dependencies
  # that we don't need for a simple mixer, so build a minimal package.
  gst_plugins_minimal = gst_plugins_base.override {
@ -12,16 +11,19 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "xfce4-mixer-4.8.0";
-  
+  p_name  = "xfce4-mixer";
+  ver_maj = "4.10";
+  ver_min = "0";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.8/${name}.tar.bz2";
-    sha1 = "24f3401a68f10d2c620e354a6de98e09fe808665";
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs =
    [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
-      libxfce4util libxfce4ui xfce4panel xfconf
+      libxfce4util libxfce4ui xfce4panel xfconf libunique
    ];

  postInstall =
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
    '';

  meta = {
-    homepage = http://www.xfce.org/projects/xfce4-mixer;
+    homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive
    description = "A volume control application for the Xfce desktop environment";
    license = "GPLv2+";
    platforms = stdenv.lib.platforms.linux;
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, gtk , libxfce4util, libxfce4ui, xfconf }:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-notifyd";
+  ver_maj = "0.2";
+  ver_min = "2";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf ];
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+    # to be able to run the daemon we need it in PATH
+    cp -l $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
+  '';
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
+    description = "Notification daemon for Xfce";
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-taskmanager";
+  ver_maj = "1.0";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ intltool pkgconfig gtk libwnck ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
+    description = "Easy to use task manager for Xfce";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
@ -1,12 +1,15 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk }:

 stdenv.mkDerivation rec {
-  name = "xfce4-icon-theme-4.4.3";
-  
+  p_name  = "xfce4-icon-theme";
+  ver_maj = "4.4";
+  ver_min = "3";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
-    sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
+    url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs = [ pkgconfig intltool gtk ];

--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }:
+
+stdenv.mkDerivation rec {
+  p_name  = "exo";
+  ver_maj = "0.10";
+  ver_min = "2";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ];
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = "http://www.xfce.org/projects/${p_name}";
+    description = "Application library for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/desktops/xfce-4.8/core/garcon.nix
+++ b/pkgs/desktops/xfce-4.8/core/garcon.nix
@ -1,12 +1,15 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:

 stdenv.mkDerivation rec {
-  name = "garcon-0.1.9";
-  
+  p_name  = "garcon";
+  ver_maj = "0.2";
+  ver_min = "0";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2";
-    sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952";
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs = [ pkgconfig intltool glib libxfce4util ];

--- a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
@ -1,15 +1,18 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk }:

 stdenv.mkDerivation rec {
-  name = "gtk-xfce-engine-2.8.1";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/gtk-xfce-engine/2.8/${name}.tar.bz2";
-    sha1 = "d7779f07cc76585be063bc25fa91e660e1fd9c97";
-  };
+  p_name  = "gtk-xfce-engine";
+  ver_maj = "3.0";
+  ver_min = "1";

-  buildInputs =
-    [ pkgconfig intltool gtk ];
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  #TODO: gtk3
+  buildInputs = [ pkgconfig intltool gtk ];

  meta = {
    homepage = http://www.xfce.org/;
--- a/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
@ -2,14 +2,17 @@
 , libglade, libstartup_notification }:

 stdenv.mkDerivation rec {
-  name = "libxfcegui4-4.8.1";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/libxfcegui4/4.8/${name}.tar.bz2";
-    sha1 = "246fcaa71fc8cf44dae0b4c919411231eedd662f";
-  };
+  p_name  = "libxfce4ui";
+  ver_maj = "4.10";
+  ver_min = "0";

-  # By default, libxfcegui4 tries to install into libglade's prefix.
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  #TODO: gladeui
  # Install into our own prefix instead.
  preConfigure =
    ''
@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
    '';

  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util libglade
+    [ pkgconfig intltool gtk libxfce4util xfconf libglade
      libstartup_notification
    ];

--- a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
@ -1,12 +1,15 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool }:

 stdenv.mkDerivation rec {
-  name = "libxfce4util-4.8.2";
-  
+  p_name  = "libxfce4util";
+  ver_maj = "4.10";
+  ver_min = "0";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2";
-    sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3";
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs = [ pkgconfig glib intltool ];

--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce/core/libxfcegui4.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk
+, libxfce4util, xfconf, libglade, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  p_name  = "libxfcegui4";
+  ver_maj = "4.10";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  #TODO: gladeui
+  # By default, libxfcegui4 tries to install into libglade's prefix.
+  # Install into our own prefix instead.
+  preConfigure =
+    ''
+      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
+    '';
+  #NOTE: missing keyboard library support is OK according to the mailing-list
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util xfconf libglade
+      libstartup_notification
+    ];
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic GUI library for Xfce";
+    license = "LGPLv2+";
+  };
+}
--- a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
+++ b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix
@ -2,22 +2,26 @@
 , xfconf, udev, libnotify }:

 stdenv.mkDerivation rec {
-  name = "thunar-volman-0.6.0";
-  
+  p_name  = "thunar-volman";
+  ver_maj = "0.8";
+  ver_min = "0";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2";
-    sha1 = "dcda936948623b342b290a78c294f71c038e832e";
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs =
    [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
      xfconf libnotify
    ];
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

  enableParallelBuilding = true;

  meta = {
-    homepage = http://thunar.xfce.org/;
+    homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
    description = "Thunar extension for automatic management of removable drives and media";
    license = "GPLv2+";
    platforms = stdenv.lib.platforms.linux;
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ b/pkgs/desktops/xfce/core/thunar.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev
+, exo, libxfce4util,  xfconf, xfce4panel
+}:
+
+stdenv.mkDerivation rec {
+  p_name  = "thunar";
+  ver_maj = "1.6";
+  ver_min = "2";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
+    sha256 = "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [
+    pkgconfig intltool
+    gtk dbus_glib libstartup_notification libnotify libexif pcre udev
+    exo libxfce4util xfconf xfce4panel
+  ];
+  # TODO: optionality?
+
+  enableParallelBuilding = true;
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = http://thunar.xfce.org/;
+    description = "Xfce file manager";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/pkgs/desktops/xfce/core/tumbler.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  p_name  = "tumbler";
+  ver_maj = "0.1";
+  ver_min = "27";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf ];
+
+  meta = {
+    homepage = http://git.xfce.org/xfce/tumbler/;
+    description = "A D-Bus thumbnailer service";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
@ -1,19 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }:
+{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, dbus_glib }:

 stdenv.mkDerivation rec {
-  name = "xfce-utils-4.8.3";
-  
-  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2";
-    sha1 = "159d445b689ebbf73462a4b4baf5cce4e04afaab";
-  };
+  name = "xfce-utils-${v}";
+  src = fetchXfce.core name h;

  configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org";

-  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui ];
+  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui dbus_glib ];
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

  meta = {
-    homepage = http://www.xfce.org/;
+    homepage = http://www.xfce.org/projects/xfce-utils;
    description = "Utilities and scripts for Xfce";
    license = "GPLv2+";
    platforms = stdenv.lib.platforms.linux;
--- a/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix
@ -2,12 +2,15 @@
 , libxfce4ui, garcon, xfconf }:

 stdenv.mkDerivation rec {
-  name = "xfce4-appfinder-4.8.0";
-  
+  p_name  = "xfce4-appfinder";
+  ver_maj = "4.9"; # no 4.10 (stable) release yet
+  ver_min = "4";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/xfce4-appfinder/4.8/${name}.tar.bz2";
-    sha1 = "444bbcbded8d2346f9b9beb57ec7adaf556811c9";
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs =
    [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  meta = {
-    homepage = http://www.xfce.org/;
+    homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
    description = "Xfce application finder, a tool to locate and launch programs on your system";
    license = "GPLv2+";
    platforms = stdenv.lib.platforms.linux;
--- a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
+, libwnck, exo, garcon, xfconf, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-panel";
+  ver_maj = "4.10";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  patches = [ ./xfce4-panel-datadir.patch ];
+  patchFlags = "-p1";
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util exo libwnck
+      garcon xfconf libstartup_notification
+    ];
+  propagatedBuildInputs = [ libxfce4ui ];
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.xfce.org/projects/xfce4-panel;
+    description = "Xfce panel";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix
@ -2,17 +2,21 @@
 , libxfce4ui, libxfce4util, libnotify, xfce4panel }:

 stdenv.mkDerivation rec {
-  name = "xfce4-power-manager-1.0.10";
-  
+  p_name  = "xfce4-power-manager";
+  ver_maj = "1.2";
+  ver_min = "0";
+
  src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/xfce4-power-manager/1.0/${name}.tar.bz2";
-    sha1 = "64dd7a8fae9cd1cbcf6403d2f51f2281f38cca05";
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
  };
+  name = "${p_name}-${ver_maj}.${ver_min}";

  buildInputs =
    [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
      libnotify xfce4panel
    ];
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

  meta = {
    homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, xfce4panel
+, libwnck, dbus_glib, xfconf, libglade, xorg }:
+
+#TODO: gnome stuff: gconf (assistive?), keyring
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-session";
+  ver_maj = "4.10";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
+      xfconf xfce4panel libglade xorg.iceauth
+    ];
+
+  configureFlags = [ "--with-xsession-prefix=$$out" ];
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = http://www.xfce.org/projects/xfce4-session;
+    description = "Session manager for Xfce";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
+, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }:
+
+#TODO: optional packages
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-settings";
+  ver_maj = "4.10";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs =
+    [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
+      xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
+    #gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      #xfconf libglade xorg.iceauth
+    ];
+  configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
+
+  meta = {
+    homepage = http://www.xfce.org/projects/xfce4-settings;
+    description = "Settings manager for Xfce";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
--- a/Show More
+++ b/Show More