Merge ^/nixpkgs/trunk.

This merge leads to a big rebuild, but this wouldn't hurt as I'm going to reintegrate this branch soon. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2024-11-22 15:03:28 +00:00 · 2012-03-28 15:42:42 +00:00 · 2012-03-28 15:42:42 +00:00 · defd86049c
commit defd86049c
parent 49b7f13128 db8f709430
773 changed files with 4797 additions and 4596 deletions
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@ -5,16 +5,16 @@ librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile,
 libusb, libuuid, libxml2, libxslt, pango, perl, pkgconfig, python }:

 let
-  rev = "9942";
+  rev = "11483";
 in

 stdenv.mkDerivation {
  name = "ardour3-svn-${rev}";

  src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
+    url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3;
    inherit rev;
-    sha256 = "5f463e5a67bcb1ee6b4d24c25307419ea14ce52130819054b775e377c31a0664";
+    sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd";
  };

  buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@ -1,25 +1,38 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
 , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
-, fftwSinglePrec, libmad }:
+, gtk, glibmm, gtkmm, libgnomecanvas,  liblo, aubio
+, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:

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

  # 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 ?
-  src = fetchurl {
-    url = http://mawercer.de/~nix/ardour-2.8.2.tar.bz2;
-    sha256 = "1igwv1r6rlybdac24qady5asaf34f9k7kawkkgyvsifhl984m735";
+
+  # 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";
  };

+  patchPhase = ''
+    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
    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
-    liblo aubio fftwSinglePrec libmad
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
+    liblo aubio fftwSinglePrec libmad autoconf automake libtool
  ];

  buildPhase = ''
