Merge branch 'master' into stdenv-updates.

2013-03-15 20:33:24 +01:00 · 2013-03-15 20:33:24 +01:00 · 3e1de0f4e8
commit 3e1de0f4e8
parent 637e799ead 893c684e99
128 changed files with 1470 additions and 422 deletions
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "caps-${version}";
+  version = "0.9.7";
+  src = fetchurl {
+    url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
+    sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0";
+  };
+  configurePhase = ''
+    echo "PREFIX = $out" > defines.make
+  '';
+
+  meta = {
+    description = "A selection of LADSPA plugins implementing classic effects";
+    longDescription = ''
+      The C* Audio Plugin Suite is a selection of classic effects,
+      unique filters and signal generators.  The digital guitarist
+      finds in CAPS a range of processors recreating key aspects of
+      the formation of tone in traditional electronic instrument
+      amplification.  Beyond sound quality, central design
+      considerations are latency-free realtime operation, modesty of
+      resource demands and meaningful control interfaces.
+    '';
+    homepage = http://www.quitte.de/dsp/caps.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
+stdenv.mkDerivation rec {
+  name = "jack-rack-1.4.7";
+  src = fetchurl {
+    url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
+    sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
+  };
+  buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
+
+  meta = {
+    description = ''An effects "rack" for the JACK low latency audio API'';
+    longDescription = ''
+      JACK Rack is an effects "rack" for the JACK low latency audio
+      API. The rack can be filled with LADSPA effects plugins and can
+      be controlled using the ALSA sequencer. It's phat; it turns your
+      computer into an effects box.
+    '';
+    homepage = http://jack-rack.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@ -1,52 +1,79 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:

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

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

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

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

  buildInputs = [ dpkg makeWrapper ];

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

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

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

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

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

  dontStrip = true;
--- a/pkgs/applications/editors/emacs-24/builder.sh
+++ b/pkgs/applications/editors/emacs-24/builder.sh
@ -29,6 +29,4 @@ preConfigure() {
    done
 }

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

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

  builder = ./builder.sh;

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

  buildInputs =
--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/pkgs/applications/graphics/panotools/default.nix
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {

  buildInputs = [ perl libjpeg libpng libtiff ];

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

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

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

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

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

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

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

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

-  meta = { 
+  meta = {
      description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties.";
      homepage = http://surf.suckless.org;
      license = "MIT";
--- a/pkgs/applications/networking/browsers/firefox/19.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/19.0.nix
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "19.0.1";
+  firefoxVersion = "19.0.2";

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


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

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

-stdenv.mkDerivation {
-  name = "vimprobable2-1.2.0";
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "vimprobable2-${version}";
  src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
-    sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
+    sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p";
  };

  # Nixos default ca bundle
@ -17,8 +18,9 @@ stdenv.mkDerivation {

  installPhase = ''
    make PREFIX=/ DESTDIR=$out install
-    wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
-      ${glib_networking}/lib/gio/modules
+    wrapProgram "$out/bin/vimprobable2" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
  '';

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

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

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

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

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

-  meta = { 
+  meta = {
      description = "a MUA";
-      homepage = http://msmtp.sourceforge.net/;
-      license = "GPL";
-    }; 
+      homepage = "http://msmtp.sourceforge.net/";
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
+    };
 }
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@ -14,7 +14,7 @@ let
    version="5.4.0";
    name="${baseName}-${version}";
    url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
-    hash="0nyq2kkiphwgj3hczc7zglzqjj6hxxsh6zcygpy4yhxh9a9rpkg1";
+    hash="0rvrmh3vw4bk7mj29bx1pi76g2bsqyc13gsnpa1cbjs5pzyhm780";
  };
 in
 rec {
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -31,6 +31,9 @@ stdenv.mkDerivation {
         docbook_xsl docbook_xml_dtd_45 libxslt ]
    ++ stdenv.lib.optionals guiSupport [tcl tk];

+  # required to support pthread_cancel()
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+
  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");

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

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

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

    buildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
      pkgconfig cmake gnumake yasm python
      boost
      gettext pcre yajl fribidi
-      openssl gperf
+      openssl gperf tinyxml2 taglib libssh swig jre
      libX11 xproto inputproto
      libXt libXmu libXext xextproto
      libXinerama libXrandr randrproto
@ -86,5 +86,7 @@ stdenv.mkDerivation rec {
      homepage = http://xbmc.org/;
      description = "XBMC Media Center";
      license = "GPLv2";
+      platforms = stdenv.lib.platforms.linux; 
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
    };
 }
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@ -92,13 +92,12 @@

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

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

            # compiles Setup and configures
            configurePhase = ''
--- a/pkgs/build-support/upstream-updater/urls-from-page.sh
+++ b/pkgs/build-support/upstream-updater/urls-from-page.sh
@ -9,6 +9,6 @@ relpath="${path#$server}"
 
 echo "URL: $url" >&2

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

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

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

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

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

  preBuild =
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@ -3,12 +3,12 @@

 stdenv.mkDerivation rec {
  p_name  = "xfce4-power-manager";
-  ver_maj = "1.0";
-  ver_min = "10";
+  ver_maj = "1.2";
+  ver_min = "0";

  src = fetchurl {
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40";
+    sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
  };
  name = "${p_name}-${ver_maj}.${ver_min}";

--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop.nix
@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
  p_name  = "xfdesktop";
  ver_maj = "4.10";
-  ver_min = "0";
+  ver_min = "2";

  src = fetchurl {
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9";
+    sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9";
  };
  name = "${p_name}-${ver_maj}.${ver_min}";

--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@ -17,6 +17,11 @@ deps = rec { # xfce-global dependency overrides should be here

 xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach

+  #### NixOS support
+
+  inherit (deps) gvfs;
+  xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
+
  #### CORE                 from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"

  exo             = callPackage ./core/exo.nix { };
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:

 stdenv.mkDerivation rec {
-  version = "7.7.20121213";
+  version = "7.7.20130223";
  name = "ghc-${version}";

  src = fetchurl {
    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
+    sha256 = "1naw6x1mjij10h9k4biard2pkzi6zml26vv4h34asprv0h6ymdbg";
  };

  buildInputs = [ ghc perl gmp ncurses ];
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@ -60,17 +60,22 @@ stdenv.mkDerivation rec {
          echo -n .
        done
        for f in "$currentPath/etc/bash_completion.d/"*; do
-	  mkdir -p $out/etc/bash_completion.d
+          mkdir -p $out/etc/bash_completion.d
          ln -s $f $out/etc/bash_completion.d/
          echo -n .
        done
-	for s in 1 2 3 4 5 6 7 8 9; do
-	  for f in "$currentPath/share/man/man$s/"*; do
-	    mkdir -p $out/share/man/man$s
+        for s in 1 2 3 4 5 6 7 8 9; do
+          for f in "$currentPath/share/man/man$s/"*; do
+            mkdir -p $out/share/man/man$s
            ln -sv $f $out/share/man/man$s/
            echo -n .
-	  done
-       done
+          done
+        done
+        for f in "$currentPath/share/emacs/site-lisp/"*; do
+          mkdir -p $out/share/emacs/site-lisp
+          ln -s $f $out/share/emacs/site-lisp/
+          echo -n .
+        done
        for f in "$currentPkgDir/"*.conf; do
          ln -s $f $linkedPkgDir
          echo -n .
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "idris";
-  version = "0.9.6.1";
-  sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62";
+  version = "0.9.7";
+  sha256 = "0y3rnxbs2s7kxlzlc347vwpylw2p0pdz50zgkyii21gd6klqvd45";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@ -1,4 +1,4 @@
-{ 
+{
  stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
  regexCompat, HsSyck, random
 }:
@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
  ];

  meta = {
-    description = ''
-      A Haskell compiler which aims to produce the most efficient programs
-    '';
+    homepage = "http://repetae.net/computer/jhc/";
+    description = "A Haskell compiler which aims to produce the most efficient programs";
    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.aforemny ];
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.aforemny stdenv.lib.maintainers.simons ];
  };

 }
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchurl, bison, flex, boost, gputils ? null }:
+
+stdenv.mkDerivation rec {
+  version = "3.2.0";
+  name = "sdcc-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
+    sha256 = "15gdl04kqpvmwvvplss5nmp3bz8rhz48dhb0wmb2v9v9sn7qj01d";
+  };
+
+  # TODO: remove this comment when gputils != null is tested
+  buildInputs = [ bison flex boost gputils ];
+
+  configureFlags = ''
+    ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
+  '';
+
+  meta = {
+    description = "Small Device C Compiler";
+    longDescription = ''
+      SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
+      the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+      (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
+      (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
+      Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and
+      PIC18 targets. It can be retargeted for other microprocessors.
+    '';
+    homepage = http://sdcc.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
--- a/pkgs/development/interpreters/python/docs/default.nix
+++ b/pkgs/development/interpreters/python/docs/default.nix
@ -3,6 +3,7 @@
 let
 pythonDocs = {
  html = {
+    recurseForDerivations = true;
    python33 = import ./3.3-html.nix {
      inherit stdenv fetchurl lib;
    };
@ -23,6 +24,7 @@ pythonDocs = {
    };
  };
  pdf_a4 = {
+    recurseForDerivations = true;
    python33 = import ./3.3-pdf-a4.nix {
      inherit stdenv fetchurl lib;
    };
@ -43,6 +45,7 @@ pythonDocs = {
    };
  };
  pdf_letter = {
+    recurseForDerivations = true;
    python33 = import ./3.3-pdf-letter.nix {
      inherit stdenv fetchurl lib;
    };
@ -63,6 +66,7 @@ pythonDocs = {
    };
  };
  text = {
+    recurseForDerivations = true;
    python33 = import ./3.3-text.nix {
      inherit stdenv fetchurl lib;
    };
--- a/pkgs/development/interpreters/python/docs/generate.sh
+++ b/pkgs/development/interpreters/python/docs/generate.sh
@ -16,7 +16,11 @@ pythonDocs = {
 EOF

 for type in $TYPES; do
-    echo "  ${type/-/_} = {" >> default.nix
+    cat >>default.nix <<EOF
+  ${type/-/_} = {
+    recurseForDerivations = true;
+EOF
+
    for version in $VERSIONS; do
        major=$(echo -n ${version}| cut -d. -f1)
        minor=$(echo -n ${version}| cut -d. -f2)
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@ -10,23 +10,30 @@ g: # Get dependencies from patched gems
    activerecord = g.activerecord_3_2_12;
    activeresource = g.activeresource_3_2_12;
    activesupport = g.activesupport_3_2_12;
+    addressable = g.addressable_2_3_3;
    arel = g.arel_3_0_2;
    atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
    autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_8_3_1;
+    aws_sdk = g.aws_sdk_1_8_5;
    bitbucket_backup = g.bitbucket_backup_0_2_2;
    builder = g.builder_3_2_0;
    buildr = g.buildr_1_4_10;
-    bundler = g.bundler_1_3_1;
+    bundler = g.bundler_1_3_4;
    childprocess = g.childprocess_0_3_9;
+    chronic = g.chronic_0_9_1;
    daemons = g.daemons_1_1_9;
    diff_lcs = g.diff_lcs_1_1_3;
    dimensions = g.dimensions_1_2_0;
+    em_resolv_replace = g.em_resolv_replace_1_1_3;
    erubis = g.erubis_2_7_0;
-    eventmachine = g.eventmachine_1_0_1;
+    eventmachine = g.eventmachine_1_0_3;
+    eventmachine_tail = g.eventmachine_tail_0_6_4;
    fakes3 = g.fakes3_0_1_5;
+    faraday = g.faraday_0_8_6;
+    faraday_middleware = g.faraday_middleware_0_8_8;
    ffi = g.ffi_1_4_0;
-    foreman = g.foreman_0_61_0;
+    file_tail = g.file_tail_1_0_12;
+    foreman = g.foreman_0_62_0;
    highline = g.highline_1_6_15;
    hike = g.hike_1_2_1;
    hoe = g.hoe_3_1_0;
@ -42,15 +49,18 @@ g: # Get dependencies from patched gems
    mime_types = g.mime_types_1_21;
    minitar = g.minitar_0_5_3;
    multi_json = g.multi_json_1_6_1;
+    multipart_post = g.multipart_post_1_2_0;
    net_sftp = g.net_sftp_2_0_5;
    net_ssh = g.net_ssh_2_6_6;
    nix = g.nix_0_1_1;
    nokogiri = g.nokogiri_1_5_6;
+    papertrail = g.papertrail_0_9_7;
+    papertrail_cli = g.papertrail_cli_0_9_3;
    parallel = g.parallel_0_6_2;
    polyglot = g.polyglot_0_3_3;
    rack = g.rack_1_5_2;
    rack_cache = g.rack_cache_1_2;
-    rack_protection = g.rack_protection_1_4_0;
+    rack_protection = g.rack_protection_1_5_0;
    rack_ssl = g.rack_ssl_1_3_3;
    rack_test = g.rack_test_0_6_2;
    rails = g.rails_3_2_12;
@ -59,6 +69,7 @@ g: # Get dependencies from patched gems
    rb_fsevent = g.rb_fsevent_0_9_3;
    rdiscount = g.rdiscount_2_0_7_1;
    rdoc = g.rdoc_3_12_2;
+    remote_syslog = g.remote_syslog_1_6_13;
    rjb = g.rjb_1_4_6;
    rspec = g.rspec_2_11_0;
    rspec_core = g.rspec_core_2_11_1;
@ -66,23 +77,27 @@ g: # Get dependencies from patched gems
    rspec_mocks = g.rspec_mocks_2_11_3;
    rubyforge = g.rubyforge_2_0_4;
    rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_2_6;
+    sass = g.sass_3_2_7;
    selenium_webdriver = g.selenium_webdriver_2_31_0;
+    servolux = g.servolux_0_10_0;
    sinatra = g.sinatra_1_3_2;
    sprockets = g.sprockets_2_2_2;
+    syslog_protocol = g.syslog_protocol_0_9_2;
    systemu = g.systemu_2_5_2;
    therubyracer = g.therubyracer_0_10_2;
    thin = g.thin_1_5_0;
    thor = g.thor_0_17_0;
-    tilt = g.tilt_1_3_4;
+    tilt = g.tilt_1_3_5;
+    tins = g.tins_0_7_2;
    treetop = g.treetop_1_4_12;
-    tzinfo = g.tzinfo_0_3_36;
+    tzinfo = g.tzinfo_0_3_37;
    uuid = g.uuid_2_3_7;
    uuidtools = g.uuidtools_2_1_3;
    websocket = g.websocket_1_0_7;
    xml_simple = g.xml_simple_1_1_1;
+    yajl_ruby = g.yajl_ruby_1_1_0;
  };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
  gems = {
    ZenTest_4_9_0 = {
      basename = ''ZenTest'';
@ -156,7 +171,7 @@ installed versions.'';
        longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
      };
      name = ''activerecord-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_36 ];
+      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
      sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
    };
    activeresource_3_2_12 = {
@ -181,6 +196,20 @@ installed versions.'';
      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
      sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
    };
+    addressable_2_3_3 = {
+      basename = ''addressable'';
+      meta = {
+        description = ''URI Implementation'';
+        homepage = ''http://addressable.rubyforge.org/'';
+        longDescription = ''Addressable is a replacement for the URI implementation that is part of
+Ruby's standard library. It more closely conforms to the relevant RFCs and
+adds support for IRIs and URI templates.
+'';
+      };
+      name = ''addressable-2.3.3'';
+      requiredGems = [  ];
+      sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh'';
+    };
    arel_3_0_2 = {
      basename = ''arel'';
      meta = {
@ -233,16 +262,16 @@ rails support and extra plugins for migrations and fixtures.'';
      requiredGems = [ g.ZenTest_4_9_0 ];
      sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
    };
-    aws_sdk_1_8_3_1 = {
+    aws_sdk_1_8_5 = {
      basename = ''aws_sdk'';
      meta = {
        description = ''AWS SDK for Ruby'';
        homepage = ''http://aws.amazon.com/sdkforruby'';
        longDescription = ''AWS SDK for Ruby'';
      };
-      name = ''aws-sdk-1.8.3.1'';
+      name = ''aws-sdk-1.8.5'';
      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
-      sha256 = ''1yiv2skrrwqw8ihznnqqznh4yax75hbv497xqllp7b5qqmnrpvy4'';
+      sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
    };
    bitbucket_backup_0_2_2 = {
      basename = ''bitbucket_backup'';
@ -316,19 +345,19 @@ for those one-off tasks, with a language that's a joy to use.
 '';
      };
      name = ''buildr-1.4.10'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_1 ];
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
      sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
    };
-    bundler_1_3_1 = {
+    bundler_1_3_4 = {
      basename = ''bundler'';
      meta = {
        description = ''The best way to manage your application's dependencies'';
        homepage = ''http://gembundler.com'';
        longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
      };
-      name = ''bundler-1.3.1'';
+      name = ''bundler-1.3.4'';
      requiredGems = [  ];
-      sha256 = ''1nmvfsk9148nkl0bdcs167kiihp89zwkyvjs0khvi4df6s9km725'';
+      sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj'';
    };
    childprocess_0_3_9 = {
      basename = ''childprocess'';
@ -341,6 +370,17 @@ for those one-off tasks, with a language that's a joy to use.
      requiredGems = [ g.ffi_1_4_0 ];
      sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
    };
+    chronic_0_9_1 = {
+      basename = ''chronic'';
+      meta = {
+        description = ''Natural language date/time parsing.'';
+        homepage = ''http://github.com/mojombo/chronic'';
+        longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
+      };
+      name = ''chronic-0.9.1'';
+      requiredGems = [  ];
+      sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk'';
+    };
    daemons_1_1_9 = {
      basename = ''daemons'';
      meta = {
@ -388,6 +428,16 @@ is the MIT license.'';
      requiredGems = [  ];
      sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
    };
+    em_resolv_replace_1_1_3 = {
+      basename = ''em_resolv_replace'';
+      meta = {
+        description = ''EventMachine-aware DNS lookup for Ruby'';
+        homepage = ''http://github.com/mperham/em-resolv-replace'';
+      };
+      name = ''em-resolv-replace-1.1.3'';
+      requiredGems = [  ];
+      sha256 = ''1w5y4rzmp51ni56v05qwgay5wrs2i6i3q92pvlcrghmhxhgsbqg7'';
+    };
    erubis_2_7_0 = {
      basename = ''erubis'';
      meta = {
@ -411,7 +461,7 @@ is the MIT license.'';
      requiredGems = [  ];
      sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
    };
-    eventmachine_1_0_1 = {
+    eventmachine_1_0_3 = {
      basename = ''eventmachine'';
      meta = {
        description = ''Ruby/EventMachine library'';
@ -427,9 +477,20 @@ are provided with the package, primarily to serve as examples. The real goal
 of EventMachine is to enable programs to easily interface with other programs
 using TCP/IP, especially if custom protocols are required.'';
      };
-      name = ''eventmachine-1.0.1'';
+      name = ''eventmachine-1.0.3'';
      requiredGems = [  ];
-      sha256 = ''1v7im8v9y5jb863794irgnlqzdg669w6v1g89sln0l511gjnjv52'';
+      sha256 = ''09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil'';
+    };
+    eventmachine_tail_0_6_4 = {
+      basename = ''eventmachine_tail'';
+      meta = {
+        description = ''eventmachine tail - a file tail implementation with glob support'';
+        homepage = ''http://code.google.com/p/semicomplete/wiki/EventMachineTail'';
+        longDescription = ''Add file 'tail' implemented with EventMachine. Also includes a 'glob watch' class for watching a directory pattern for new matches, like /var/log/*.log'';
+      };
+      name = ''eventmachine-tail-0.6.4'';
+      requiredGems = [ g.eventmachine_1_0_3 ];
+      sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
    };
    fakes3_0_1_5 = {
      basename = ''fakes3'';
@ -441,6 +502,27 @@ using TCP/IP, especially if custom protocols are required.'';
      requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
      sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
    };
+    faraday_0_8_6 = {
+      basename = ''faraday'';
+      meta = {
+        description = ''HTTP/REST API client library.'';
+        homepage = ''https://github.com/lostisland/faraday'';
+      };
+      name = ''faraday-0.8.6'';
+      requiredGems = [ g.multipart_post_1_2_0 ];
+      sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
+    };
+    faraday_middleware_0_8_8 = {
+      basename = ''faraday_middleware'';
+      meta = {
+        description = ''Various middleware for Faraday'';
+        homepage = ''https://github.com/pengwynn/faraday_middleware'';
+        longDescription = ''Various middleware for Faraday'';
+      };
+      name = ''faraday_middleware-0.8.8'';
+      requiredGems = [ g.faraday_0_8_6 ];
+      sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
+    };
    ffi_1_4_0 = {
      basename = ''ffi'';
      meta = {
@ -452,16 +534,27 @@ using TCP/IP, especially if custom protocols are required.'';
      requiredGems = [  ];
      sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
    };
-    foreman_0_61_0 = {
+    file_tail_1_0_12 = {
+      basename = ''file_tail'';
+      meta = {
+        description = ''File::Tail for Ruby'';
+        homepage = ''http://github.com/flori/file-tail'';
+        longDescription = ''Library to tail files in Ruby'';
+      };
+      name = ''file-tail-1.0.12'';
+      requiredGems = [ g.tins_0_7_2 ];
+      sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
+    };
+    foreman_0_62_0 = {
      basename = ''foreman'';
      meta = {
        description = ''Process manager for applications with multiple components'';
        homepage = ''http://github.com/ddollar/foreman'';
        longDescription = ''Process manager for applications with multiple components'';
      };
-      name = ''foreman-0.61.0'';
+      name = ''foreman-0.62.0'';
      requiredGems = [ g.thor_0_17_0 ];
-      sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z'';
+      sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
    };
    highline_1_6_15 = {
      basename = ''highline'';
@ -688,6 +781,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
      requiredGems = [  ];
      sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
    };
+    multipart_post_1_2_0 = {
+      basename = ''multipart_post'';
+      meta = {
+        description = ''A multipart form post accessory for Net::HTTP.'';
+        homepage = ''https://github.com/nicksieger/multipart-post'';
+        longDescription = ''Use with Net::HTTP to do multipart form posts.  IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.'';
+      };
+      name = ''multipart-post-1.2.0'';
+      requiredGems = [  ];
+      sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
+    };
    net_sftp_2_0_5 = {
      basename = ''net_sftp'';
      meta = {
@ -747,6 +851,28 @@ enough of it.'';
      requiredGems = [  ];
      sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
    };
+    papertrail_0_9_7 = {
+      basename = ''papertrail'';
+      meta = {
+        description = ''Command-line client for Papertrail hosted log management service.'';
+        homepage = ''http://github.com/papertrail/papertrail-cli'';
+        longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
+      };
+      name = ''papertrail-0.9.7'';
+      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
+      sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
+    };
+    papertrail_cli_0_9_3 = {
+      basename = ''papertrail_cli'';
+      meta = {
+        description = ''Placeholder gem to point to new papertrail gem'';
+        homepage = ''http://github.com/papertrail/papertrail-cli-gem'';
+        longDescription = ''Placeholder gem to point to new papertrail gem.'';
+      };
+      name = ''papertrail-cli-0.9.3'';
+      requiredGems = [ g.papertrail_0_9_7 ];
+      sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
+    };
    parallel_0_6_2 = {
      basename = ''parallel'';
      meta = {
@ -818,16 +944,16 @@ Also see http://rack.github.com/.
      requiredGems = [ g.rack_1_5_2 ];
      sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
    };
-    rack_protection_1_4_0 = {
+    rack_protection_1_5_0 = {
      basename = ''rack_protection'';
      meta = {
        description = ''You should use protection!'';
        homepage = ''http://github.com/rkh/rack-protection'';
        longDescription = ''You should use protection!'';
      };
-      name = ''rack-protection-1.4.0'';
+      name = ''rack-protection-1.5.0'';
      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0dfydg04fzj9rz34npy6cpp0827lij440s7fls0db41lz4vb94k0'';
+      sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j'';
    };
    rack_ssl_1_3_3 = {
      basename = ''rack_ssl'';
@ -863,7 +989,7 @@ request helpers feature.'';
        longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
      };
      name = ''rails-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_1 ];
+      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
      sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
    };
    railties_3_2_12 = {
@ -946,6 +1072,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [ g.json_1_7_7 ];
      sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8'';
    };
+    remote_syslog_1_6_13 = {
+      basename = ''remote_syslog'';
+      meta = {
+        description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector'';
+        homepage = ''http://github.com/papertrail/remote_syslog'';
+        longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.'';
+      };
+      name = ''remote_syslog-1.6.13'';
+      requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
+      sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
+    };
    rjb_1_4_2 = {
      basename = ''rjb'';
      meta = {
@ -1042,7 +1179,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [  ];
      sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
    };
-    sass_3_2_6 = {
+    sass_3_2_7 = {
      basename = ''sass'';
      meta = {
        description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@ -1053,9 +1190,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
      command line tool or a web-framework plugin.
 '';
      };
-      name = ''sass-3.2.6'';
+      name = ''sass-3.2.7'';
      requiredGems = [  ];
-      sha256 = ''10xy6k663399r881cj30fapbdsrq8jwzvnp97y8n3mhxmrvzpq28'';
+      sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s'';
    };
    selenium_webdriver_2_31_0 = {
      basename = ''selenium_webdriver'';
@ -1068,6 +1205,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
      sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
    };
+    servolux_0_10_0 = {
+      basename = ''servolux'';
+      meta = {
+        description = ''* {Homepage}[http://rubygems.'';
+        homepage = ''http://gemcutter.org/gems/servolux'';
+        longDescription = ''Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
+process management, and for writing your own Ruby services. The code is well
+documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9
+interpreters.'';
+      };
+      name = ''servolux-0.10.0'';
+      requiredGems = [  ];
+      sha256 = ''08jdrk35f61ab8b48ffm85p9lgfpbnzq3n4is00gqhpcrrq72dhs'';
+    };
    sinatra_1_3_2 = {
      basename = ''sinatra'';
      meta = {
@ -1076,7 +1227,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
        longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
      };
      name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_4_0 g.tilt_1_3_4 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
      sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
    };
    sprockets_2_2_2 = {
@ -1087,9 +1238,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
        longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
      };
      name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_4 ];
+      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
      sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
    };
+    syslog_protocol_0_9_2 = {
+      basename = ''syslog_protocol'';
+      meta = {
+        description = ''Syslog protocol parser and generator'';
+        homepage = ''https://github.com/eric/syslog_protocol'';
+        longDescription = ''Syslog protocol parser and generator'';
+      };
+      name = ''syslog_protocol-0.9.2'';
+      requiredGems = [  ];
+      sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc'';
+    };
    systemu_2_5_2 = {
      basename = ''systemu'';
      meta = {
@ -1120,7 +1282,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
        longDescription = ''A thin and fast web server'';
      };
      name = ''thin-1.5.0'';
-      requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_1 g.daemons_1_1_9 ];
+      requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
      sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
    };
    thor_0_17_0 = {
@ -1134,16 +1296,27 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [  ];
      sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
    };
-    tilt_1_3_4 = {
+    tilt_1_3_5 = {
      basename = ''tilt'';
      meta = {
        description = ''Generic interface to multiple Ruby template engines'';
        homepage = ''http://github.com/rtomayko/tilt/'';
        longDescription = ''Generic interface to multiple Ruby template engines'';
      };
-      name = ''tilt-1.3.4'';
+      name = ''tilt-1.3.5'';
      requiredGems = [  ];
-      sha256 = ''0hw59shnf3vgpx1jv24mj0d48m72h5cm1d4bianhhkjj82mc406a'';
+      sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
+    };
+    tins_0_7_2 = {
+      basename = ''tins'';
+      meta = {
+        description = ''Useful stuff.'';
+        homepage = ''http://flori.github.com/tins'';
+        longDescription = ''All the stuff that isn't good/big enough for a real library.'';
+      };
+      name = ''tins-0.7.2'';
+      requiredGems = [  ];
+      sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90'';
    };
    treetop_1_4_12 = {
      basename = ''treetop'';
@ -1155,16 +1328,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
      sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
    };
-    tzinfo_0_3_36 = {
+    tzinfo_0_3_37 = {
      basename = ''tzinfo'';
      meta = {
        description = ''Daylight-savings aware timezone library'';
        homepage = ''http://tzinfo.rubyforge.org/'';
        longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
      };
-      name = ''tzinfo-0.3.36'';
+      name = ''tzinfo-0.3.37'';
      requiredGems = [  ];
-      sha256 = ''1dk7jnhrr5lbhckgq7bh6yxgy8j7vd13qb4kr4vlk76j5ngs2whv'';
+      sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc'';
    };
    uuid_2_3_7 = {
      basename = ''uuid'';
@ -1212,5 +1385,15 @@ See RDoc for a description of RDoc's markup and basic use.'';
      requiredGems = [  ];
      sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i'';
    };
+    yajl_ruby_1_1_0 = {
+      basename = ''yajl_ruby'';
+      meta = {
+        description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
+        homepage = ''http://github.com/brianmario/yajl-ruby'';
+      };
+      name = ''yajl-ruby-1.1.0'';
+      requiredGems = [  ];
+      sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m'';
+    };
  };
 }
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@ -1,5 +1,5 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk }:
+, zlib, libuuid, gems, jdk, python }:

 let

@ -14,6 +14,8 @@ in

 {
  sup = { buildInputs = [ gems.ncursesw ]; };
+
+  libv8 = { buildInputs = [ python ]; };
  
  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
  
--- a/pkgs/development/libraries/boost/1.53.nix
+++ b/pkgs/development/libraries/boost/1.53.nix
@ -28,7 +28,7 @@ let
  layout = if taggedLayout then "tagged" else "system";

  cflags = if enablePIC && enableExceptions then
-             "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+             "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
           else if enablePIC then
             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
           else if enableExceptions then
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@ -1,14 +1,17 @@
-{stdenv, fetchurl, unzip, cmake}:
+{ stdenv, fetchurl, cmake, mesa, freeglut }:

-stdenv.mkDerivation {
-  name = "bullet-2.78";
+stdenv.mkDerivation rec {
+  name = "bullet-2.80"; # vdrift 2012-07-22 doesn't build with 2.81
+  rev = "2531";
  src = fetchurl {
-    url = "http://bullet.googlecode.com/files/bullet-2.78.zip";
-    sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k";
+    url = "http://bullet.googlecode.com/files/${name}-rev${rev}.tgz";
+    sha256 = "0dig6k88jz5y0cz6dn186vc4l96l4v56zvwpsp5bv9f5wdwjskj6";
  };
-  buildInputs = [ unzip cmake ];
+
+  buildInputs = [ cmake mesa freeglut ];
  configurePhase = ''
-    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF .
+    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF \
+      -DCMAKE_INSTALL_PREFIX=$out .
  '';

  meta = {
@ -19,6 +22,6 @@ stdenv.mkDerivation {
    '';
    homepage = http://code.google.com/p/bullet/;
    license = stdenv.lib.licenses.zlib;
-    maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ];
+    maintainers = with stdenv.lib.maintainers; [ aforemny ];
  };
 }
--- a/pkgs/development/libraries/cairo/1.12.2.nix
+++ b/pkgs/development/libraries/cairo/1.12.2.nix
@ -0,0 +1,85 @@
+{ postscriptSupport ? true
+, pdfSupport ? true
+, pngSupport ? true
+, xcbSupport ? false
+, gobjectSupport ? true, glib
+, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
+, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
+, gettext, libiconvOrEmpty
+}:
+
+assert postscriptSupport -> zlib != null;
+assert pngSupport -> libpng != null;
+assert xcbSupport -> libxcb != null && xcbutil != null;
+
+stdenv.mkDerivation rec {
+  name = "cairo-1.12.2";
+
+  src = fetchurl {
+    url = "http://cairographics.org/releases/${name}.tar.xz";
+    sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9";
+  };
+
+  buildInputs =
+    [ pkgconfig x11 fontconfig xlibs.libXrender ]
+    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
+
+    # On non-GNU systems we need GNU Gettext for libintl.
+    ++ stdenv.lib.optional (!stdenv.isLinux) gettext
+
+    ++ libiconvOrEmpty;
+
+  propagatedBuildInputs =
+    [ freetype pixman ] ++
+    stdenv.lib.optional gobjectSupport glib ++
+    stdenv.lib.optional postscriptSupport zlib ++
+    stdenv.lib.optional pngSupport libpng;
+
+  configureFlags =
+    [ "--enable-tee" ]
+    ++ stdenv.lib.optional xcbSupport "--enable-xcb"
+    ++ stdenv.lib.optional pdfSupport "--enable-pdf";
+
+  preConfigure = ''
+    # Work around broken `Requires.private' that prevents Freetype
+    # `-I' flags to be propagated.
+    sed -i "src/cairo.pc.in" \
+        -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
+  ''
+
+  # On FreeBSD, `-ldl' doesn't exist.
+  + (stdenv.lib.optionalString stdenv.isFreeBSD
+       '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
+          do
+            cat "$i" | sed -es/-ldl//g > t
+            mv t "$i"
+          done
+       '');
+
+  enableParallelBuilding = true;
+
+  # The default `--disable-gtk-doc' is ignored.
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "A 2D graphics library with support for multiple output devices";
+
+    longDescription = ''
+      Cairo is a 2D graphics library with support for multiple output
+      devices.  Currently supported output targets include the X
+      Window System, Quartz, Win32, image buffers, PostScript, PDF,
+      and SVG file output.  Experimental backends include OpenGL
+      (through glitz), XCB, BeOS, OS/2, and DirectFB.
+
+      Cairo is designed to produce consistent output on all output
+      media while taking advantage of display hardware acceleration
+      when available (e.g., through the X Render Extension).
+    '';
+
+    homepage = http://cairographics.org/;
+
+    licenses = [ "LGPLv2+" "MPLv1" ];
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ pkgconfig x11 fontconfig xlibs.libXrender ]
+    [ pkgconfig x11 fontconfig ] 
+    ++ stdenv.lib.optional (!stdenv.isDarwin) xlibs.libXrender
    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]

    # On non-GNU systems we need GNU Gettext for libintl.
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@ -1,22 +1,25 @@
 { stdenv, fetchurl, openssl, db4, gettext, pam }:

 stdenv.mkDerivation rec {
-  name = "cyrus-sasl-2.1.25";
+  name = "cyrus-sasl-2.1.26";

  src = fetchurl {
-    url = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${name}.tar.gz";
-    sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe";
+    url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
+    sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
  };

  buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;

+  patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
+  patchFlags = "-p0";
+
  # Set this variable at build-time to make sure $out can be evaluated.
  preConfigure = ''
    configureFlagsArray=( --with-plugindir=$out/lib/sasl2
                          --with-configdir=$out/lib/sasl2
-			  --with-saslauthd=/run/saslauthd
-			  --enable-login
-			)
+                          --with-saslauthd=/run/saslauthd
+                          --enable-login
+                        )
  '';

  meta = {
--- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
+++ b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
@ -0,0 +1,13 @@
+Gentoo bug #458790
+--- include/sasl.h	2012-10-12 17:05:48.000000000 +0300
+++ include/sasl.h	2013-02-23 16:56:44.648786268 +0200
+@@ -121,6 +121,9 @@
+ #ifndef SASL_H
+ #define SASL_H 1
+ 
+/* stddef.h to get size_t defined */
+#include <stddef.h>
+
+ /* Keep in sync with win32/common.mak */
+ #define SASL_VERSION_MAJOR 2
+ #define SASL_VERSION_MINOR 1
--- a/pkgs/development/libraries/ffmpeg/1.1.nix
+++ b/pkgs/development/libraries/ffmpeg/1.1.nix
@ -25,7 +25,7 @@ assert faacSupport -> faac != null;
 assert x11grabSupport -> libXext != null && libXfixes != null;

 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.1";
+  name = "ffmpeg-1.1.3";
  
  src = fetchurl {
    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
--- a/pkgs/development/libraries/gamin/deadlock.patch
+++ b/pkgs/development/libraries/gamin/deadlock.patch
@ -0,0 +1,68 @@
+Fix for a deadlock:
+https://bugzilla.gnome.org/show_bug.cgi?id=667230
+
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+---
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
+++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
+ * inotify_lock must be held when calling.
+  */
+-gboolean
+static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
+++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
+ 					 found_callback_t fcb);
+ gboolean	 ih_running		(void);
+ gboolean	 ih_sub_add		(ih_sub_t *sub);
+-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+-- 
+1.7.7.2
+
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@ -16,5 +16,5 @@ stdenv.mkDerivation rec {
  # <sys/socket.h> with Glibc 2.9.
  configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";

-  patches = map fetchurl (import ./debian-patches.nix);
+  patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix);
 }
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@ -143,7 +143,9 @@ stdenv.mkDerivation ({

    configureScript="`pwd`/../$sourceRoot/configure"

-    makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"
+    ${stdenv.lib.optionalString (stdenv.gcc.libc != null)
+      ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"''
+    }

    ${preConfigure}
  '';
--- a/pkgs/development/libraries/glibc/2.17/info.nix
+++ b/pkgs/development/libraries/glibc/2.17/info.nix
@ -19,7 +19,7 @@ build null {
  # libc.info hasn't a Top node.
  installPhase = ''
    mkdir -p "$out/share/info"
-    cp -v "../$sourceRoot/manual/"*.info* "$out/share/info"
+    cp -v "manual/"*.info* "$out/share/info"
  '';

  meta.description = "GNU Info manual of the GNU C Library";
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "NumInstances";
-  version = "1.0";
-  sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
+  version = "1.2";
+  sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59";
  meta = {
    description = "Instances of numeric classes for functions and tuples";
    license = self.stdenv.lib.licenses.bsd3;
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "blaze-html";
-  version = "0.6.1.0";
-  sha256 = "1y2z2md62kpl57qcvwvswmrjq7zhkqwfv8zr2acdvcxcxnyc47fm";
+  version = "0.6.1.1";
+  sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc";
  buildDepends = [ blazeBuilder blazeMarkup text ];
  testDepends = [
    blazeBuilder blazeMarkup HUnit QuickCheck testFramework
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "blaze-markup";
-  version = "0.5.1.4";
-  sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr";
+  version = "0.5.1.5";
+  sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74";
  buildDepends = [ blazeBuilder text ];
  testDepends = [
    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "citeproc-hs";
-  version = "0.3.7";
-  sha256 = "0ix9y7z8m8x4l10h96fgv820grywvwcp3019wxjja4y4w6irid3b";
+  version = "0.3.8";
+  sha256 = "0wlfwjxg852qcgx54m99xm7hxsmcw8c8r7fyrsxyxl3054xnfwz8";
  buildDepends = [
    filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
    syb time utf8String
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "conduit";
-  version = "1.0.2";
-  sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f";
+  version = "1.0.3";
+  sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
  buildDepends = [
    liftedBase monadControl resourcet text transformers
    transformersBase void
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@ -0,0 +1,15 @@
+{ cabal, newtype }:
+
+cabal.mkDerivation (self: {
+  pname = "constraints";
+  version = "0.3.2";
+  sha256 = "1fmjl6dh2iswvmq8r3izplp6zg9m8yq1c4rj0zpqjbv2iqsi4kl1";
+  buildDepends = [ newtype ];
+  meta = {
+    homepage = "http://github.com/ekmett/constraints/";
+    description = "Constraint manipulation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "distributive";
-  version = "0.3";
-  sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f";
+  version = "0.3.1";
+  sha256 = "0zf3wq1xz9sbb0g6fg852jckrwkffsfkghq3zx03d2q9ginc6jbc";
  buildDepends = [ transformers transformersCompat ];
  testDepends = [ doctest filepath ];
  meta = {
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@ -13,8 +13,8 @@ cabal.mkDerivation (self: {
    baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
    silently stringbuilder syb transformers
  ];
-  doCheck = false;
  jailbreak = true;
+  doCheck = false;
  meta = {
    homepage = "https://github.com/sol/doctest-haskell#readme";
    description = "Test interactive Haskell examples";
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "ghc-mod";
-  version = "1.12.1";
-  sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r";
+  version = "1.12.2";
+  sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "gitit";
-  version = "0.10.2";
-  sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx";
+  version = "0.10.3";
+  sha256 = "1hz4ddym2vn01nd22gb995dya48fzc7nsmsqywdc8hjczmn93qyg";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
    safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
    zlib
  ];
-  jailbreak = true;
  meta = {
    homepage = "http://gitit.net";
    description = "Wiki using happstack, git or darcs, and pandoc";
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "hakyll";
-  version = "4.2.1.0";
-  sha256 = "05w5j8wc47j8g4x2lsm0zs3aspb4rjvgnrxbjlxps0mfz3csqfhh";
+  version = "4.2.1.2";
+  sha256 = "0b2jmi9hi5l72lkyjn2w3gwn52zvnvv7c10x5329hp000gzmwbvi";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@ -19,8 +19,8 @@ cabal.mkDerivation (self: {
  testDepends = [
    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
    filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec
-    QuickCheck random regexBase regexTdfa tagsoup testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text time
+    QuickCheck random regexBase regexTdfa snapCore snapServer tagsoup
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 text time
  ];
  doCheck = false;
  meta = {
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "haskell-src-meta";
-  version = "0.6.0.1";
-  sha256 = "181xjajvppipzgknmbhbb1i2r8rimbr5vzn6gf1ksddgw12sargd";
+  version = "0.6.0.2";
+  sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
  buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
  meta = {
    description = "Parse source to template-haskell abstract syntax";
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hint";
-  version = "0.3.3.5";
-  sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
+  version = "0.3.3.6";
+  sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can";
  buildDepends = [
    extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
    MonadCatchIOMtl mtl random utf8String
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@ -9,8 +9,8 @@

 cabal.mkDerivation (self: {
  pname = "http-conduit";
-  version = "1.9.1";
-  sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial";
+  version = "1.9.2.1";
+  sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
  buildDepends = [
    asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
    caseInsensitive certificate conduit cookie cprngAes dataDefault
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "liblastfm";
-  version = "0.1.0.0";
-  sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
+  version = "0.1.1.0";
+  sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
  buildDepends = [
    aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
  ];
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "monad-logger";
-  version = "0.3.0.1";
-  sha256 = "05pwccs2f5qn22cwvzaiw6bflyxl3avrl89y737rjcsw6755r5sr";
+  version = "0.3.1.1";
+  sha256 = "11qqmflcydjfm5py7rkbi9qd0mkhw4kxzxff95wf0jmaia9knvx6";
  buildDepends = [
    conduit fastLogger monadControl mtl resourcet text transformers
    transformersBase
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@ -2,14 +2,13 @@

 cabal.mkDerivation (self: {
  pname = "numbers";
-  version = "3000.1.0.1";
-  sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
+  version = "3000.1.0.3";
+  sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz";
  testDepends = [
    QuickCheck testFramework testFrameworkQuickcheck2
  ];
-  doCheck = false;
  meta = {
-    homepage = "https://github.com/DanBurton/numbers";
+    homepage = "https://github.com/DanBurton/numbers#readme";
    description = "Various number types";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@ -1,13 +1,15 @@
-{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
-, dataDefault, extensibleExceptions, filepath, highlightingKate
-, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
-, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib
+{ cabal, ansiTerminal, base64Bytestring, blazeHtml, blazeMarkup
+, citeprocHs, dataDefault, Diff, extensibleExceptions, filepath
+, highlightingKate, HTTP, HUnit, json, mtl, network, pandocTypes
+, parsec, QuickCheck, random, syb, tagsoup, temporary
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, texmath, text, time, xml, zipArchive, zlib
 }:

 cabal.mkDerivation (self: {
  pname = "pandoc";
-  version = "1.10.1";
-  sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y";
+  version = "1.11";
+  sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@ -16,10 +18,13 @@ cabal.mkDerivation (self: {
    network pandocTypes parsec random syb tagsoup temporary texmath
    text time xml zipArchive zlib
  ];
+  testDepends = [
+    ansiTerminal Diff filepath highlightingKate HUnit pandocTypes
+    QuickCheck syb testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text
+  ];
  configureFlags = "-fblaze_html_0_5";
-  patchPhase = ''
-    sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal
-  '';
+  patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal";
  doCheck = false;
  meta = {
    homepage = "http://johnmacfarlane.net/pandoc";
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "persistent-template";
-  version = "1.1.2.4";
-  sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9";
+  version = "1.1.2.5";
+  sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
  buildDepends = [ aeson monadControl persistent text transformers ];
  testDepends = [ aeson hspec persistent QuickCheck text ];
  meta = {
--- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "publicsuffixlist";
-  version = "0.0.3";
-  sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci";
+  version = "0.0.4";
+  sha256 = "0qwx2739pmmjfy6w3iri1fgyin3295vzn6rvazh34qd89i5vi3pb";
  buildDepends = [ cereal dataDefault text utf8String ];
  testDepends = [ cereal dataDefault HUnit idna text utf8String ];
  meta = {
--- a/pkgs/development/libraries/haskell/punycode/default.nix
+++ b/pkgs/development/libraries/haskell/punycode/default.nix
@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
  sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
  buildDepends = [ cereal mtl text ];
  testDepends = [ cereal encoding HUnit mtl QuickCheck text ];
+  doCheck = false;
  meta = {
    homepage = "https://github.com/litherum/punycode";
    description = "Encode unicode strings to ascii forms according to RFC 3492";
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@ -0,0 +1,21 @@
+{ cabal, binary, deepseq, filepath, hashable, random, time
+, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "shake";
+  version = "0.9.1";
+  sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary deepseq filepath hashable random time transformers
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "http://community.haskell.org/~ndm/shake/";
+    description = "Build system library, like Make, but more accurate dependencies";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "smallcheck";
-  version = "1.0.1";
-  sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk";
+  version = "1.0.2";
+  sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi";
  buildDepends = [ logict mtl ];
  meta = {
    homepage = "https://github.com/feuerbach/smallcheck";
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "stylish-haskell";
-  version = "0.5.6.0";
-  sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb";
+  version = "0.5.6.1";
+  sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "threads";
-  version = "0.5.0.1";
-  sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy";
+  version = "0.5.0.2";
+  sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm";
  buildDepends = [ baseUnicodeSymbols stm ];
  testDepends = [
    baseUnicodeSymbols concurrentExtra HUnit stm testFramework
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "void";
-  version = "0.5.11";
-  sha256 = "0fi8ccnhg0ckz5v3cgxhdd67p0v3g9yawin917ik4vxfbwz5j3v6";
+  version = "0.5.12";
+  sha256 = "03fqcap94saj7mx3y4pvvfj4z8dy6rsk2kvhgbnk2wvz5xm7xvci";
  buildDepends = [ semigroups ];
  meta = {
    homepage = "http://github.com/ekmett/void";
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "wai-extra";
-  version = "1.3.2.4";
-  sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9";
+  version = "1.3.3.1";
+  sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9";
  buildDepends = [
    ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
    conduit dataDefault dateCache fastLogger httpTypes network
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
@ -1,10 +1,10 @@
-{ cabal, nats, semigroupoids, semigroups, utf8String }:
+{ cabal, nats, semigroupoids, semigroups, text, utf8String }:

 cabal.mkDerivation (self: {
  pname = "wl-pprint-extras";
-  version = "3.3";
-  sha256 = "1q3wiw62k53yl9ny9l54b281zprrnshw94pd52rlcxbw9cgj8xzx";
-  buildDepends = [ nats semigroupoids semigroups utf8String ];
+  version = "3.4";
+  sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy";
+  buildDepends = [ nats semigroupoids semigroups text utf8String ];
  meta = {
    homepage = "http://github.com/ekmett/wl-pprint-extras/";
    description = "A free monad based on the Wadler/Leijen pretty printer";
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@ -1,12 +1,13 @@
-{ cabal, nats, semigroups, terminfo, transformers, wlPprintExtras
+{ cabal, nats, semigroups, terminfo, text, transformers
+, wlPprintExtras
 }:

 cabal.mkDerivation (self: {
  pname = "wl-pprint-terminfo";
-  version = "3.4";
-  sha256 = "1wnlm74fwcn171a533bv15bvlhabrzh192wabala0wyvwgl8hwzk";
+  version = "3.6";
+  sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg";
  buildDepends = [
-    nats semigroups terminfo transformers wlPprintExtras
+    nats semigroups terminfo text transformers wlPprintExtras
  ];
  meta = {
    homepage = "http://github.com/ekmett/wl-pprint-terminfo/";
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@ -1,16 +1,17 @@
-{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, safe
-, shakespeareJs, text, transformers, vector, wai, waiExtra
-, yesodCore, yesodRoutes
+{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec
+, safe, shakespeareJs, text, transformers, vector, wai, waiExtra
+, waiTest, yesodCore, yesodRoutes
 }:

 cabal.mkDerivation (self: {
  pname = "yesod-json";
-  version = "1.1.2.1";
-  sha256 = "0vrhn3v26q7cqwds99hqyibq09vyxnviqzgyn7w5ldnl3ycg7dqd";
+  version = "1.1.2.2";
+  sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g";
  buildDepends = [
    aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
    text transformers vector wai waiExtra yesodCore yesodRoutes
  ];
+  testDepends = [ hspec text waiTest yesodCore ];
  meta = {
    homepage = "http://www.yesodweb.com/";
    description = "Generate content for Yesod using the aeson package";
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "yst";
-  version = "0.3.1";
-  sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig";
+  version = "0.3.1.1";
+  sha256 = "1wc2s5aan4rqdrpqgqvka5pqm3d691si5hdf0m0wpi2hzkwl3qv3";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@ -1,13 +1,13 @@
-{ stdenv, fetchurl }: 
+{ stdenv, fetchurl }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "jbig2dec-0.11";
-  
+
  src = fetchurl {
-    url = http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz;
-    sha256 = "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby";
+    url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
+    sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
  };
-  
+
  meta = {
    homepage = http://jbig2dec.sourceforge.net/;
    description = "Decoder implementation of the JBIG2 image compression format";
--- a/pkgs/development/libraries/libee/default.nix
+++ b/pkgs/development/libraries/libee/default.nix
@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libestr }:
+stdenv.mkDerivation {
+  name = "libee-0.4.1";
+
+  src = fetchurl {
+    url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz;
+    md5 = "7bbf4160876c12db6193c06e2badedb2";
+  };
+
+  buildInputs = [pkgconfig libestr];
+
+  meta = {
+    homepage = "http://www.libee.org/";
+    description = "An Event Expression Library inspired by CEE";
+  };
+}
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@ -0,0 +1,8 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation {
+  name = "libestr-0.1.4";
+  src = fetchurl {
+    url = http://libestr.adiscon.com/files/download/libestr-0.1.4.tar.gz;
+    sha256 = "1qw5vqryawdm434l9ql3r160ap2f5mmp7b6pciac7qli62y0a2z3";
+  };
+}
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@ -1,17 +1,34 @@
-{ stdenv, fetchurl, pkgconfig, dbus, dbus_glib, gtk, glib }:
- 
+{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, glib, gdk_pixbuf }:
+
 stdenv.mkDerivation rec {
-  name = "libnotify-0.4.5";
+  ver_maj = "0.7";
+  ver_min = "5";
+  name = "libnotify-${ver_maj}.${ver_min}";

  src = fetchurl {
-    url = "http://www.galago-project.org/files/releases/source/libnotify/${name}.tar.gz";
-    sha256 = "1ndh7wpm9qh12vm5avjrq2xv1j681j9qq6j2fyj6a2shl67dp687";
+    url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
+    sha256 = "0lmnzy16vdjs9vlgdm0b7wfyi1nh526hv2dpb7vxb92bhx3wny23";
+  };
+  src_m4 = fetchurl {
+    url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2";
+    sha256 = "1cnqh7aaji648nfd5537v7xaak8hgww3bpifhwam7bl0sc3ad523";
  };

-  buildInputs = [ pkgconfig dbus.libs dbus_glib gtk glib ];
+  # see Gentoo ebuild - we don't need to depend on gtk+(2/3)
+  preConfigure = ''
+    cd m4
+    tar xvf ${src_m4}
+    cd ..
+
+    sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+    sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
+    AT_M4DIR=. autoreconf
+  '';
+
+  buildInputs = [ pkgconfig automake autoconf glib gdk_pixbuf ];

  meta = {
-    homepage = http://galago-project.org/;
+    homepage = http://galago-project.org/; # very obsolete but found no better
    description = "A library that sends desktop notifications to a notification daemon";
  };
 }
--- a/pkgs/development/libraries/opencascade/oce.nix
+++ b/pkgs/development/libraries/opencascade/oce.nix
@ -0,0 +1,26 @@
+{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4,
+ftgl, freetype}:
+
+stdenv.mkDerivation rec {
+  name = "opencascade-oce-0.13-dev";
+  src = fetchurl {
+    url = https://api.github.com/repos/tpaviot/oce/tarball/bd77743bfa0e765c3a57d116a62d75b50e1a455;
+    name = "${name}.tar.gz";
+    sha256 = "1w7z326la9427yb23hbalsksk6w4ma5xil4jscnvi8mk6g48wyxv";
+  };
+
+  buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
+    homepage = http://www.opencascade.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/pango/1.30.x.nix
+++ b/pkgs/development/libraries/pango/1.30.x.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }:

 stdenv.mkDerivation rec {
  name = "pango-1.30.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
  };

-  buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];

  nativeBuildInputs = [ pkgconfig ];

--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@ -20,6 +20,10 @@ in stdenv.mkDerivation {
  
  buildInputs = [ unzip ];
  buildPhase = ''
+    # use STL (xbmc requires it)
+    sed '1i#define TIXML_USE_STL 1' -i tinyxml.h
+    sed '1i#define TIXML_USE_STL 1' -i xmltest.cpp
+
    # build xmltest
    make
    
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@ -39,6 +39,6 @@ stdenv.mkDerivation {
    mv bin/*-${if release then "release" else "debug"}.apk $out
    
    mkdir -p $out/nix-support
-    echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
+    echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
  '';
 }
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@ -1,7 +1,9 @@
-{ nixpkgs ? <nixpkgs> }:
+{ nixpkgs ? <nixpkgs>
+, system ? builtins.currentSystem
+}:

 let
-  pkgs = import nixpkgs {};
+  pkgs = import nixpkgs { inherit system; };
  pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
 in
 rec {
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@ -1,6 +1,7 @@
 {stdenv, xcodewrapper}:
 { name
 , src
+, sdkVersion ? "6.1"
 , target ? null
 , configuration ? null
 , scheme ? null
@ -36,7 +37,7 @@ let

  _sdk = if sdk == null
    then
-      if release then "iphoneos6.0" else "iphonesimulator6.0"
+      if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion
    else sdk;

  # The following is to prevent repetition
@ -79,6 +80,10 @@ stdenv.mkDerivation {
      ${stdenv.lib.optionalString generateIPA ''
        # Produce an IPA file
        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
+        
+        # Add IPA to Hydra build products
+        mkdir -p $out/nix-support
+        echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
      ''}
      
      # Delete our temp keychain
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@ -1,8 +1,5 @@
-{stdenv}:
+{stdenv, version ? "4.6"}:

-let
-  version = "4.5.2";
-in
 stdenv.mkDerivation {
  name = "xcode-wrapper-"+version;
  buildCommand = ''
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@ -1,16 +1,22 @@
-{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib }:
+{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools }:

 stdenv.mkDerivation rec {
-  name = "dbus-python-0.84.0";
+  name = "dbus-python-1.1.1";

  src = fetchurl {
    url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
-    sha256 = "01jrmj7ps79dkd6f8bzm17vxzpad1ixwmcb1liy64xm9y6mcfnxq";
+    sha256 = "122yj5y0mndk9axh735qvwwckck6s6x0q84dw6p97mplp17wl5w9";
  };

-  buildInputs = [ python pkgconfig dbus dbus_glib ];
+  postPatch = "patchShebangs .";
+
+  buildInputs = [ python pkgconfig dbus dbus_glib ]
+    ++ stdenv.lib.optional doCheck dbus_tools;
+
+  doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140

  meta = {
    description = "Python DBus bindings";
+    license = "MIT";
  };
 }
--- a/pkgs/development/python-modules/pycrypto/2.5.nix
+++ b/pkgs/development/python-modules/pycrypto/2.5.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+
+buildPythonPackage rec {
+  name = "pycrypto-2.5";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
+    md5 = "783e45d4a1a309e03ab378b00f97b291";
+  };
+
+  buildInputs = [ python gmp ];
+
+  buildPhase =
+    ''
+      python ./setup.py build_ext --library-dirs=${gmp}/lib
+    '';
+
+#  installPhase =
+#    ''
+#      python ./setup.py install --prefix=$out
+#    '';
+
+  meta = {
+    homepage = "http://www.pycrypto.org/";
+    description = "Python Cryptography Toolkit";
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib }:

 stdenv.mkDerivation rec {
-  name = "pygobject-2.27.0";
+  name = "pygobject-2.28.6";
  
  src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2";
-    sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/${name}.tar.xz";
+    sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
  };

  configureFlags = "--disable-introspection";
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@ -42,7 +42,7 @@ cmakeConfigurePhase() {

    echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"

-    cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
+    cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"

    eval "$postConfigure"
 }
--- a/pkgs/development/tools/misc/texinfo/5.1.nix
+++ b/pkgs/development/tools/misc/texinfo/5.1.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, perl }:

 stdenv.mkDerivation rec {
-  name = "texinfo-5.0";
+  name = "texinfo-5.1";

  src = fetchurl {
    url = "mirror://gnu/texinfo/${name}.tar.xz";
-    sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla";
+    sha256 = "0864v5i488x3mb3v5p6nhy2kw0mqkzpa3b0453iibj81zlpq078q";
  };

  buildInputs = [ ncurses perl ];
--- a/pkgs/development/tools/parsing/alex/3.0.5.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.5.nix
@ -1,14 +1,14 @@
-{ cabal, perl, QuickCheck }:
+{ cabal, fetchurl, perl, QuickCheck }:

 cabal.mkDerivation (self: {
  pname = "alex";
-  version = "3.0.4";
-  sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d";
+  version = "3.0.5";
+  sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [ QuickCheck ];
  buildTools = [ perl ];
-  doCheck = false;
+  patches = [ (fetchurl { url="https://github.com/simonmar/alex/pull/21.patch"; sha256="0apv3rk00gwkf5rqw3467bg6pnamr07zdksbp9khhzzi73k9aq4f"; }) ];
  meta = {
    homepage = "http://www.haskell.org/alex/";
    description = "Alex is a tool for generating lexical analysers in Haskell";
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@ -12,26 +12,36 @@ stdenv.mkDerivation rec {
  configureFlags = [
    "--openssl-includes=${openssl}/include"
    "--openssl-libpath=${openssl}/lib"
+  ]
+  ++ (if !stdenv.isDarwin then [ # Shared V8 is broken on Mac OS X. Who can fix V8 on Darwin makes me very happy, but I gave up studying python-gyp.
    "--shared-v8"
    "--shared-v8-includes=${v8}/includes"
    "--shared-v8-libpath=${v8}/lib"
-  ];
+  ] else []);

  #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;

+  # Expose the host compiler on darwin, which is the only compiler capable of building it
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    export OLDPATH=$PATH
+    export PATH=/usr/bin:$PATH
+  '';
+
  prePatch = ''
    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
  '';

-  postInstall = ''
-
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    export PATH=$OLDPATH
+  '' + ''
    sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' /*+ stdenv.lib.optionalString stdenv.isDarwin ''
    install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
-  '';
+  ''*/;

-  buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux;
-  
+  buildInputs = [ python openssl zlib ]
+    ++ stdenv.lib.optional stdenv.isLinux utillinux
+    ++ stdenv.lib.optional (!stdenv.isDarwin) v8;
  setupHook = ./setup-hook.sh;

  meta = with stdenv.lib; {
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@ -2,13 +2,21 @@
  asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }:

 stdenv.mkDerivation rec {
-  name = "vdrift-2011-10-22";
+  version = "2012-07-22";
+  name = "vdrift-${version}";
+  patch = "c"; # see https://github.com/VDrift/vdrift/issues/110

  src = fetchurl {
    url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
-    sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s";
+    sha256 = "1yqkc7y4s4g5ylw501bf0c03la7kfddjdk4yyi1xkcwy3pmgw2al";
  };

+  patches = fetchurl {
+    url = "mirror://sourceforge/vdrift/${name}${patch}_patch.diff";
+    sha256 = "08mfg4xxkzyp6602cgqyjzc3rn0zsaa3ddjkpd44b83drv19lriy";
+  };
+  patchFlags = "-p0";
+
  buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
    SDL_gfx pkgconfig bullet curl libarchive ];

--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
    substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
    mv defconfig .config
    echo CONFIG_LIBNL32=y | tee -a .config
+    echo CONFIG_IEEE80211N=y | tee -a .config
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
  '';
  preInstall = "mkdir -p $out/bin";
@ -27,4 +28,4 @@ stdenv.mkDerivation rec {
    maintainers = [ maintainers.phreedom ];
    platforms = platforms.linux;
  };
-}
+}
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@ -1724,9 +1724,8 @@ let
      url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
      sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
    };
-    CFLAGS = "-I${pixman}/include/pixman-1";
-    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
    
  xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
    name = "xf86-video-voodoo-1.2.4";
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@ -192,6 +192,11 @@ in
    buildInputs = attrs.buildInputs ++ [xorg.pixman];
  };

+  xf86videovmware = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+    buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa];
+  };
+
  xdriinfo = attrs: attrs // {
    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
  };
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@ -0,0 +1,18 @@
+{ stdenv, fetchurl, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "xchainkeys-0.11";
+
+  src = fetchurl {
+    url = "https://xchainkeys.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
+  };
+
+  buildInputs = [ libX11 ];
+
+  meta = {
+    homepage = "https://code.google.com/p/xchainkeys/";
+    description = "A standalone X11 program to create chained key bindings";
+    license = "GPLv3";
+  };
+}
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@ -0,0 +1,51 @@
+{stdenv, fetchurl, unzip}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="zpaq";
+    version="622";
+    name="${baseName}-${version}";
+    hash="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc";
+    url="http://mattmahoney.net/dc/zpaq622.zip";
+    sha256="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc";
+  };
+  buildInputs = [
+    unzip
+  ];
+  isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD;
+  isx86 = stdenv.isi686 || stdenv.isx86_64;
+  compileFlags = ""
+    + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
+    + (stdenv.lib.optionalString (!isx86) " -DNOJIT ")
+    + " -DNDEBUG "
+    + " -fPIC "
+    ;
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  sourceRoot = ".";
+  buildPhase = ''
+    g++ -shared -O3 libzpaq.cpp divsufsort.c ${compileFlags} -o libzpaq.so
+    g++ -O3 -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
+    g++ -O3 -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
+  '';
+  installPhase = ''
+    mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
+    cp libzpaq.so "$out/lib"
+    cp zpaq zpaqd "$out/bin"
+    cp libzpaq.h divsufsort.h "$out/include"
+    cp readme.txt "$out/share/doc/zpaq"
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''An archiver with backward compatibility of versions for decompression'';
+    license = stdenv.lib.licenses.gpl3Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://mattmahoney.net/dc/zpaq.html";
+  };
+}
--- a/pkgs/tools/archivers/zpaq/default.upstream
+++ b/pkgs/tools/archivers/zpaq/default.upstream
@ -0,0 +1,3 @@
+url http://mattmahoney.net/dc/zpaq.html
+version_link "/zpaq[0-9]+[.]zip"
+version "[^0-9]*([0-9]+)[^0-9]*" '\1'
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@ -1,26 +1,20 @@
 {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:

-let
-  md5fix = fetchurl {
-    url = "https://github.com/ckolivas/lrzip/commit/9430b6ff4a58adb69ef4cf74f1245fd5b3b313dd.patch";
-    sha256 = "084x4wi3mamcxphzwf43iw287v1ylrk0xjghg6b5k6vgm9gkqlx8";
-  };
-in
 stdenv.mkDerivation rec {
-  name = "lrzip-0.612";
+  version = "0.614";
+  name = "lrzip-${version}";

  src = fetchurl {
    url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
-    sha256 = "15rfqpc4xj7wbv117mr2g9npxnrlmqqj97mhxqfpy8360ys9yc1c";
+    sha256 = "16i6mz2z6gx8xiva7zb0j78yvkwq1bjbdkl7w3i10195ll097ad8";
  };

  buildInputs = [ zlib lzo bzip2 nasm perl ];

-  patches = [ md5fix ];
-
  meta = {
    homepage = http://ck.kolivas.org/apps/lrzip/;
    description = "The CK LRZIP compression program (LZMA + RZIP)";
    license = "GPLv2+";
+    inherit version;
  };
 }
--- a/Show More
+++ b/Show More