@ -33,6 +46,7 @@ stdenv.mkDerivation {
  meta = { 
    description = "Multi-track hard disk recording software";
    longDescription = ''
+      Broken: use ardour3-svn instead
      Also read "The importance of Paying Something" on their homepage, please!
    '';
    homepage = http://ardour.org/;
--- a/pkgs/applications/audio/hydrogen/scons-env.patch
+++ b/pkgs/applications/audio/hydrogen/scons-env.patch
@ -9,6 +9,14 @@
 
 
 	#location of qt4.py
+@@ -298,7 +298,6 @@
+ 
+         for N in glob.glob('./data/i18n/hydrogen.*'):
+             env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+-	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+ 
+ 	#add every img in ./data/img to the install list. 
+ 	os.path.walk("./data/img/",install_images,env) 
@@ -379,7 +379,7 @@
 
 includes, a , b = get_platform_flags( opts )
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
+, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
+
+stdenv.mkDerivation  rec {
+  name = "mhwaveedit-${version}";
+  version = "1.4.21";
+
+  src = fetchurl {
+    url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
+    sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7";
+  };
+
+  buildInputs =
+   [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
+     pkgconfig pulseaudio
+   ];
+
+  configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
+
+  meta = with stdenv.lib; {
+    description = "graphical program for editing, playing and recording sound files";
+    homepage = https://gna.org/projects/mhwaveedit;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
+, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
+, pkgconfig }:
+
+stdenv.mkDerivation  rec {
+  name = "petri-foo";
+
+  src = fetchgit {
+    url = https://github.com/licnep/Petri-Foo.git;
+    rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0";
+    sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c";
+  };
+
+  buildInputs =
+   [ alsaLib cmake  gtk jackaudio libgnomecanvas libpthreadstubs
+     libsamplerate libsndfile libtool libxml2 pkgconfig
+   ];
+
+  dontUseCmakeBuildDir=true;
+
+  meta = with stdenv.lib; {
+    description = "MIDI controllable audio sampler";
+    longDescription = "a fork of Specimen";
+    homepage = http://petri-foo.sourceforge.net;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@ -1,19 +1,21 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio,
-ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile,
-libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
+, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
+, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:

 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.4";
  name = "qtractor-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89";
+    sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l";
  };

-  buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
-    ladspaPlugins liblo libmad libsamplerate libsndfile libtool
-    libvorbis pkgconfig qt4 rubberband ];
+  buildInputs =
+    [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
+      ladspaPlugins liblo libmad libsamplerate libsndfile libtool
+      libvorbis pkgconfig qt4 rubberband
+    ];

  meta = with stdenv.lib; {
    description = "Audio/MIDI multi-track sequencer";
--- a/pkgs/applications/audio/specimen/default.nix
+++ b/pkgs/applications/audio/specimen/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, autoconf, automake, gtk, jackaudio,
-libgnomecanvas, libsamplerate, libsndfile, libtool, libxml2, phat,
-pkgconfig }:
-
-stdenv.mkDerivation  rec {
-  name = "specimen-svn-89";
-
-  # The released version won't compile with newer versions of jack
-  src = fetchsvn {
-    url = http://zhevny.com/svn/specimen/trunk;
-    rev = 89;
-    sha256 = "1i24nchw14cbjv7kmzs7cvmis2xv4r7bxghi8d6gq5lprwk8xydf";
-  };
-
-  preConfigure = "sh autogen.sh";
-
-  buildInputs = [ alsaLib autoconf automake gtk jackaudio
-    libgnomecanvas libsamplerate libsndfile libtool libxml2 phat
-    pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "MIDI controllable audio sampler";
-    homepage = http://zhevny.com/specimen/;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@ -1,11 +1,12 @@
-{stdenv, fetchurl, emacs}:
+{ stdenv, fetchgit, emacs }:

-stdenv.mkDerivation rec {
-  name = "haskell-mode-2.8.0";
+stdenv.mkDerivation {
+  name = "haskell-mode-2.8.0.29-g7682f99";

-  src = fetchurl {
-    url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
-    sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1";
+  src = fetchgit {
+    url = "http://github.com/haskell/haskell-mode.git";
+    rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b";
+    sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717";
  };

  buildInputs = [emacs];
@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
  '';

  meta = {
-    homepage = "http://projects.haskell.org/haskellmode-emacs/";
-    description = "Haskell mode package for Emacs";
+    homepage = "http://github.com/haskell/haskell-mode";
+    description = "Haskell mode for Emacs";

    platforms = stdenv.lib.platforms.unix;
    maintainers = [ stdenv.lib.maintainers.simons ];
--- a/pkgs/applications/editors/kdevelop/4.3.0.nix
+++ b/pkgs/applications/editors/kdevelop/4.3.0.nix
@ -0,0 +1,34 @@
+{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
+  kdebase_workspace, gettext, perl, okteta }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "4.3.0";
+  pname = "kdevelop";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
+  };
+
+  buildInputs = [ kdevplatform kdebase_workspace okteta ];
+
+  buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
+
+  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.linux;
+    description = "KDE official IDE";
+    longDescription =
+      ''
+        A free, opensource IDE (Integrated Development Environment)
+        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
+        feature-full, plugin extendable IDE for C/C++ and other
+        programing languages. It is based on KDevPlatform, KDE and Qt
+        libraries and is under development since 1998.
+      '';
+    homepage = http://www.kdevelop.org;
+  };
+}
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@ -22,9 +22,6 @@ cabal.mkDerivation (self: {
    description = "Haskell IDE written in Haskell";
    license = "GPL";
    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/applications/misc/adobe-reader/builder.sh
+++ b/pkgs/applications/misc/adobe-reader/builder.sh
@ -26,3 +26,12 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \

 mkdir -p $out/bin
 ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread
+
+mkdir -p $out/share/applications
+mv $out/Adobe/Reader9/Resource/Support/AdobeReader.desktop $out/share/applications/
+sed -i $out/share/applications/AdobeReader.desktop \
+    -e "s|Icon=.*|Icon=$out/Adobe/Reader9/Resource/Icons/128x128/AdobeReader9.png|"
+
+# Not sure if this works.
+mkdir -p $out/share/mimelnk/application
+mv $out/Adobe/Reader9/Resource/Support/vnd*.desktop $out/share/mimelnk/application
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {

-  version = "2.8.1";
+  version = "2.9.1";

  name = "bibletime-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
-    sha256 = "00xrgv4cx50ddbcfjiz3vl0cvsixwd0vj7avjvhrh617qqg8w325";
+    sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih";
  };

  prePatch = ''
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
-, curl, cdparanoia, libid3tag, ncurses }:
+, curl, cdparanoia, libid3tag, ncurses, libtool }:

 stdenv.mkDerivation {
  name = "grip-3.2.0";
@ -9,7 +9,8 @@ stdenv.mkDerivation {
    sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
  };

-  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses ];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
+    libid3tag ncurses libtool ];

  meta = {
    description = "GTK+-based audio CD player/ripper";
--- a/pkgs/applications/misc/k3b/1.0.nix
+++ b/pkgs/applications/misc/k3b/1.0.nix
@ -1,20 +0,0 @@
-{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
-
-stdenv.mkDerivation {
-  name = "k3b-1.0.5";
-
-  src = fetchurl {
-    url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
-    sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
-  };
-
-  buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
-
-  configureFlags = "--without-arts";
-
-  meta = {
-    description = "A CD and DVD authoring application for KDE";
-    homepage = http://www.k3b.org/;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/misc/kiwixbuilder/default.nix
+++ b/pkgs/applications/misc/kiwixbuilder/default.nix
@ -1,28 +0,0 @@
-args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://downloads.sourceforge.net/kiwix/kiwixbuilder.tgz;
-			sha256 = "0qb97smw4675i3hh328a7f65payw1w71bn4d32ycdkmqk56zl4ds";
-		};
-		buildInputs = [glib zlib];
-		configureFlags = [" --prefix=$out "];
-		preConfigure = fullDepEntry (''
-			export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ '
-			export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 '
-			sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure
-		'') ["minInit" "doUnpack"];
-	}) args null; /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "kiwix";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Offline Wikipedia viewer builder.
-";
-		inherit src;
-	};
-}
--- a/pkgs/applications/misc/mathblog/default.nix
+++ b/pkgs/applications/misc/mathblog/default.nix
@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
    description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/applications/misc/simgrid/default.nix
+++ b/pkgs/applications/misc/simgrid/default.nix
@ -1,59 +0,0 @@
-{ fetchurl, stdenv, cmake, ruby }:
-
-stdenv.mkDerivation rec {
-  name = "simgrid-3.4.1";
-
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
-    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
-  };
-
-  /* FIXME: Ruby currently disabled because of this:
-
-     Linking C shared library ../src/.libs/libsimgrid.so
-     ld: cannot find -lruby-1.8.7-p72
-
-   */
-  buildInputs = [ cmake /* ruby */ ];
-
-  preConfigure =
-    # Make it so that libsimgrid.so will be found when running programs from
-    # the build dir.
-    '' export LD_LIBRARY_PATH="$PWD/src/.libs"
-       export cmakeFlags="-Dprefix=$out"
-    '';
-
-  makeFlags = "VERBOSE=1";
-
-  patchPhase =
-    '' for i in "src/smpi/"*
-       do
-         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
-       done
-    '';
-
-  installPhase = "make install-simgrid";
-
-  # Fixing the few tests that fail is left as an exercise to the reader.
-  doCheck = false;
-
-  meta = {
-    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
-
-    longDescription =
-      '' SimGrid is a toolkit that provides core functionalities for the
-         simulation of distributed applications in heterogeneous distributed
-         environments.  The specific goal of the project is to facilitate
-         research in the area of distributed and parallel application
-         scheduling on distributed computing platforms ranging from simple
-         network of workstations to Computational Grids.
-      '';
-
-    homepage = http://simgrid.gforge.inria.fr/;
-
-    license = "LGPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@ -18,9 +18,6 @@ cabal.mkDerivation (self: {
    description = "A Minimalistic Text Based Status Bar";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@ -1,30 +1,30 @@
 { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
 , fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes
 , glib, gtk, gdk_pixbuf, pango
-, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
+, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst, libXcomposite
 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam, pcre }:
+, stdenv, unzip, zlib, pam, pcre, udev }:

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

 stdenv.mkDerivation rec {
-  name = "chromium-18.0.975.0-pre${version}";
+  name = "chromium-19.0.1061.0-pre${version}";

  # To determine the latest revision, get
  # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
  # For the version number, see ‘about:version’.
-  version = "114925";
+  version = "124950";
  
  src =
    if stdenv.system == "x86_64-linux" then
      fetchurl {
        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "19ayrcz1vw7nqr3bbas5f414n3kibf7knd285azrk29f7a7dnpd6";
+        sha256 = "4472bf584a96e477e2c17f96d4452dd41f4f34ac3d6a9bb4c845cf15d8db0c73";
      }
    else if stdenv.system == "i686-linux" then
      fetchurl {
        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "1bhcd3plw3r62bfysc9nszn07xv3gamf5lkwd6ardwyxanclc7x6";
+        sha256 = "6e8a49d9917ee26b67d14cd10b85711c3b9382864197ba02b3cfe8e636d3d69c";
      }
    else throw "Chromium is not supported on this platform.";

@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
  libPath =
    stdenv.lib.makeLibraryPath
       [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
-         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
+         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXcomposite
         libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
         libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
         glib gtk gdk_pixbuf pango
-         pam
+         pam udev
       ];

  installPhase = ''
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, xulrunner, makeWrapper }:

 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20120105";
+  name = "conkeror-1.0pre-20120316";
  
  src = fetchurl {
-    url = http://repo.or.cz/w/conkeror.git/snapshot/da0f9962eeedca9133e8b1928108594173f1769c.zip;
-    sha256 = "75176e5bb077a5ad05b82df01939edeb240e2caba9657a6e175fb3aabf23b393";
+    url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
+    sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
  };
  
  buildInputs = [ unzip makeWrapper ];
--- a/pkgs/applications/networking/browsers/firefox/10.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@ -170,6 +170,7 @@ rec {
    meta = {
      description = "Mozilla Firefox - the browser, reloaded";
      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
    };

    passthru = {
--- a/pkgs/applications/networking/browsers/firefox/11.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/11.0.nix
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "11.0b1";
+  firefoxVersion = "11.0";
  
  xulVersion = "11.0"; # this attribute is used by other packages

  
  src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "1f9p2jmjvhmb23wmvj84jj22wd9g803k6pdjm8glwmkzwnva8x1b";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    md5 = "4b07acf47857aff72776d805409cdd1b";
  };
  
  commonConfigureFlags =
@ -32,7 +32,7 @@ rec {
      "--with-system-jpeg"
      "--with-system-zlib"
      "--with-system-bz2"
-      #"--with-system-nspr" # <-- There are links to nspr 4.9.0, but no file...
+      "--with-system-nspr"
      # "--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"
@ -139,7 +139,7 @@ rec {
      [ "--enable-application=browser"
        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
        "--enable-chrome-format=jar"
-	"--disable-elf-hack"
+        "--disable-elf-hack"
      ]
      ++ commonConfigureFlags
      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@ -170,6 +170,7 @@ rec {
    meta = {
      description = "Mozilla Firefox - the browser, reloaded";
      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
    };

    passthru = {
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@ -7,12 +7,12 @@ stdenv.mkDerivation {

  desktopItem = makeDesktopItem {
    name = browserName;
-    exec = browserName;
+    exec = browserName + " %U";
    icon = icon;
    comment = "";
    desktopName = desktopName;
    genericName = "Web Browser";
-    categories = "Application;Network;";
+    categories = "Application;Network;WebBrowser;";
  };

  buildInputs = [makeWrapper];
@ -32,6 +32,10 @@ stdenv.mkDerivation {

    mkdir -p $out/share/applications
    cp $desktopItem/share/applications/* $out/share/applications
+
+    # For manpages, in case the program supplies them
+    mkdir -p $out/nix-support
+    echo ${browser} > $out/nix-support/propagated-user-env-packages
  '';

  # Let each plugin tell us (through its `mozillaPlugin') attribute
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@ -2,10 +2,10 @@
 glib_networking}:

 stdenv.mkDerivation {
-  name = "vimprobable2-0.9.11.2";
+  name = "vimprobable2-0.9.12.0";
  src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.11.2.tar.bz2";
-    sha256 = "017qwhndchmpsn2g38v85rjx00fss69aa1nmgj3v85k5zskv7z65";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
+    sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
  };
  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
  installPhase = ''
@ -30,6 +30,6 @@ stdenv.mkDerivation {
    homepage = "http://sourceforge.net/apps/trac/vimprobable";
    license = "MIT";
    maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
+    platforms = with stdenv.lib.platforms; linux;
  };
 }
-
--- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
@ -1,54 +0,0 @@
-args : with args; 
-/*
-  arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from 
-    (to use a fresher pidgin build)
-*/
-let 
-  externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null; 
-in
-rec {
-  src = fetchurl {
-    url = http://downloads.sourceforge.net/funpidgin/carrier-2.4.2.tar.bz2;
-    sha256 = "176mi7gxkvvrmxsd58bi8qgkc209gpnlp21hh3j0dmb9zszyh7kp";
-  };
-
-  buildInputs = [gtkspell aspell
-    gstreamer startupnotification
-    libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto 
-    libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python 
-    autoconf libtool automake];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nss}/include/nspr"
-    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
-    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
-    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
-
-  preBuild = fullDepEntry (''
-    export echo=echo
-  '') [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
-    ++ (lib.optional externalPurple2 "postInstall")
-  ;
-      
-  name = "carrier-" + version;
-  meta = {
-    description = "Carrier - PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net; 
-  };
-} // (if externalPurple2 then {
-  postInstall = fullDepEntry (''
-      mkdir -p $out/lib/purple-2
-      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
-    '') ["minInit" "defEnsureDir"]; }
-  else {})
-
-
--- a/pkgs/applications/networking/instant-messengers/kphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kphone/default.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
-, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
-, libSM }:
-
-stdenv.mkDerivation {
-  name = "kphone-1.2";
-
-  src = fetchurl {
-    url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
-    sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
-  };
-
-  buildInputs =
-    [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
-      libX11 libXext libXt libICE libSM
-    ];
-    
-  preConfigure = "autoconf";
-
-  meta = {
-    description = "KPhone is a SIP UA for Linux";
-    homepage = http://sourceforge.net/projects/kphone/;
-    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@ -20,11 +20,11 @@
  , libgcrypt ? null
 } :

-stdenv.mkDerivation {
-  name = "pidgin-2.9.0";
+stdenv.mkDerivation rec {
+  name = "pidgin-2.10.2";
  src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2;
-    sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8";
+    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
+    sha256 = "1f1j9pr7zwpxwbv94510brh69pmwn4v3np12h75pfrnkas8d5kg5";
  };

  inherit nss ncurses;
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@ -24,6 +24,11 @@ let
        buildNativeInputs = [ gettext pkgconfig ];
        buildInputs = [ kdelibs telepathy_qt ]
          ++ stdenv.lib.optional (name != "ktp-common-internals") common_internals;
+
+        meta = {
+          inherit (kdelibs.meta) platforms;
+          maintainers = [ stdenv.lib.maintainers.urkud ];
+        };
      }
    );
  };
@ -49,5 +54,5 @@ in
 pkgs // {
  inherit version;
  recurseForDerivations = true;
-  full = stdenv.lib.attrValues pkgs;
+  full = stdenv.lib.attrValues stable;
 }
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
+, libuuid, gnutls, sqlite, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-salut";
+  name = "${pname}-0.7.1";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    sha256 = "0677c4j11n0symmhy52g2qzrflvxjppysscq3rh7zc3ys6h10kpi";
+  };
+
+  buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
+    sqlite ];
+
+  buildNativeInputs = [ libxslt pkgconfig ];
+
+  configureFlags = "--disable-avahi-tests";
+
+  meta = {
+    description = "Link-local XMPP connection manager for Telepathy";
+    platforms = stdenv.lib.platforms.gnu; # Random choice
+  };
+}
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "notmuch-0.11";
+  name = "notmuch-0.11.1";

  src = fetchurl {
    url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0";
+    sha256 = "d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706";
  };

  buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
--- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix
@ -12,7 +12,7 @@

 }:

-let version = "9.0.1";
+let version = "11.0";

    # This patch may become necessary when we use a more recent version of libpng
    # for now, it's actually not needed
@ -27,7 +27,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha256 = "4fc392915e22b81ef0bd08e6e2d8d0348e66f0930f35bf8ac47eb49f64453e2d";
+    sha256 = "0lrp7ngi3ni70m9v11f0l8xvp3s8sc50isxbgy8vj677fzb1qn2s";
  };

  enableParallelBuilding = true;
--- a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
@ -1,96 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
-, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
-, libnotify, cairo, pixman, fontconfig
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Shredder", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-
-}:
-
-let version = "7.0.1"; in
-
-stdenv.mkDerivation {
-  name = "thunderbird-${version}";
-
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
-      libnotify cairo pixman fontconfig yasm mesa /* nss */
-    ];
-
-  patches = [
-    # Fix weird dependencies such as a so file which depends on "-lpthread".
-    ./thunderbird-build-deps.patch
-  ];
-
-  NIX_LDFLAGS = "-lpixman-1";
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      # "--with-system-bz2"
-      "--with-system-nspr"
-      "--enable-system-cairo"
-      "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-tests"
-      "--enable-calendar"
-    ]
-    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
-  # prefix, and PREFIX in some places where they are not set.  In
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
-
-  # This doesn't work:
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
-
-  postInstall =
-    ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/lib/thunderbird-*/thunderbird \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Create a desktop item.
-      mkdir -p $out/share/applications
-      cat > $out/share/applications/thunderbird.desktop <<EOF
-      [Desktop Entry]
-      Type=Application
-      Exec=$out/bin/thunderbird
-      Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
-      Name=Thunderbird
-      GenericName=Mail Reader
-      Categories=Application;Network;
-      EOF
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla Thunderbird, a full-featured email client";
-    homepage = http://www.mozilla.org/thunderbird/;
-    license =
-      # Official branding implies thunderbird name and logo cannot be reuse,
-      # see http://www.mozilla.org/foundation/licensing.html
-      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
-    maintainers = with maintainers; [ pierron ];
-    platforms = with platforms; linux;
-  };
-}
--- a/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
@ -1,21 +0,0 @@
-diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk
--- comm-miramar/config/rules.mk	2011-06-24 22:13:31.000000000 +0200
-+++ comm-miramar/config/rules.mk	2011-08-15 12:27:07.305556040 +0200
-@@ -851,9 +851,13 @@
- 
- ifndef _LIBNAME_RELATIVE_PATHS
- 
-LIBS_DEPS += $(filter -l%, $(LIBS))
-HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
-DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
-+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS))))
-+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS))))
-+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS))))
-+
-+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS)))
-+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS)))
-+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS)))
- 
- _LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
- ifneq (,$(_LIBDIRS))
-Seulement dans comm-miramar.after/config: rules.mk~
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
- avahi, dbus, libcap,
+ avahi, dbus, libcap, pkgconfig,
 jackSupport ? false, 
 jackaudio ? null }:


 stdenv.mkDerivation rec {
  name = "mumble-" + version;
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchurl {
    url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "1s4vlkdfmyzx7h3i4060q0sf2xywl9sm6dpjhaa150blbcylwmic";
+    sha256 = "0p4as6bcmbzkiff1gvc0f277dzbz2sfys97gcbxw7gjamqi53285";
  };

  patchPhase = ''
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {


  buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
-    libcap ]
+    libcap pkgconfig ]
    ++ (stdenv.lib.optional jackSupport jackaudio);

  installPhase = ''
--- a/pkgs/applications/networking/p2p/valknut/builder.sh
+++ b/pkgs/applications/networking/p2p/valknut/builder.sh
@ -1,12 +0,0 @@
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-export configureFlags="--with-ssl-dir=$openssl --x-libraries=/no-such-dir"
-
-genericBuild
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ b/pkgs/applications/networking/p2p/valknut/default.nix
@ -1,14 +0,0 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
-
-stdenv.mkDerivation {
-  name = "valknut-0.3.7";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2;
-    md5 = "848f9b3f25af15c3f1837133ac4b9415";
-  };
-
-  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
-  inherit openssl;
-}
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@ -4,11 +4,11 @@
 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }:

 stdenv.mkDerivation rec {
-  name = "calligra-2.3.87";
+  name = "calligra-2.3.92";

  src = fetchurl {
    url = "mirror://kde/unstable/${name}/${name}.tar.bz2";
-    sha256 = "1arrk2ww3bykv4y8fsn1dn25gq9bf7a4ygggkrczfrxlbv1s9p9v";
+    sha256 = "1ad7vzdhfkv48xhs9p84mwpq8zsdiajz3qjng3h2rswd88sgrblg";
  };

  buildNativeInputs = [ cmake perl pkgconfig ];
--- a/pkgs/applications/office/openoffice/gcc46.patch
+++ b/pkgs/applications/office/openoffice/gcc46.patch
@ -1,11 +0,0 @@
--- a/build/OOO320_m19/cppu/inc/uno/lbnames.h
-+++ b/build/OOO320_m19/cppu/inc/uno/lbnames.h
-@@ -59,7 +59,7 @@ provoking error here, because PP ignores #error
- #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
- #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
- #define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
-+#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
- #define __CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
- #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
--- a/pkgs/applications/office/openoffice/get-go-src.nix
+++ b/pkgs/applications/office/openoffice/get-go-src.nix
@ -1,54 +0,0 @@
-# nix derivation that will create a bash script that will create the go-srcs.nix file.
-# 
-# it can be slightly improved so it downloads properly also the OpenOffice.org upstream package,
-# instead of only those 'additional' to the upstream code. By now the upstream oo.org code I wrote
-# manually in the go-oo.nix.
-#
-# I think this looks quite ugly, but the only way I've found to know what files the program will need,
-# and from what URLs, is running their './configure' with proper parameters and executing their
-# './download' script.
-
-let
-  pkgsFun = import /etc/nixos/nixpkgs;
-  pkgs = pkgsFun {};
-  downloadRoot = "http://download.services.openoffice.org/files/stable/";
-in
-with pkgs;
-
-lib.overrideDerivation go_oo (attrs: {
-  name = attrs.name + "-make-src";
-  src = attrs.src;
-
-  buildInputs = attrs.buildInputs ++ [ gawk ];
-
-  # Avoid downloading what is defined in go_oo
-  srcs_download = null;
-
-  phases = [ "unpackPhase" "configurePhase" "makesh" ];
-
-  makesh = ''
-    sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download
-    mkdir -p $out
-
-    set +e
-    ./download --all | grep XXX | 
-      sed '/bouncer/s,\(.*\)http.*version=\([0-9.]\+\).*lang=\([a-z0-9]\+\).*\( .*\),\1${downloadRoot}\2/OOo_\2_src_\3.tar.bz2\4,' |
-      awk '
-      BEGIN {
-        print "#!/bin/sh"
-        print "echo \"{fetchurl} : [\" > go-srcs.nix"
-      }
-      {
-         print "echo \"(fetchurl {\" >> go-srcs.nix"
-         print "echo \"  url = \\\"" $2 "\\\";\" >> go-srcs.nix"
-         print "echo \"  sha256 = \\\"`nix-prefetch-url " $2 "`\\\";\" >> go-srcs.nix"
-         if (NF > 3)
-           print "echo \"  name = \\\"" $4 "\\\";\" >> go-srcs.nix"
-        print "echo \"})\" >> go-srcs.nix"
-      }
-      END {
-        print "echo ] >> go-srcs.nix"
-      }' > $out/make-go-srcs-nix.sh
-    exit 0
-  '';
-})
--- a/pkgs/applications/office/openoffice/go-oo.nix
+++ b/pkgs/applications/office/openoffice/go-oo.nix
@ -1,151 +0,0 @@
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
-, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
-, autoconf, openldap, postgresql, bash
-, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
-}:
-
-let
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  tag = "OOO320_m19";
-  version = "3.2.1.6";
-in
-stdenv.mkDerivation rec {
-  name = "go-oo-${version}";
-  # builder = ./builder.sh;
-
-  src = fetchurl {
-      url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz";
-      sha256 = "1l9kpg61wyqjsig5n6a7c7zyygbg09zsmn4q267c12zzpl5qpmxy";
-    };
-
-  srcs_download = import ./go-srcs.nix { inherit fetchurl; };
-
-  # Multi-CPU: --with-num-cpus=4 
-  # The '--with-tag=XXXX' string I took from their 'configure' script. I write it so it matches the
-  # logic in the script for "upstream version for X.X.X". Look for that string in the script.
-  # We need '--without-split' when downloading directly usptream openoffice src tarballs.
-  configurePhase = ''
-    sed -i -e '1s,/bin/bash,${bash}/bin/bash,' $(find bin -type f)
-    sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in $(find bin -type f)
-    sed -i -e '1s,/usr/bin/python,${python}/bin/python,' bin/*.py
-    echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
-
-    ./configure --with-distro=SUSE-11.1 --with-system-libwpd --without-git --with-system-cairo \
-      --with-lang="${langsSpaces}" --with-tag=${tag} --without-split
-  '';
-
-  buildPhase = ''
-    for a in $srcs_download; do
-      FILE=$(basename $a)
-      # take out the hash
-      cp -v $a src/$(echo $FILE | sed 's/[^-]*-//')
-    done
-    sed '/-x $WGET/d' -i download
-    ./download
-
-    # Needed to find genccode
-    PATH=$PATH:${icu}/sbin
-
-    make build.prepare
-
-    set -x
-    pushd build/${tag}
-
-    patch -p1 < ${./xlib.patch}
-    patch -p3 < ${./gcc46.patch}
-
-    # Fix svtools: hardcoded jpeg path
-    sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
-    # Fix sysui: wants to create a tar for root
-    sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk
-    # Fix libtextcat: wants to set rpath to /usr/local/lib
-    sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, libtextcat/makefile.mk
-    # Fix hunspell: the checks fail due to /bin/bash missing, and I find this fix easier
-    sed -i -e 's,make && make check,make,' hunspell/makefile.mk
-    # Fix redland: wants to set rpath to /usr/local/lib
-    sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
-      redland/raptor/makefile.mk redland/rasqal/makefile.mk
-
-    popd
-
-    set +x
-    make
-  '';
-
-  installPhase = ''
-    bin/ooinstall $out
-    mkdir -p $out/bin
-    for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do
-      ln -s $a $out/bin
-    done
-  '';
-
-  distroFlags = ''
-    --with-vendor=NixPkgs
-    --with-package-format=native
-    --disable-epm
-    --disable-fontooo
-    --disable-gnome-vfs
-    --disable-gnome-vfs
-    --disable-mathmldtd
-    --disable-mozilla
-    --disable-odk
-    --disable-pasf
-    --disable-dbus
-    --disable-kde
-    --disable-kde4
-    --disable-mono
-    --disable-gstreamer
-    --with-cairo
-    --with-system-libs
-    --with-system-python
-    --with-system-boost
-    --with-system-db
-    --with-jdk-home=${jdk}
-    --with-ant-home=${ant}
-    --without-afms
-    --without-dict
-    --without-fonts
-    --without-myspell-dicts
-    --without-nas
-    --without-ppds
-    --without-system-agg
-    --without-system-beanshell
-    --without-system-hsqldb
-    --without-system-xalan
-    --without-system-xerces
-    --without-system-xml-apis
-    --without-system-xt
-    --without-system-jars
-    --without-system-hunspell
-    --without-system-altlinuxhyph
-    --without-system-lpsolve
-    --without-system-graphite
-    --without-system-mozilla
-    --without-system-libwps
-    --without-system-libwpg
-    --without-system-redland
-  '';
-
-  buildInputs = [
-    pam python tcsh libxslt perl ArchiveZip CompressZlib zlib 
-    libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
-    libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
-    getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
-    cups libXinerama openssl gperf GConf ORBit2
-
-    ant autoconf openldap postgresql
-  ];
-
-  meta = {
-    description = "Go-oo - Novell variant of OpenOffice.org";
-    homepage = http://go-oo.org/;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/office/openoffice/go-srcs.nix
+++ b/pkgs/applications/office/openoffice/go-srcs.nix
@ -1,66 +0,0 @@
-{fetchurl} : [
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_system.tar.bz2";
-  sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
-})
-(fetchurl {
-  url = "http://download.go-oo.org/src//seamonkey-1.1.14.source.tar.gz";
-  sha256 = "0fb0pv2w8583q65ja5x8wh6ah6i3kwwq99s4v8cn99g91v8xn9hr";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.1.tar.bz2";
-  sha256 = "0wfq6xsiqdzmkq3zxhd0q4k7db9bhl027wy5z28pcnmv4li5h40b";
-})
-(fetchurl {
-  url = "http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz";
-  sha256 = "1dnwzk1k8d5iinxsal3qskjagljx5ywwmwb4i6bymfmyr64qppn1";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz";
-  sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_core.tar.bz2";
-  sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_extensions.tar.bz2";
-  sha256 = "0d5byyg0ac0xsi22cw4d857rpd1r3mm2j13ajfydgsn2d2ka7nrj";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/extras-3.tar.bz2";
-  sha256 = "1s6cz92b2amfn135l6a2hras4qrd04kw5yyqli7xmb8xqa0m3y3c";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/biblio.tar.bz2";
-  sha256 = "02v2xbq771zi09qw3k4zih95m1rjns4pwwpl51n0m34c0a00lhf0";
-})
-(fetchurl {
-  url = "http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2";
-  sha256 = "1zqxs2a1ah0vq2a5dypqclig2c85z0a8rz7b63vfsqxvd2258a2d";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_binfilter.tar.bz2";
-  sha256 = "0nxh1rdw566i7nr5vjfxbankwy5lsd2maggcqz3m0chp7jgvsb6p";
-})
-(fetchurl {
-  url = "http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll";
-  sha256 = "0g3529nr0nfhn3cygn8x931pqxnqq88nfc5h829xncr1j8ifaqzm";
-})
-(fetchurl {
-  url = "http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_src_l10n.tar.bz2";
-  sha256 = "0m3i3czwqcyc2mibldp1zx34wxw7ls7akb3jak75nc6i3h7ykmsm";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz";
-  sha256 = "1cdjmgpy0igrwlb5i1sm4s2yxvzbmqz6j7xnmmv3kpbx7z43zw78";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz";
-  sha256 = "1qv5qqycaqrm8arprwf3vyk76fm6v7qabpx5qq58knp1xm72z98r";
-})
-(fetchurl {
-  url = "http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz";
-  sha256 = "0jhgjhm63cmjr59nhvdln1szgm36v6kkazy2388l7z6xjjrhxk1z";
-})
-]
--- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix
@ -356,8 +356,8 @@
  md5 = "3bf481ca95109b14435125c0dd1f2217";
 })
 (fetchurl {
-  url = "http://dev-www.libreoffice.org/src/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2";
-  md5 = "776ad69a63ac1e99abed176e54ce25d9";
+  url = "http://dev-www.libreoffice.org/src/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2";
+  md5 = "d28864eb2b59bb57b034c0d4662a3cee";
 })
 (fetchurl {
  url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@ -7,41 +7,47 @@
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash
 , fontsConf
-, langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
+, langs ? [ "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
 }:

 let
  langsSpaces = stdenv.lib.concatStringsSep " " langs;
 in
 stdenv.mkDerivation rec {
-  name = "libreoffice-3.5.0.3";
+  name = "libreoffice-3.5.1.2";

  srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; };

  src_translation = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-translations-3.5.0.3.tar.xz";
-    sha256 = "0kk1jb4axjvkmg22yhxx4p9522zix6rr5cs0c5rxzlkm63qw6h8w";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-translations-3.5.1.2.tar.xz";
+    sha256 = "cf8ed662f7d0a679bd3a242a7f88cf445b769afdcd8a3d3df655d774f296972a";
  };

  src_help = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-help-3.5.0.3.tar.xz";
-    sha256 = "0wvlh2r4cy14rs0svr4yb4fidp2g9wbj8vxx2a5swnjf2fdf8qda";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-help-3.5.1.2.tar.xz";
+    sha256 = "43b07225854b1c8b3195b252453b8e97d2d58d83909bf4b5f920cb08b7f33e30";
  };

  src = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-core-3.5.0.3.tar.xz";
-    sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr";
+    url = "http://download.documentfoundation.org/libreoffice/src/3.5.1/libreoffice-core-3.5.1.2.tar.xz";
+    sha256 = "61cd12e20fb9460178fc6f08100a9a189c2390c21e2e47eb66e07a5b0ce5cd94";
  };

+  # Openoffice will open libcups dynamically, so we link it directly
+  # to make its dlopen work.
+  NIX_LDFLAGS = "-lcups";
+
+  # If we call 'configure', 'make' will then call configure again without parameters.
+  # It's their system.
  configureScript = "./autogen.sh";

  preConfigure = ''
    tar xf $src_translation
    # Libreoffice expects by default the translations in ./translations
-    mv libreoffice-translations-3.5.0.3/translations .
+    mv libreoffice-translations-3.5.1.2/translations .
    tar xf $src_help
    # Libreoffice expects by default the help in ./helpcontent2
-    mv libreoffice-help-3.5.0.3/helpcontent2 .
+    mv libreoffice-help-3.5.1.2/helpcontent2 .

    sed -i 's,/bin/bash,${bash}/bin/bash,' sysui/desktop/share/makefile.mk solenv/bin/localize
    sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \
--- a/pkgs/applications/science/biology/slr/default.nix
+++ b/pkgs/applications/science/biology/slr/default.nix
@ -1,22 +1,16 @@
 {stdenv, fetchurl, liblapack}:

 stdenv.mkDerivation {
-  name = "slr";
+  name = "slr-1.4.2";
+
  src = fetchurl {
-    url = http://www.ebi.ac.uk/goldman-srv/SLR/download/current/slr_source.tgz;
-    sha256 = "0i81fv201p187mim4zakipxnhzqdvd3p5a9qa59xznc6458r2zsn";
+    url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz;
+    sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp";
  };

  buildInputs = [ liblapack ];
-  buildPhase = ''
-    cd src
-    ls
-    make -fMakefile.linux
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -v ../Slr $out/bin 
-  '';
+  preConfigure = "mkdir bin; cd src";
+  makeFlags = "-f Makefile.linux";

  meta = {
    description     = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
--- a/pkgs/applications/science/logic/coq/configure.patch
+++ b/pkgs/applications/science/logic/coq/configure.patch
--- a/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
+++ b/pkgs/applications/science/logic/coq/coq-8.3-make-3.82-compat.patch
@ -1,84 +0,0 @@
-From: glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Date: Tue, 19 Oct 2010 13:22:08 +0000 (+0000)
-Subject: Fix mixed implicit and normal rules
-X-Git-Url: https://gforge.inria.fr/plugins/scmgit/cgi-bin/gitweb.cgi?p=coq%2Fcoq-svn.git;a=commitdiff_plain;h=86eb08bad450dd3fa77b11e4a34d2f493ab80d85
-
-Fix mixed implicit and normal rules
-
-This fixes build with GNU Make 3.82. See threads:
-
-  https://sympa-roc.inria.fr/wws/arc/coqdev/2010-10/msg00025.html
-  http://thread.gmane.org/gmane.comp.gnu.make.bugs/4912
-
-git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/branches/v8.3@13566 85f007b7-540e-0410-9357-904b9bb8a0f7
---
-
-diff --git a/Makefile b/Makefile
-index b1edc01..ea73c51 100644
--- a/Makefile
-+++ b/Makefile
-@@ -160,9 +160,19 @@ else
- stage1 $(STAGE1_TARGETS) : always
- 	$(call stage-template,1)
- 
-+ifneq (,$(STAGE1_IMPLICITS))
-+$(STAGE1_IMPLICITS) : always
-+	$(call stage-template,1)
-+endif
-+
- stage2 $(STAGE2_TARGETS) : stage1
- 	$(call stage-template,2)
- 
-+ifneq (,$(STAGE2_IMPLICITS))
-+$(STAGE2_IMPLICITS) : stage1
-+	$(call stage-template,2)
-+endif
-+
- # Nota:
- # - world is one of the targets in $(STAGE2_TARGETS), hence launching
- # "make" or "make world" leads to recursion into stage1 then stage2
-diff --git a/Makefile.common b/Makefile.common
-index cc38980..46bf217 100644
--- a/Makefile.common
-+++ b/Makefile.common
-@@ -365,7 +365,7 @@ DATE=$(shell LANG=C date +"%B %Y")
- 
- SOURCEDOCDIR=dev/source-doc
- 
-CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
-+CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.o %.cmi %.cma %.cmxa %.a %.cmxs %.dep.ps %.dot
- 
- ### Targets forwarded by Makefile to a specific stage:
- 
-@@ -374,10 +374,12 @@ CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot
- STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \
-   $(GENFILES) \
-   source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \
-  $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o
-+  $(STAGE1_ML4:.ml4=.ml4-preprocessed)
-+
-+STAGE1_IMPLICITS:=
- 
- ifdef CM_STAGE1
- STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS)
-+ STAGE1_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
- endif
- 
- ## Enumeration of targets that require being done at stage2
-@@ -402,12 +404,13 @@ STAGE2_TARGETS:=$(COQBINARIES) lib kernel byterun library proofs tactics \
-   printers debug initplugins plugins \
-   world install coqide coqide-files coq coqlib \
-   coqlight states check init theories theories-light \
-  $(DOC_TARGETS) $(VO_TARGETS) validate \
-  %.vo %.glob states/% install-% %.ml4-preprocessed \
-+  $(DOC_TARGETS) $(VO_TARGETS) validate
-+
-+STAGE2_IMPLICITS:= %.vo %.glob states/% install-% %.ml4-preprocessed \
-   $(DOC_TARGET_PATTERNS)
- 
- ifndef CM_STAGE1
- STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS)
-+ STAGE2_IMPLICITS+=$(CAML_OBJECT_PATTERNS)
- endif
- 
- 
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -4,7 +4,7 @@
 {stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:

 let
-  version = "8.3pl1";
+  version = "8.3pl3";
 in

 stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0a791gsbf17y2wi0a376n78pxkhpl0lkzifhy5d3mx3lpn376j9s";
+    sha256 = "0ivrafwr4p8pklb9wfq3zyai19xdk05xr3q16xqk4q9pfad9w9dg";
  };

  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
@ -29,7 +29,7 @@ stdenv.mkDerivation {

  buildFlags = "world"; # Debug with "world VERBOSE=1";

-  patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
+  patches = [ ./configure.patch ];

  postPatch = ''
    UNAME=$(type -tp uname)
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@ -1,12 +1,17 @@
-{stdenv, fetchurl, polyml}:
+{stdenv, fetchurl, polyml, experimentalKernel ? false}:
+
+let
+  pname = "hol4";
+  version = "k.7";
+  kernelFlag = if experimentalKernel then "-expk" else "-stdknl";
+in

 stdenv.mkDerivation {
-  name = "hol";
+  name = "${pname}-${version}";

  src = fetchurl {
-    #url = "http://downloads.sourceforge.net/project/hol/hol/kananaskis-5/kananaskis-5.tar.gz";
-    url = mirror://sourceforge/hol/hol/kananaskis-5/kananaskis-5.tar.gz;
-    sha256 = "1qjfx5ii80v17yr04hz70n8aa46892fjc4qcxs9gs7nh3hw7rvmx";
+    url = mirror://sourceforge/hol/hol/kananaskis-7/kananaskis-7.tar.gz;
+    sha256 = "0gs1nmjvsjhnndama9v7gids2g86iip53v7d7dm3sfq6jxmqkwkl";
  };

  buildInputs = [polyml];
@ -16,21 +21,21 @@ stdenv.mkDerivation {
    cd  "$out/src"

    tar -xzf "$src"
-    cd hol
+    cd hol4.${version}

-    substituteInPlace tools-poly/Holmake/Holmake.sml --replace \
-      "\"/bin/mv\"" \
-      "\"mv\""
+    substituteInPlace tools/Holmake/Holmake_types.sml \
+      --replace "\"/bin/mv\"" "\"mv\"" \
+      --replace "\"/bin/cp\"" "\"cp\""

    #sed -ie "/compute/,999 d" tools/build-sequence # for testing

    poly < tools/smart-configure.sml
    
-    bin/build -expk -symlink
+    bin/build ${kernelFlag} -symlink

    mkdir -p "$out/bin"
-    ln -st $out/bin  $out/src/hol/bin/*
-    # ln -s $out/src/hol/bin $out/bin
+    ln -st $out/bin  $out/src/hol4.${version}/bin/*
+    # ln -s $out/src/hol4.${version}/bin $out/bin
  '';

  meta = {
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@ -9,11 +9,11 @@ let
 in

 stdenv.mkDerivation {
-  name = "hol_light-20120129";
+  name = "hol_light-20120312";
  src = fetchsvn {
    url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "122";
-    sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769";
+    rev = "128";
+    sha256 = "35dc164c05b07663bf596ea9553209087c1538dea87a04c23f01d5423b23dbfe";
  };

  buildInputs = [ ocaml findlib camlp5 ];
--- a/pkgs/applications/science/logic/matita/130312.nix
+++ b/pkgs/applications/science/logic/matita/130312.nix
@ -0,0 +1,66 @@
+{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "0.99.1pre130312";
+  pname = "matita";
+
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz"; 
+    sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s";
+  };
+
+  sourceRoot="${pname}-${version}";
+
+  unpackPhase = ''
+   mkdir $sourceRoot
+   tar -xvzf $src -C $sourceRoot
+   echo "source root is $sourceRoot"
+  '';
+
+  prePatch = ''
+   autoreconf -fvi 
+  '';
+
+  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf];
+
+  postPatch = ''
+    BASH=$(type -tp bash)
+    substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
+    substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
+    substituteInPlace configure --replace "ulex08" "ulex"
+    substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex"
+    substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex"
+    substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex"
+    substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex"
+    substituteInPlace configure --replace "zip" "camlzip"
+    substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip"
+    substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip"
+  '';
+
+  patches = [ ./configure_130312.patch ];
+
+  preConfigure = ''
+    # Setup for findlib.
+    OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH
+    RTDIR=$out/share/matita
+    export configureFlags="--with-runtime-dir=$RTDIR"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
+  '';
+
+  meta = {
+    homepage = http://matita.cs.unibo.it/;
+    description = "Matita is an experimental, interactive theorem prover";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
--- a/pkgs/applications/science/logic/matita/configure_130312.patch
+++ b/pkgs/applications/science/logic/matita/configure_130312.patch
@ -0,0 +1,35 @@
+--- matita/configure     2011-11-22 06:04:17.000000000 -0500
+++ matita/configure     2011-11-24 11:43:11.584847938 -0500
+@@ -1905,6 +1905,7 @@
+ # look for METAS dir
+ 
+ LIBSPATH="`pwd`/components"
+OLDCAMLPATH="$OCAMLPATH"
+ OCAMLPATH="$LIBSPATH/METAS"
+ 
+ # creating META.*
+@@ -1927,7 +1928,7 @@
+ gdome2 \
+ http \
+ lablgtk2 \
+-lablgtksourceview2.gtksourceview2 \
+lablgtk2.gtksourceview \
+ mysql \
+ netstring \
+ ulex08 \
+@@ -1953,13 +1954,13 @@
+ FINDLIB_REQUIRES="\
+ $FINDLIB_CREQUIRES \
+ lablgtk2.glade \
+-lablgtksourceview2.gtksourceview2 \
+lablgtk2.gtksourceview \
+ "
+ for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
+ do
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5
+ $as_echo_n "checking for $r ocaml library... " >&6; }
+-  if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then
+  if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   else
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@ -19,9 +19,6 @@ cabal.mkDerivation (self: {
    description = "a distributed, interactive, smart revision control system";
    license = "GPL";
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -35,20 +35,11 @@ rec {
    sendEmailSupport = stdenv.isDarwin == false;
  });

-  gitGit = import ./git/git-git.nix {
-    inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext
-      asciidoc texinfo xmlto docbook2x
-      docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversion autoconf;
-    svnSupport = false;
-    guiSupport = false;
-    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
-  };
-
  gitAnnex = lib.makeOverridable (import ./git-annex) {
    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
    inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse QuickCheck2;
+      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
+      QuickCheck2 bloomfilter;
  };

  qgit = import ./qgit {
@ -63,7 +54,6 @@ rec {
    qt = qt4;
  };

-
  stgit = import ./stgit {
    inherit fetchurl stdenv python git;
  };
--- 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,23 +1,25 @@
 { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
 , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils, IfElse
+, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
+, IfElse, bloomfilter
 }:

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

  src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "54b2d6a9660a700cbe914e8613c1a4bc265f912cf157be774e2b5ea5775a4502";
+    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
+    sha256 = "eeefca150f7f86a9373ac60cef9be22fe6fcb03fd13fda54793a4f8d46b747a1";
+    name = "git-annex-${version}.tar.gz";
  };

  buildInputs = [
    curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
-    rsync SHA testpack utf8String which liftedBase IfElse
+    rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
  ];

  checkTarget = "test";
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -8,7 +8,7 @@
 }:

 let
-  version = "1.7.9.2";
+  version = "1.7.9.4";
  svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@ -16,7 +16,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75";
+    sha256 = "c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39";
  };

  patches = [ ./docbook2texi.patch ];
--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@ -1,103 +0,0 @@
-{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
-, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
-, libxslt, tcl, tk, makeWrapper
-, svnSupport, subversion, perlLibs
-, guiSupport
-, sourceFromHead
-, autoconf
-}:
-
-# `git-svn' support requires Subversion and various Perl libraries.
-# FIXME: We should make sure Subversion comes with its Perl bindings.
-assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings);
-
-assert svnSupport -> subversion.perlBindings;
-
-stdenv.mkDerivation rec {
-  # the glob patch adds the filter [touching paths (glob)] to gitk
-  # contact marco-oweber@gmx.de if you want to know more details
-  name = "git-git-with-glob-patch";
-
-  # REGION AUTO UPDATE:     { name="git"; type="git"; url="git://git.kernel.org/pub/scm/git/git.git"; }
-  src = sourceFromHead "git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"; sha256 = "a910bbac05c6e349a0bcfd9a27f7045916e5d07dc4acb4baf6d92475c30e28dc"; });
-  # END
-
-  patchePhase = ''
-    patch -p1 < ${./docbook2texi-2.patch}
-    sed -i 's/docbook2x-texi/docbook2texi/gc' Documentation/Makefile
-  '';
-  # maybe this introduces unneccessary dependencies ?
-  patchPhase = "
-    unset patchPhase; patchPhase;
-    sed -i 's=/usr/bin/perl=$perl/bin/perl=g' `find -type f`
-    sed -i 's=/bin/pwd=pwd=g' `find -type f`
-  ";
-
-  inherit perl;
-  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf]
-    ++ # documentation tools
-       [ asciidoc texinfo xmlto docbook2x
-         docbook_xsl docbook_xml_dtd_45 libxslt ]
-    ++ stdenv.lib.optionals guiSupport [tcl tk];
-
-  preConfigure = "autoconf";
-  makeFlags = "install install-doc prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
-
-  postInstall =
-    ''
-      # Install Emacs mode.
-      echo "installing Emacs mode..."
-      mkdir -p $out/share/emacs/site-lisp
-      cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
-
-      wrapArgs=
-    '' # */
-
-   + (if svnSupport then
-
-      ''# wrap git-svn
-        gitperllib=$out/lib/perl5/site_perl
-        for i in ${builtins.toString perlLibs}; do
-          gitperllib=$gitperllib:$i/lib/perl5/site_perl
-        done
-#cp git-svn "$out/bin"
-        wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib"
-        wrapArgs="$wrapArgs --prefix PATH : ${subversion}/bin"
-       '' else "")
-
-   + ''# Install man pages and Info manual
-       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
-         -C Documentation ''
-
-   + (if guiSupport then ''
-       # Wrap Tcl/Tk programs
-         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}"
-         wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin"
-     '' else "")
-
-   + ''# Wrap `git-clone'
-       wrapArgs="$wrapArgs --prefix PATH : ${cpio}/bin"
-
-       for b in $out/bin/{git,gitk}; do
-         [ -f "$b" ] && eval "wrapProgram $b $wrapArgs"
-       done
-     ''
-
-   + ''# install bash completion script
-      d="$out/etc/bash_completion.d"
-      mkdir -p $d; cp contrib/completion/git-completion.bash "$d"
-     '';
-
-  meta = {
-    license = "GPLv2";
-    homepage = http://git.or.cz;
-    description = "Git, a popular distributed version control system";
-
-    longDescription = ''
-      Git, a popular distributed version control system designed to
-      handle very large projects with speed and efficiency.
-    '';
-
-  };
-}
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@ -1,20 +1,20 @@
 {stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL,
 libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264,
-alsaLib, lame, faac, faad2, libvorbis }:
+alsaLib, lame, faac, faad2, libvorbis, yasm, libvpx, xvidcore, libva }:

 assert stdenv ? glibc;

 stdenv.mkDerivation {
-  name = "avidemux-2.5.2";
+  name = "avidemux-2.5.6";
  
  src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.5.2.tar.gz;
-    sha256 = "1apq5s79ik562xmhyvg6nvkmk2bhm5fcjwsrwrpxwipn6swkfpk8";
+    url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz;
+    sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn";
  };
  
  buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
    pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib 
-    lame faac faad2 libvorbis ];
+    lame faac faad2 libvorbis yasm libvpx xvidcore libva ];

  cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
    " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
--- a/pkgs/applications/video/mythtv/builder.sh
+++ b/pkgs/applications/video/mythtv/builder.sh
@ -1,25 +0,0 @@
-source $stdenv/setup
-
-
-# Hack - MythTV's configure searches LD_LIBRARY_PATH for its
-# dependencies.
-for i in $pkgs; do
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$i/lib
-done
-echo $LD_LIBRARY_PATH
-
-
-buildPhase() {
-    qmake mythtv.pro
-    make
-}
-
-
-postInstall() {
-    sqlDir="$out/share/mythtv/sql"
-    mkdir -p $sqlDir
-    cp -p ./database/mc.sql $sqlDir/
-}
-
-
-genericBuild
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@ -1,36 +1,22 @@
-a@{ stdenv, fetchurl, which, qt3, x11, xlibs
-, lame, zlib, mesa, alsaLib
-, freetype, perl
+{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec
+, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
+, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
 }:

-let
-  qt3 = a.qt3.override { mysqlSupport = true; };
-in
+stdenv.mkDerivation rec {
+  name = "mythtv-0.24.2";

-stdenv.mkDerivation {
-  name = "mythtv-0.21";
-
-  builder = ./builder.sh;
-  
  src = fetchurl {
-    url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2;
-    sha256 = "1r654fvklpsf6h9iqckb8fhd7abgs71lx6xh352xgz9yzjl7ia1k";
+    url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2";
+    sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db";
  };

-  #configureFlags = "--x11-path=/no-such-path --dvb-path=/no-such-path";
-
-  configureFlags = ''
-    --disable-joystick-menu --disable-dvb
-  '';
-
  buildInputs = [
-    freetype qt3 lame zlib x11 mesa perl alsaLib
-    xlibs.libX11 xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu
-    xlibs.libXinerama xlibs.libXxf86vm xlibs.libXmu
-  ];
-  
-  patches = [
-    ./settings.patch
-    ./purity.patch # don't search in /usr/include etc.
+    freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec
+    libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
  ];
+
+  buildNativeInputs = [ pkgconfig which ];
+
+  patches = [ ./settings.patch ];
 }
--- a/pkgs/applications/video/mythtv/purity.patch
+++ b/pkgs/applications/video/mythtv/purity.patch
@ -1,75 +0,0 @@
-diff -rc mythtv-0.21-orig/configure mythtv-0.21/configure
-*** mythtv-0.21-orig/configure	2008-03-04 22:23:23.000000000 +0100
--- mythtv-0.21/configure	2008-06-23 11:00:09.000000000 +0200
-***************
-*** 1687,1693 ****
-  
-  has_library()
-  {
-!     if test -f /etc/ld.so.conf ; then
-          LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
-      else
-          LIBPATHS=''
--- 1687,1693 ----
-  
-  has_library()
-  {
-!     if false ; then
-          LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
-      else
-          LIBPATHS=''
-***************
-*** 1698,1704 ****
-      LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-  
-      # recurse down just one level, should be enough in most cases
-!     if test -f /etc/ld.so.conf ; then
-          INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
-          SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
-          for x in $SRCH ; do
--- 1698,1704 ----
-      LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-  
-      # recurse down just one level, should be enough in most cases
-!     if false ; then
-          INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
-          SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
-          for x in $SRCH ; do
-***************
-*** 1707,1713 ****
-          done
-      fi
-  
-!     LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
-  
-      HAS_IT="no"
-      for LIBPATH in $LIBPATHS ; do
--- 1707,1713 ----
-          done
-      fi
-  
-!     LIBPATHS="`echo $LIBPATHS | sed s/'\/ '/' '/g` "
-  
-      HAS_IT="no"
-      for LIBPATH in $LIBPATHS ; do
-***************
-*** 1720,1728 ****
-  
-  has_header()
-  {
-!     HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
-      INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
-!     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
-  
-      HAS_IT="no"
-      for HPATH in $HPATHS ; do
--- 1720,1728 ----
-  
-  has_header()
-  {
-!     HPATHS=""
-      INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
-!     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name\($\|[\/ ]\)/include\1/g")
-  
-      HAS_IT="no"
-      for HPATH in $HPATHS ; do
--- a/pkgs/applications/video/mythtv/settings.patch
+++ b/pkgs/applications/video/mythtv/settings.patch
@ -1,10 +1,13 @@
-diff -urN mythtv-0.18.1-orig/settings.pro mythtv-0.18.1/settings.pro
--- mythtv-0.18.1-orig/settings.pro	2005-10-22 15:32:48.000000000 +0200
-+++ mythtv-0.18.1/settings.pro	2005-10-22 15:35:01.000000000 +0200
-@@ -1,5 +1,6 @@
- CONFIG += $$CCONFIG
+diff --git a/Makefile b/Makefile
+index 05db819..383036d 100644
+--- a/Makefile
+++ b/Makefile
+@@ -53,7 +53,7 @@ i18n/Makefile: i18n/i18n.pro
+ locales/Makefile: locales/locales.pro
 
-+PREFIX = $$(out)
- isEmpty( PREFIX ) {
-     PREFIX = /usr/local
- }
+ $(addsuffix /Makefile,$(QT_SUBDIRS)): %/Makefile :
+-	cd $*; $(QMAKE) QMAKE=$(QMAKE) -o $(@F) $(<F)
+	cd $*; $(QMAKE) QMAKE=$(QMAKE) PREFIX=${PREFIX} -o $(@F) $(<F)
+ 
+ $(SUBDIRS): $(addsuffix /Makefile,$(SUBDIRS)) version.cpp
+ 	$(MAKE) -C $@
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  name = "vlc-${version}";
-  version = "2.0.0";
+  version = "2.0.1";

  src = fetchurl {
    url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
+    sha256 = "7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b";
  };

  buildInputs =
--- a/pkgs/applications/virtualization/qemu/1.0.nix
+++ b/pkgs/applications/virtualization/qemu/1.0.nix
@ -0,0 +1,19 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-1.0.1";
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/${name}.tar.gz";
+    sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
+  };
+
+  buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
+
+  meta = {
+    description = "QEmu processor emulator";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/virtualization/virtualbox/VBox.sh
+++ b/pkgs/applications/virtualization/virtualbox/VBox.sh
@ -1,66 +0,0 @@
-#!/bin/sh
-
-INSTALL_PATH="@INSTALL_PATH@"
-export LD_LIBRARY_PATH="@INSTALL_PATH@:@QT4_PATH@"
-
-export USER=$(whoami)
-
-if [ ! -c /dev/vboxdrv ]; then
-  echo "/dev/vboxdrv does not exist. Load the kernel module then try again."
-  exit 1
-fi
-if [ ! -r /dev/vboxdrv -o ! -w /dev/vboxdrv ]; then
-  echo "User $USER can not read and/or write to /dev/vboxdrv."
-  exit 1
-fi
-
-echo "/dev/vboxdrv exists and $USER can access it."
-
-SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
-if [ "$1" = "shutdown" ]; then
-  if [ -n "$SERVER_PID" ]; then
-    echo "Terminating VBoxSVC with PID $SERVER_PID."
-    kill -TERM $SERVER_PID
-  else
-    echo "VBoxSVC Not Currently Running."
-  fi
-  exit 0
-fi
-
-if [ ! -x "$INSTALL_PATH/VBoxSVC" ]; then
-  echo "$INSTALL_PATH/VBoxSVC does not exist! Can not continue."
-  exit 1
-fi
-
-APP=$(which $0)
-APP=${APP##/*/}
-
-if [ ! -x "$INSTALL_PATH/$APP" ]; then
-  echo "$INSTALL_PATH/$APP does not exist!"
-  exit 1
-fi
-case "$APP" in
-  VirtualBox|VBoxManage|VBoxSDL|VBoxVRDP)
-    EXEC_APP="$INSTALL_PATH/$APP"
-  ;;
-  *)
-    echo "Unknown application - $APP."
-  ;;
-esac
-
-if [ -z "$SERVER_PID" ]; then
-  rm -rf /tmp/.vbox-$USER-ipc
-  echo "Starting VBoxSVC for $USER."
-  "$INSTALL_PATH/VBoxSVC" --daemonize
-fi
-
-SERVER_PID=$(ps -U $USER | grep VBoxSVC | awk '{ print $1 }')
-if [ -z "$SERVER_PID" ]; then
-  echo "VBoxSVC failed to start! Can not continue"
-  exit 1
-fi
-
-echo "VBoxSVC is running for user $USER with PID $SERVER_PID."
-
-echo "Starting $EXEC_APP."
-exec "$EXEC_APP" "$@"
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -1,30 +1,36 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
-, python, which, alsaLib, curl, gawk
-, xorriso, makeself, perl, jdk, pkgconfig
+, which, alsaLib, curl, gawk
+, xorriso, makeself, perl, pkgconfig
+, javaBindings ? false, jdk ? null
+, pythonBindings ? false, python ? null
 }:

-let version = "4.1.8"; in
+with stdenv.lib;
+
+let version = "4.1.10"; in

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

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg";
+    sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
  };

  buildInputs =
    [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
      libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
-      pkgconfig which libXmu
-    ];
+      pkgconfig which libXmu ]
+    ++ optional javaBindings jdk
+    ++ optional pythonBindings python;

  patchPhase = ''
    set -x
    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
        -e 's@MKISOFS --version@MKISOFS -version@' \
+        -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
        -i configure
    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
@ -34,7 +40,11 @@ stdenv.mkDerivation {
  '';

  configurePhase = ''
-    ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
+    ./configure --with-qt4-dir=${qt4} \
+      ${optionalString (!javaBindings) "--disable-java"} \
+      ${optionalString (!pythonBindings) "--disable-python"} \
+      --disable-pulse --disable-hardening \
+      --with-mkisofs=${xorriso}/bin/xorrisofs
    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
        -i AutoConfig.kmk
    sed -e 's@arch/x86/@@' \
@ -63,10 +73,12 @@ stdenv.mkDerivation {
  '';
    
  installPhase = ''
+    libexec=$out/libexec/virtualbox
+  
    # Install VirtualBox files
    cd out/linux.*/release/bin
-    mkdir -p $out/virtualbox
-    cp -av * $out/virtualbox
+    mkdir -p $libexec
+    cp -av * $libexec
    
    # Install kernel module
    cd src
@ -74,8 +86,7 @@ stdenv.mkDerivation {
    export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
    
    # Remove root ownership stuff, since this does not work in a chroot environment
-    for i in `find . -name Makefile`
-    do
+    for i in `find . -name Makefile`; do
 	sed -i -e "s|-o root||g" \
               -e "s|-g root||g" $i
    done
@ -85,22 +96,14 @@ stdenv.mkDerivation {
    
    # Create wrapper script
    mkdir -p $out/bin
-    cp -v ${./VBox.sh} $out/bin/VBox.sh
-    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
-           -e "s|@QT4_PATH@|${qt4}/lib|" \
-	   -e "s|which|${which}/bin/which|" \
-	   -e "s|awk|${gawk}/bin/awk|" \
-	   $out/bin/VBox.sh
-    chmod 755 $out/bin/VBox.sh
-    for file in VirtualBox VBoxManage VBoxSDL
-    do
-        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
+    for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
+        ln -s "$libexec/$file" $out/bin/$file
    done
    
    # Create and fix desktop item
    mkdir -p $out/share/applications
-    sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop
-    ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications
+    sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
+    ln -sfv $libexec/virtualbox.desktop $out/share/applications
  '';
  
  meta = {
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@ -0,0 +1,28 @@
+{stdenv, fetchhg, xproto, libX11, patches ? []}:
+
+stdenv.mkDerivation rec {
+  name = "tabbed-20120209";
+ 
+  src = fetchhg {
+    url = http://hg.suckless.org/tabbed;
+    tag = "d7542a6f6dc5";
+    sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj";
+  };
+
+  # Allow users set their own list of patches
+  inherit patches;
+
+  buildInputs = [ xproto libX11 ];
+
+  preInstall = ''
+    export makeFlags="PREFIX=$out"
+  '';
+ 
+  meta = {
+    homepage = http://tools.suckless.org/tabbed;
+    description = "Simple generic tabbed fronted to xembed aware applications";
+    license="MIT";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
    description = "Third party extensions for xmonad";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
    description = "Third party extensions for xmonad with wacky dependencies";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@ -13,6 +13,8 @@
 , src, stdenv
 , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
 , failureHook ? null
+, prePhases ? []
+, postPhases ? []
 , ... } @ args:

 stdenv.mkDerivation (
@ -23,12 +25,10 @@ stdenv.mkDerivation (

    # When doing coverage analysis, we don't care about the result.
    dontInstall = doCoverageAnalysis;
+    useTempPrefix = doCoverageAnalysis;

    showBuildStats = true;

-    postPhases =
-      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
-
    finalPhase =
      ''
        # Propagate the release name of the source tarball.  This is
@ -58,13 +58,6 @@ stdenv.mkDerivation (
    name = name + (if src ? version then "-" + src.version else "");
  
    postHook = ''
-      mkdir -p $out/nix-support
-      echo "$system" > $out/nix-support/system
-
-      if test -z "${toString doCoverageAnalysis}"; then
-          echo "nix-build none $out" >> $out/nix-support/hydra-build-products
-      fi
-
      # If `src' is the result of a call to `makeSourceTarball', then it
      # has a subdirectory containing the actual tarball(s).  If there are
      # multiple tarballs, just pick the first one.
@ -79,9 +72,18 @@ stdenv.mkDerivation (
          export CFLAGS="-O0"
          export CXXFLAGS="-O0"
      fi
-
    ''; # */

+    initPhase = ''
+      mkdir -p $out/nix-support
+      echo "$system" > $out/nix-support/system
+
+      if [ -z "${toString doCoverageAnalysis}" ]; then
+          echo "nix-build none $out" >> $out/nix-support/hydra-build-products
+      fi
+    '';
+
+    prePhases = ["initPhase"] ++ prePhases;

    # In the report phase, create a coverage analysis report.
    coverageReportPhase = if doCoverageAnalysis then ''
@ -105,6 +107,9 @@ stdenv.mkDerivation (

    inherit lcovExtraTraceFiles;

+    postPhases = postPhases ++
+      (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}";
    };
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@ -29,11 +29,21 @@ vmTools.buildRPM (
      for i in $out/rpms/*/*.rpm; do
        if echo $i | grep -vq "\.src\.rpm$"; then
          echo "file rpm $i" >> $out/nix-support/hydra-build-products
+          
+          echo "installing $i..."
+          rpm -ip "$i" --excludepath /nix/store
+
+          rpmName="$(rpm -qp "$i")"
+          
+          echo "uninstalling $rpmName..."
+          rpm -e "$rpmName"
        fi
      done
+      
      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
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@ -112,7 +112,7 @@ _EOF_
  # the default binary.
  useSetUID = drv: path:
    let
-      name = stdenv.lib.basename path;
+      name = baseNameOf path;
      bin = "${drv}${path}";
    in assert name != "";
      writeScript "setUID-${name}" ''
--- a/pkgs/build-support/usernixos/activation.nix
+++ b/pkgs/build-support/usernixos/activation.nix
@ -0,0 +1,26 @@
+{ pkgs, config, ... }:
+
+let
+  script = pkgs.writeScriptBin "usernixos" (''
+    #!${pkgs.bash}/bin/bash
+  '' + config.activationContents);
+in
+with pkgs.lib;
+{
+  options = {
+    activation = mkOption {
+      default = {};
+    };
+
+    activationContents = mkOption {
+      default = "";
+      internal = true;
+      merge = concatStringsSep "\n";
+      description = ''
+        Commands to run at activation
+      '';
+    };
+  };
+
+  config.activation.toplevel = script;
+}
--- a/pkgs/build-support/usernixos/bashrc.nix
+++ b/pkgs/build-support/usernixos/bashrc.nix
@ -0,0 +1,59 @@
+# Generator for .bashrc
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+  bashrcFile = pkgs.writeScript "bashrc" config.bashrc.contents;
+  cfg = config.bashrc;
+in
+{
+  options = {
+    environment.editor = mkOption {
+      default = "${pkgs.vim}/bin/vim";
+      type = types.string;
+      description = ''
+        Editor
+      '';
+    };
+
+    bashrc = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable of .bashrc generation on activation
+        '';
+      };
+
+      destination = mkOption {
+        default = "~/.bashrc";
+        type = types.string;
+        description = ''
+          The symlink that will point to the generated bashrc at activation time
+        '';
+      };
+
+      contents = mkOption {
+        default = "";
+        type = types.string;
+        merge = concatStringsSep "\n";
+        description = ''
+          Enable of .bashrc generation on activation
+        '';
+      };
+    };
+  };
+
+  config.bashrc.contents = ''
+    export EDITOR="${config.environment.editor}"
+  '';
+
+  config.activationContents = mkIf cfg.enable ''
+    if [ -e "${cfg.destination}" ]; then
+      echo Cannot set "${cfg.destination}", it exists
+      exit 1
+    fi
+    ln -sf ${bashrcFile} "${cfg.destination}"
+  '';
+}
--- a/pkgs/build-support/usernixos/eval-config.nix
+++ b/pkgs/build-support/usernixos/eval-config.nix
@ -0,0 +1,31 @@
+{ system ? builtins.currentSystem
+, pkgs ? null
+, baseModules ? import ./module-list.nix
+, extraArgs ? {}
+, modules
+}:
+
+let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
+
+rec {
+
+  # These are the NixOS modules that constitute the system configuration.
+  configComponents = modules ++ baseModules;
+
+  # Merge the option definitions in all modules, forming the full
+  # system configuration.  It's not checked for undeclared options.
+  systemModule =
+    pkgs.lib.fixMergeModules configComponents extraArgs;
+
+  optionDefinitions = systemModule.config;
+  optionDeclarations = systemModule.options;
+  inherit (systemModule) options;
+
+  # These are the extra arguments passed to every module.  In
+  # particular, Nixpkgs is passed through the "pkgs" argument.
+  extraArgs = extraArgs_ // {
+    inherit pkgs modules baseModules;
+  };
+
+  config = systemModule.config;
+}
--- a/pkgs/build-support/usernixos/module-list.nix
+++ b/pkgs/build-support/usernixos/module-list.nix
@ -0,0 +1,4 @@
+[
+  ./activation.nix
+  ./bashrc.nix
+]
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
    url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
    sha256 = "10m0rds36yyaznfqaa9msayv6f0v1h50zbikja6qdy5dwwxi8q5w";
  };
+  buildFlags = "full-ttf";
  preBuild = ''
    sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
    sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/*
--- a/pkgs/desktops/e17/e_dbus/default.nix
+++ b/pkgs/desktops/e17/e_dbus/default.nix
@ -2,10 +2,10 @@
 , dbus_libs }:
 stdenv.mkDerivation rec {
  name = "e_dbus-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg";
  };
  buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
  propagatedBuildInputs = [ dbus_libs ];
--- a/pkgs/desktops/e17/ecore/d.nix
+++ b/pkgs/desktops/e17/ecore/d.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, eina, evas, xproto, libX11, libXext }:
-stdenv.mkDerivation rec {
-  name = "ecore-${version}";
-  version = "1.0.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
-  };
-  buildInputs = [ pkgconfig eina evas xproto ];
-  propagatedBuildInputs = [ libX11 libXext ];
-  meta = {
-    description = "";
-    longDescription = ''
-    '';
-    homepage = http://enlightenment.org/;
-    license = "BSD-style???";
-  };
-}
--- a/pkgs/desktops/e17/ecore/default.nix
+++ b/pkgs/desktops/e17/ecore/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
 stdenv.mkDerivation rec {
  name = "ecore-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4";
  };
  buildInputs = [ pkgconfig eina evas ];
  propagatedBuildInputs = [ libX11 libXext ];
--- a/pkgs/desktops/e17/edje/default.nix
+++ b/pkgs/desktops/e17/edje/default.nix
@ -2,10 +2,10 @@
 , ecore, embryo }:
 stdenv.mkDerivation rec {
  name = "edje-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx";
  };
  buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
  meta = {
--- a/pkgs/desktops/e17/eet/default.nix
+++ b/pkgs/desktops/e17/eet/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
 stdenv.mkDerivation rec {
  name = "eet-${version}";
-  version = "1.5.0";
+  version = "1.6.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp";
  };
  buildInputs = [ pkgconfig eina zlib libjpeg ];
  meta = {
--- a/pkgs/desktops/e17/eeze/default.nix
+++ b/pkgs/desktops/e17/eeze/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
 stdenv.mkDerivation rec {
  name = "eeze-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p";
  };
  buildInputs = [ pkgconfig eina ecore ];
  propagatedBuildInputs = [ udev ];
--- a/pkgs/desktops/e17/efreet/default.nix
+++ b/pkgs/desktops/e17/efreet/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
 stdenv.mkDerivation rec {
  name = "efreet-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0";
  };
  buildInputs = [ pkgconfig eina eet ecore ];
  meta = {
--- a/pkgs/desktops/e17/eina/default.nix
+++ b/pkgs/desktops/e17/eina/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
  name = "eina-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj";
  };
  meta = {
    description = "Enlightenment's core data structure library";
--- a/pkgs/desktops/e17/embryo/default.nix
+++ b/pkgs/desktops/e17/embryo/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina }:
 stdenv.mkDerivation rec {
  name = "embryo-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9";
  };
  buildInputs = [ pkgconfig eina ];
  meta = {
--- a/pkgs/desktops/e17/evas/default.nix
+++ b/pkgs/desktops/e17/evas/default.nix
@ -2,10 +2,10 @@
 , libX11, libXext, eina, eet }:
 stdenv.mkDerivation rec {
  name = "evas-${version}";
-  version = "1.1.0";
+  version = "1.2.0-alpha";
  src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv";
+    url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
+    sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq";
  };
  buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
                  libX11 libXext eina eet
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@ -15,8 +15,7 @@ let
    # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
    kdesdk = [ "kioslave" ];
    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt"
-      "qtruby" "qyoto" "smokekde" ];
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
  };

  # Extra subpackages in the manifest format
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
@ -0,0 +1,19 @@
+commit 48b92b74bc6fd270c33a726257e2879203cf5064
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 00:47:43 2012 +0400
+
+    Include SMOKE_QTCORE_INCLUDE_DIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48020a1..2263a73 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
+                               QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
+                               Phonon Qwt QSci QImageBlitz)
+                               
+-include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
+ include(MacroOptionalFindPackage)
+ include(MacroOptionalAddBindings)
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
@ -0,0 +1,118 @@
+commit e702abfd16f610e773fb0310d8c6512991794c63
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 00:50:02 2012 +0400
+
+    Rewrite FindPerlMore.cmake
+    
+    * Ask perl for expanded paths
+    * Move execute_process to a macro
+    * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
+    
+    The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
+    instead of perl install prefix.Add debug message
+
+diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
+index 6412a47..cc8faf8 100644
+--- a/cmake/FindPerlMore.cmake
+++ b/cmake/FindPerlMore.cmake
+@@ -5,54 +5,52 @@
+ #
+ #  PERL_INCLUDE_PATH = path to where perl.h can be found
+ 
+-if(PERL_INCLUDE_PATH)
+-   # Already in cache, be silent
+-   SET(PERL_HEADERS_FOUND TRUE)
+-endif (PERL_INCLUDE_PATH)		
+-
+-IF(PERL_EXECUTABLE)
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
+-   		OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
+-   		OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
+-   		OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
+-   		OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
+-   		OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
+-   		OUTPUT_VARIABLE PERL_VERSION)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
+-   		OUTPUT_VARIABLE PERL_CXX_FLAGS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
+-   		OUTPUT_VARIABLE PERL_CCDL_FLAGS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+-   		OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+-
+-	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
+-   		OUTPUT_VARIABLE PERL_LIBS)
+-
+-	FIND_PATH(PERL_INCLUDE_PATH 
+-  		NAMES perl.h
+-  		PATHS ${PERL_ARCH_LIB_DIR}/CORE
+-  	)
+-
+-	if(PERL_INCLUDE_PATH)
+-		SET(PERL_HEADERS_FOUND TRUE)
+-	endif (PERL_INCLUDE_PATH)
+-
+-	MARK_AS_ADVANCED(
+-	  PERL_INCLUDE_PATH
+-	  )
+if(FIND_PERLMORE_REQUIRED)
+  find_package(Perl REQUIRED)
+else()
+ find_package(Perl)
+endif()
+
+macro(_perl_get_config_var name output)
+  execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
+                  OUTPUT_VARIABLE PERL_${output})
+endmacro()
+
+macro(_perl_get_config_dir name)
+  string(TOLOWER ${name} _tmp)
+  string(REPLACE "_" "" _tmp ${_tmp})
+  _perl_get_config_var(${_tmp}exp ${name}_DIR)
+  string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
+endmacro()
+
+if(PERL_EXECUTABLE)
+  _perl_get_config_var(prefixexp ROOT_DIR)
+
+  _perl_get_config_dir(ARCH_LIB)
+  _perl_get_config_dir(SITE_ARCH)
+  _perl_get_config_dir(VENDOR_ARCH)
+  _perl_get_config_dir(SITE_LIB)
+  _perl_get_config_dir(VENDOR_LIB)
+
+  _perl_get_config_var(version VERSION)
+  _perl_get_config_var(ccflags CXX_FLAGS)
+  _perl_get_config_var(ccdlflags CCDL_FLAGS)
+
+  EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+                  OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+
+  _perl_get_config_var(perllibs LIBS)
+
+  FIND_PATH(PERL_INCLUDE_PATH
+            NAMES perl.h
+            HINTS ${PERL_ARCH_LIB_DIR}/CORE
+  )
+
+  if(PERL_INCLUDE_PATH)
+    SET(PERL_HEADERS_FOUND TRUE)
+  endif (PERL_INCLUDE_PATH)
+
+  MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
+ ENDIF(PERL_EXECUTABLE)
+ 
+ IF(PERL_HEADERS_FOUND)
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
@ -0,0 +1,454 @@
+commit c78779fcaff587818ee37bec3ded5e0617625b95
+Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
+Date:   Wed Mar 21 01:01:27 2012 +0400
+
+    Install to PERL_SITE_ARCH_INSTALL_DIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48020a1..16188df 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
+ add_definitions(-DDEBUG)
+ 
+ include (FindPerlMore)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
+ 
+ # the RPATH to be used when installing, but only if it's not a system directory
+ GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
+diff --git a/INSTALL b/INSTALL
+index d19f97e..97cc9f1 100644
+--- a/INSTALL
+++ b/INSTALL
+@@ -36,7 +36,6 @@ ccmake step.
+ The standard options are:
+     CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
+     CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
+-    CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
+     QT_QMAKE_EXECUTABLE = The path to your system's qmake.
+ 
+ cmake looks in your path for a qmake executable.  If it can't find it, it will
+diff --git a/Makefile.PL b/Makefile.PL
+index df9a13c..31dd912 100755
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -3,7 +3,7 @@
+ use strict;
+ use Config;
+ 
+-my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
+my ($prefix, $qmake) = ($Config{prefix});
+ my @cmakeArgs;
+ foreach my $arg (@ARGV) {
+     my $key = $arg;
+@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
+     $value =~ s/^[^=]*=//g;
+     if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
+         $prefix = $value;
+-        $sitearch = "$prefix";
+     }
+     elsif ($key eq 'QMAKE') {
+         $qmake = $value;
+@@ -34,7 +33,6 @@ if($^O =~ /win/i){
+ }
+ push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
+ push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
+-push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
+ push @args, @cmakeArgs;
+ 
+ if ( eval "require Alien::SmokeQt" ) {
+diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
+index f2857c3..78674ea 100644
+--- a/phonon/lib/CMakeLists.txt
+++ b/phonon/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
+-install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
+index a04db11..9933dfd 100644
+--- a/phonon/src/CMakeLists.txt
+++ b/phonon/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
+ set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_phonon PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
+index 0809ba8..22fc1c0 100644
+--- a/qimageblitz/lib/CMakeLists.txt
+++ b/qimageblitz/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
+-install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
+index 02ef494..4f02c1b 100644
+--- a/qimageblitz/src/CMakeLists.txt
+++ b/qimageblitz/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
+ set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
+index 63b451f..d22869f 100644
+--- a/qsci/lib/CMakeLists.txt
+++ b/qsci/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
+-install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
+index 8c1659b..bdcb5a8 100644
+--- a/qsci/src/CMakeLists.txt
+++ b/qsci/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
+ set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qsci PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
+index 2f04cfa..dda5afa 100644
+--- a/qt3support/lib/CMakeLists.txt
+++ b/qt3support/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
+-install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
+index b24532e..bed99aa 100644
+--- a/qt3support/src/CMakeLists.txt
+++ b/qt3support/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
+ set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
+index ef07d10..1d78196 100644
+--- a/qtcore/lib/CMakeLists.txt
+++ b/qtcore/lib/CMakeLists.txt
+@@ -1,3 +1,3 @@
+ add_subdirectory( QtCore4 )
+ add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
+-install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
+diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
+index 44c7893..06aef20 100644
+--- a/qtcore/lib/QtCore4/CMakeLists.txt
+++ b/qtcore/lib/QtCore4/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
+ add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
+ add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
+diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
+index 3910636..b5e645c 100644
+--- a/qtcore/src/CMakeLists.txt
+++ b/qtcore/src/CMakeLists.txt
+@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
+ set_target_properties(perlqtcore4 PROPERTIES
+     OUTPUT_NAME ${libraryName}
+     PREFIX ""
+-    INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
+    INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
+ )
+ 
+-install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+ install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
+               marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
+               QtCore4.h smokehelp.h smokeperl.h util.h
+diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
+index d03a672..a60d603 100644
+--- a/qtdbus/lib/CMakeLists.txt
+++ b/qtdbus/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
+-install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
+index 9aa05a0..5786ea2 100644
+--- a/qtdbus/src/CMakeLists.txt
+++ b/qtdbus/src/CMakeLists.txt
+@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
+ set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
+ set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
+diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
+index e8d2847..b458858 100644
+--- a/qtdeclarative/lib/CMakeLists.txt
+++ b/qtdeclarative/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
+-install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
+index 1662167..ec2a8fc 100644
+--- a/qtdeclarative/src/CMakeLists.txt
+++ b/qtdeclarative/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
+ set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
+index 82626c8..e62a4ac 100644
+--- a/qtgui/lib/CMakeLists.txt
+++ b/qtgui/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
+-install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
+index 4cc8b36..44041b6 100644
+--- a/qtgui/src/CMakeLists.txt
+++ b/qtgui/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
+ set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
+index dcf5ebe..da817d4 100644
+--- a/qthelp/lib/CMakeLists.txt
+++ b/qthelp/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
+-install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
+index c00359d..689cb29 100644
+--- a/qthelp/src/CMakeLists.txt
+++ b/qthelp/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
+ set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
+index e55f697..5384539 100644
+--- a/qtmultimedia/lib/CMakeLists.txt
+++ b/qtmultimedia/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
+-install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
+index 0728aba..df8e552 100644
+--- a/qtmultimedia/src/CMakeLists.txt
+++ b/qtmultimedia/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
+ set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
+index 12cd5dd..d1fb0e6 100644
+--- a/qtnetwork/lib/CMakeLists.txt
+++ b/qtnetwork/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
+-install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
+index caf8327..0994d57 100644
+--- a/qtnetwork/src/CMakeLists.txt
+++ b/qtnetwork/src/CMakeLists.txt
+@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
+ set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
+index f3b5640..d8dc9e4 100644
+--- a/qtopengl/lib/CMakeLists.txt
+++ b/qtopengl/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
+-install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
+index 20493a9..777af89 100644
+--- a/qtopengl/src/CMakeLists.txt
+++ b/qtopengl/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
+ set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
+index d21dbe5..320ff93 100644
+--- a/qtscript/lib/CMakeLists.txt
+++ b/qtscript/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
+-install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
+index dd395be..6ff47d8 100644
+--- a/qtscript/src/CMakeLists.txt
+++ b/qtscript/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
+ set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
+index 59336d3..d9dd4d5 100644
+--- a/qtsql/lib/CMakeLists.txt
+++ b/qtsql/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
+-install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
+index 3ec2028..59096ba 100644
+--- a/qtsql/src/CMakeLists.txt
+++ b/qtsql/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
+ set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
+index 33f6deb..bf1dc1f 100644
+--- a/qtsvg/lib/CMakeLists.txt
+++ b/qtsvg/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
+-install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
+index 11eccd2..449bf0f 100644
+--- a/qtsvg/src/CMakeLists.txt
+++ b/qtsvg/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
+ set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
+index 3bfa78c..5a8d8da 100644
+--- a/qttest/lib/CMakeLists.txt
+++ b/qttest/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
+-install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
+index 5492e55..d4662b1 100644
+--- a/qttest/src/CMakeLists.txt
+++ b/qttest/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
+ set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
+index 119e40e..3a5f472 100644
+--- a/qtuitools/lib/CMakeLists.txt
+++ b/qtuitools/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
+-install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
+index a8ae4a2..ecc079f 100644
+--- a/qtuitools/src/CMakeLists.txt
+++ b/qtuitools/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
+ set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
+index a02f7ee..3846227 100644
+--- a/qtwebkit/lib/CMakeLists.txt
+++ b/qtwebkit/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
+-install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
+index a6e00f8..dbebc44 100644
+--- a/qtwebkit/src/CMakeLists.txt
+++ b/qtwebkit/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
+ set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
+index 5505bc4..7db743c 100644
+--- a/qtxml/lib/CMakeLists.txt
+++ b/qtxml/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
+-install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
+index 018508c..a351609 100644
+--- a/qtxml/src/CMakeLists.txt
+++ b/qtxml/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
+ set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
+index a35f3df..3d86103 100644
+--- a/qtxmlpatterns/lib/CMakeLists.txt
+++ b/qtxmlpatterns/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
+-install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
+index 9970a98..563e922 100644
+--- a/qtxmlpatterns/src/CMakeLists.txt
+++ b/qtxmlpatterns/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
+ set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
+diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
+index 0013c4d..d67ffbf 100644
+--- a/qwt/lib/CMakeLists.txt
+++ b/qwt/lib/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
+-install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
+diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
+index 869d818..b644e80 100644
+--- a/qwt/src/CMakeLists.txt
+++ b/qwt/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
+ set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
+ set_target_properties(perl_qwt PROPERTIES PREFIX "")
+ 
+-install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
@ -4,6 +4,12 @@ kde {
  buildInputs = [ smokeqt perl ];
  buildNativeInputs = [ cmake ];

+  patches =
+    # The order is important
+    [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
+      ./perlqt-use-site-arch-install-dir.patch
+    ];
+
  meta = {
    description = "Perl bindings for Qt library";
  };
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..1a6ad2e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+ find_package(Ruby REQUIRED)
+ find_package(Qt4 REQUIRED)
+ find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
+-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
+ include(MacroOptionalFindPackage)
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+     return()
+ endif (NOT COMPILE_RUBY)
+ 
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+ 
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
@ -0,0 +1,16 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+  buildInputs = [ smokeqt ruby ];
+  buildNativeInputs = [ cmake ];
+
+  # The second patch is not ready for upstream submmission. I should add an
+  # option() instead.
+  patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
+
+  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+  meta = {
+    description = "Ruby bindings for Qt library";
+  };
+}
--- a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79945c4..a244d0f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -32,10 +32,6 @@ set(generator_SRC
+     type.cpp
+ )
+ 
+-# force RPATH so that the binary is usable from within the build tree
+-set (CMAKE_SKIP_BUILD_RPATH FALSE)
+-set (CMAKE_SKIP_RPATH FALSE)
+-
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+ 
+ add_executable(smokegen ${generator_SRC})
+diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
+index 947315c..de8d66c 100644
+--- a/cmake/SmokeConfig.cmake.in
+++ b/cmake/SmokeConfig.cmake.in
+@@ -44,21 +44,19 @@ macro (find_smoke_component name)
+         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
+ 
+         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
+-            ${lowercase}_smoke.h 
+-            PATH ${SMOKE_INCLUDE_DIR}
+-            NO_DEFAULT_PATH
+            ${lowercase}_smoke.h
+            HINTS ${SMOKE_INCLUDE_DIR}
+            PATH_SUFFIXES smoke
+             )
+         if(WIN32)
+ 		    # DLLs are in the bin directory.
+             find_library(SMOKE_${uppercase}_LIBRARY
+                 smoke${lowercase}
+-                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
+-                NO_DEFAULT_PATH)
+                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
+         else(WIN32)
+             find_library(SMOKE_${uppercase}_LIBRARY
+                 smoke${lowercase}
+-                PATHS "@SMOKE_LIBRARY_PREFIX@"
+-                NO_DEFAULT_PATH)
+                PATHS "@SMOKE_LIBRARY_PREFIX@")
+         endif(WIN32)
+ 
+         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
--- a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
@ -4,7 +4,7 @@ kde {
  buildInputs = [ qt4 ];
  buildNativeInputs = [ cmake ];

-  patchPhase = "sed -e /RPATH/d -i CMakeLists.txt";
+  patches = [ ./smokegen-nix.patch ];

  meta = {
    description = "C++ parser used to generate language bindings for Qt/KDE";
--- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
@ -0,0 +1,12 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
+
+kde {
+  # attica, akonadi and kdepimlibs are disabled due to smokegen crash
+  buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ];
+  buildNativeInputs = [ cmake ];
+
+  cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
+  meta = {
+    description = "SMOKE bindings for kdelibs";
+  };
+}
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
    description = "Command-line program for type-checking and compiling Agda programs";
    license = "unknown";
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
    description = "Compiler for a simple functional language";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
  };
 })
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@ -54,6 +54,7 @@ let version = "4.6.3";
      # target libraries and tools.
      ++ optional langAda ./gnat-cflags.patch
      ++ optional langVhdl ./ghdl-ortho-cflags.patch
+      ++ optional langFortran ./gfortran-driving.patch
      ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;

    javaEcj = fetchurl {
--- a/Show More
+++ b/Show More