Merge changes from branch 'master' into stdenv-updates.

Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00 · 2013-04-19 11:48:11 +02:00 · 4914e63a89
commit 4914e63a89
parent d7be1e84d0 b6c7c4a142
159 changed files with 15305 additions and 3941 deletions
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
      have questions on the subject, that are not yet covered by the
      FAQ, please contact us.
    ''; 
-    license = licenses.proprietary;
+    license = licenses.unfree;
    maintainers = [ maintainers.goibhniu ];
    platforms = platforms.linux;
  };
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@ -1,19 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:

-stdenv.mkDerivation
-{
-  name = "prolog-mode-1.22";
-  src = fetchurl
-  {
-    url = "http://bruda.ca/emacs-prolog/prolog.el";
-    sha256 = "f46915b2436642bb3302cb38cc457d3c121d0c3e95aecdf128fedc2ae5ea0c87";
+stdenv.mkDerivation {
+  name = "prolog-mode-1.25";
+
+  src = fetchurl {
+    url = "http://bruda.ca/_media/emacs/prolog.el";
+    sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh";
  };

-  buildCommand = "install -v -D -m644 $src $out/share/emacs/site-lisp/prolog.el";
+  buildCommand = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp $src $out/share/emacs/site-lisp/prolog.el
+  '';

  meta = {
-    homepage = "http://turing.ubishops.ca/home/bruda/emacs-prolog/";
+    homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
    description = "Prolog mode for Emacs";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
--- a/pkgs/applications/graphics/darktable/1.2rc1.nix
+++ b/pkgs/applications/graphics/darktable/1.2rc1.nix
@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
-, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
-, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
-, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  version = "1.2rc1";
-  name = "darktable-${version}";
-
-  src = fetchurl {
-    url = "http://tinyurl.com/bmwdztq";
-    name = "${name}-${version}.tar.xz";
-    sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
-  };
-
-  buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
-      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
-      librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
-    ];
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
-
-    substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
-  '';
-
-  cmakeFlags = [
-    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
-    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Virtual lighttable and darkroom for photographers";
-    homepage = http://darktable.sourceforge.net;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@ -8,12 +8,12 @@
 assert stdenv ? glibc;

 stdenv.mkDerivation rec {
-  version = "1.1.4";
+  version = "1.2";
  name = "darktable-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
-    sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
+    url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
+    sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
  };

  buildInputs =
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@ -1,11 +1,12 @@
 {stdenv, fetchurl, mono, gtksharp, pkgconfig}:

 stdenv.mkDerivation {
-  name = "pinta-0.5";
+  name = "pinta-1.4";

  src = fetchurl {
-    url =  http://github.com/downloads/jpobst/Pinta/pinta-0.5.tar.gz; 
-    sha256 = "0qv95zswi488bkbck9b9yhmczj1sgqc96nzn4f5rwfqz516kilrl";
+    url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
+    name = "pinta-1.4.tar.gz";
+    sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
  };

  buildInputs = [mono gtksharp pkgconfig];
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@ -1,13 +1,14 @@
 {stdenv, fetchurl, cmake}:

-stdenv.mkDerivation {
-  name = "taskwarrior-2.1.2";
+stdenv.mkDerivation rec {
+  name = "taskwarrior-${version}";
+  version = "2.2.0";

  enableParallelBuilding = true;

  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
-    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
+    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
+    sha256 = "057fh50qp9bd5s08rw51iybpamn55v5nhn3s6ds89g76hp95vqir";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  dev = {
-    version = "27.0.1448.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
-    sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
+    version = "27.0.1453.47";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
  };
  beta = {
-    version = "26.0.1410.43";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
-    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
+    version = "27.0.1453.47";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
  };
  stable = {
-    version = "26.0.1410.43";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
-    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
+    version = "26.0.1410.63";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz";
+    sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s";
  };
 }
--- a/pkgs/applications/networking/browsers/firefox/20.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/20.0.nix
@ -0,0 +1,176 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
+
+rec {
+
+  firefoxVersion = "20.0";
+
+  xulVersion = "20.0"; # this attribute is used by other packages
+
+
+  src = fetchurl {
+    urls = [
+        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
+        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+        # 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 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      #"--enable-profiling"
+      "--disable-debug"
+      "--enable-strip"
+      # "--with-system-jpeg" # Too old in nixpkgs
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      # "--enable-system-cairo" # <-- doesn't build
+      "--enable-system-sqlite"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer"
+      "--disable-updater"
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    enableParallelBuilding = true;
+
+    preConfigure =
+      ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
+
+        mkdir ../objdir
+        cd ../objdir
+        configureScript=../mozilla-release/configure
+      ''; # */
+
+    #installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      rm xulrunner
+
+      for i in $out/lib/$libDir/*; do
+          file $i;
+          if file $i | grep executable &>/dev/null; then
+              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
+          fi;
+      done
+      for i in $out/lib/$libDir/*.so; do
+          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done
+      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
+          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
+      done
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    enableParallelBuilding = true;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
+        xlibs.pixman yasm mesa sqlite file unzip pysqlite
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
+        "--disable-elf-hack"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    makeFlags = [
+      "SYSTEM_LIBXUL=1"
+    ];
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":"
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+      '';
+
+    postInstall =
+      ''
+        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        cd "$out/lib/"firefox-*
+        rm firefox
+        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
+        chmod a+x firefox
+      ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:

 stdenv.mkDerivation rec {
-  name = "bitlbee-3.0.3";
+  name = "bitlbee-3.2";

  src = fetchurl {
    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "09dgwfqznd2cnqraksivmh132nnl99gwgplynjmfsyyf6y4pbjl2";
+    sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030";
  };

  buildInputs = [ gnutls glib pkgconfig libotr ]
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@ -0,0 +1,63 @@
+{ stdenv
+, fetchurl
+, libtool
+, libXext
+, libSM
+, libICE
+, libX11
+, libXft
+, libXau
+, libXdmcp
+, libXrender
+, freetype
+, fontconfig
+, openssl
+}:
+
+let
+  version = "1.94.407";
+
+  rpath = stdenv.lib.makeSearchPath "lib" [
+    stdenv.glibc
+    stdenv.gcc.gcc
+    libtool
+    libXext
+    libSM
+    libICE
+    libX11
+    libXft
+    libXau
+    libXdmcp
+    libXrender
+    freetype
+    fontconfig
+    openssl
+  ];
+
+  src = fetchurl {
+    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
+    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
+  };
+in stdenv.mkDerivation {
+  name = "hipchat-${version}";
+
+  buildCommand = ''
+    tar xf ${src}
+    mkdir -p $out
+    mv opt/HipChat/lib $out
+    mv opt/HipChat/bin $out
+    mv usr/share $out
+    patchShebangs $out/bin
+    for file in $(find $out/lib -type f); do
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
+        patchelf --set-rpath ${rpath}:$out/lib $file || true
+    done
+  '';
+
+  meta = {
+    description = "HipChat Desktop Client";
+    homepage = http://www.hipchat.com;
+    license = stdenv.lib.licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@ -1,18 +1,19 @@
-{ stdenv, fetchurl, libotr, pidgin} :
+{ stdenv, fetchurl, libotr, pidgin, intltool } :

-stdenv.mkDerivation {
-  name = "pidgin-otr-3.2.0";
+stdenv.mkDerivation rec {
+  name = "pidgin-otr-4.0.0";
  src = fetchurl {
-    url = http://www.cypherpunks.ca/otr/pidgin-otr-3.2.0.tar.gz;
-    sha256 = "1cp6s565sid657lvmm7jrwl9wnk4ywsl8d9sp4iba36r0s5qaw08";
-  };
-
-  meta = {
-    description = "OTR plugin for Pidgin IM.";
-    homepage = http://www.cypherpunks.ca/otr;
+    url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
+    sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym";
  };

  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";

-  buildInputs = [libotr pidgin];
+  buildInputs = [ libotr pidgin intltool ];
+
+  meta = {
+    homepage = http://www.cypherpunks.ca/otr;
+    description = "Plugin for Pidgin 2.x which implements OTR Messaging";
+    license = "GPLv2";
+  };
 }
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
+, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f";
+  src = fetchurl {
+    url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f";
+    name = "${name}.tar.gz";
+    sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify";
+
+  patchPhase = ''
+    sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \
+        -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile
+    pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify
+  '';
+
+  buildPhase  = "make libskype.so libskype_dbus.so";
+
+  installPhase = ''
+    ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
+    cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16
+    cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22
+    cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48
+    cp libskype.so libskype_dbus.so $out/lib/pidgin
+  '';
+
+  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
+
+  buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ];
+
+  meta = {
+    homepage = https://github.com/novas0x2a/skype4pidgin;
+    license = "GPLv3+";
+    description = "Plugin to use a running skype account through pidgin";
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@ -21,10 +21,10 @@
 } :

 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.6";
+  name = "pidgin-2.10.7";
  src = fetchurl {
    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96";
+    sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
  };

  inherit nss ncurses;
--- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses
+, enablePlugin ? false }:
+
+# Enabling the plugin and using it with a recent irssi, segafults on join:
+# http://marc.info/?l=silc-devel&m=125610477802211
+
+let
+  basename = "silc-client-1.1.8";
+in
+stdenv.mkDerivation {
+  name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin";
+
+  src = fetchurl {
+    url = "http://silcnet.org/download/client/sources/${basename}.tar.bz2";
+    sha256 = "1qnk35g8sbnfps3bq2k9sy0ymlsijh5n8z59m2ccq4pkmqbfqgv2";
+  };
+
+  dontDisableStatic = true;
+
+  patches = [ ./server_setup.patch ];
+
+  configureFlags = "--with-ncurses=${ncurses}";
+
+  preConfigure = stdenv.lib.optionalString enablePlugin ''
+    configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"
+  '';
+
+  buildInputs = [ perl pkgconfig glib ncurses ];
+
+  meta = {
+    homepage = http://silcnet.org/;
+    description = "Secure Internet Live Conferencing server";
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
+++ b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
@ -0,0 +1,28 @@
+Add function to replace the behaviour of server_setup_find_port which was removed from irssi on revision 5125. Fixes bug #577501.
+--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
+@@ -2790,6 +2790,15 @@
+   silc_free(a);
+ }
+ 
+/* helper function to emulate server_setup_find_port */
+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
+						     int port) {
+  SERVER_SETUP_REC *rec;
+
+  rec = server_setup_find(address, port, NULL);
+  return (rec == NULL || rec->port != port) ? NULL : rec;
+}
+
+ /* Find authentication data by hostname and port. The hostname may be IP
+    address as well.*/
+ 
+@@ -2811,7 +2820,7 @@
+ 
+   /* Check whether we find the password for this server in our
+      configuration.  If it's set, always send it server. */
+-  setup = server_setup_find_port(hostname, port);
+  setup = silc_server_setup_find_port(hostname, port);
+   if (setup && setup->password) {
+     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
+ 	       context);
--- a/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/pkgs/applications/networking/irc/irssi/fish/default.nix
@ -0,0 +1,31 @@
+{ stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fish-irssi-20130413-e98156bebd";
+  
+  src = fetchurl {
+    url = https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd;
+    name = "${name}.tar.gz";
+    sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a";
+  };
+
+  preConfigure = ''
+    tar xf ${irssi.src}
+    configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
+
+    ./regen.sh
+  '';
+
+  installPhase = ''
+    ensureDir $out/lib/irssi/modules
+    cp src/.libs/libfish.so $out/lib/irssi/modules
+  '';
+  
+  buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ];
+  
+  meta = {
+    homepage = https://github.com/falsovsky/FiSH-irssi;
+    license = "unfree"; # I can't find any mention of license
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+
+let
+  rev = "59ddcbe66a";
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "irssi-otr-20130315-${rev}";
+  
+  src = fetchurl {
+    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
+    name = "${name}.tar.gz";
+    sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d";
+  };
+
+  patchPhase = ''
+    sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
+    sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
+    sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
+  '';
+
+  preConfigure = "sh ./bootstrap";
+
+  buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
+  
+  meta = {
+    homepage = https://github.com/cryptodotis/irssi-otr;
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@ -9,6 +9,10 @@ stdenv.mkDerivation {
  '';

  crossAttrs = {
+    propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
+    preConfigure = ''
+      sed 's/^PDF/#PDF/' -i Makefile
+    '';
    makeFlags = "CC=${stdenv.cross.config}-gcc";
  };

--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@ -0,0 +1,55 @@
+{ stdenv, fetchurl, apacheAntOpenJDK, jre }:
+
+let
+  # The .gitmodules in freenet-official-20130413-eccc9b3198
+  # points to freenet-contrib-staging-ce3b7d5
+  freenet_ext = fetchurl {
+    url = https://downloads.freenetproject.org/latest/freenet-ext.jar;
+    sha1 = "507ab3f6ee91f47c187149136fb6d6e98f9a8c7f";
+  };
+
+  bcprov = fetchurl {
+    url = http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar;
+    sha256 = "12129q8rmqwlvj6z4j0gc3w0hq5ccrkf2gdlsggp3iws7cp7wjw0";
+  };
+in
+stdenv.mkDerivation {
+  name = "freenet-official-20130413-eccc9b3198";
+
+  src = fetchurl {
+    url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
+    name = "freenet-official-eccc9b3198.tar.gz";
+    sha256 = "0x0s8gmb95770l7968r99sq0588vf0n1687ivc2hixar19cw620y";
+  };
+
+  patchPhase = ''
+    cp ${freenet_ext} lib/freenet/freenet-ext.jar
+    cp ${bcprov} lib/bcprov.jar
+
+    sed '/antcall.*-ext/d' -i build.xml
+  '';
+
+  buildInputs = [ apacheAntOpenJDK jre ];
+
+  buildPhase = "ant package-only";
+
+  installPhase = ''
+    ensureDir $out/share/freenet $out/bin
+    cp lib/bcprov.jar $out/share/freenet
+    cp lib/freenet/freenet-ext.jar $out/share/freenet
+    cp dist/freenet.jar $out/share/freenet
+
+    cat <<EOF > $out/bin/freenet
+    ${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
+      -Xmx1024M freenet.node.NodeStarter
+    EOF
+    chmod +x $out/bin/freenet
+  '';
+
+  meta = { 
+    description = "Decentralised and censorship-resistant network";
+    homepage = https://freenetproject.org/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@ -4,11 +4,11 @@
 , makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "gnunet-0.9.5";
+  name = "gnunet-0.9.5a";

  src = fetchurl {
    url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
+    sha256 = "1mxy1ikv44fia3cybpmiw298x5371a2qh8hr7pi55yg1xqbhfq0x";
  };

  buildInputs = [
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -51,7 +51,7 @@ rec {
      monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
      QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
      transformers transformersBase utf8String uuid wai waiLogger warp
-      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
+      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic;
  };

  qgit = import ./qgit {
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -6,18 +6,18 @@
 , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
 , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
 , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
-, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
+, yesod, yesodDefault, yesodForm, yesodStatic, regexTdfa
 }:

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

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

@ -29,7 +29,7 @@ stdenv.mkDerivation {
    networkProtocolXmpp openssh QuickCheck random regexCompat rsync
    SafeSemaphore SHA stm text time transformers transformersBase utf8String
    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
-    yesodStatic which perl testpack regexTdfa ];
+    yesodStatic which perl regexTdfa ];

  configurePhase = ''
    makeFlagsArray=( PREFIX=$out CABAL=./Setup )
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@ -1,20 +1,16 @@
-{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
-, MissingH, mtl, network, prettyShow
+{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
+, MissingH, mtl, network, prettyShow, text
 }:

 cabal.mkDerivation (self: {
  pname = "github-backup";
-  version = "1.20120314";
-  src = fetchurl {
-    url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
-    sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
-    name = "github-backup-${self.pname}.tar.gz";
-  };
+  version = "1.20130414";
+  sha256 = "1s8s1kv4kj086kzq8iq28zyrlg65hrzg3563fw3dazfik73cmlcp";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
    extensibleExceptions filepath github hslogger IfElse MissingH mtl
-    network prettyShow
+    network prettyShow text
  ];
  meta = {
    homepage = "https://github.com/joeyh/github-backup";
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@ -1,8 +1,8 @@
 {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:

 let
-  minor = "1.5";
-  version = "${minor}.2";
+  minor = "1.6";
+  version = "${minor}.1";
 in

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

  src = fetchurl {
    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
+    sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
  };

  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
+, pango, cairo, python, libjpeg, ffms
+, enableQt ? true, qt4}:
+
+stdenv.mkDerivation rec {
+  name = "avxsynth-4.0-e153e672bf";
+
+  src = fetchurl {
+    url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
+    name = "${name}.tar.gz";
+    sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
+  };
+
+  buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
+    libjpeg ffms ]
+    ++ stdenv.lib.optional enableQt qt4;
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = https://github.com/avxsynth/avxsynth/wiki;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@ -5,16 +5,16 @@
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva, libdvbpsi, libdc1394, libraw1394
+, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 }:

 stdenv.mkDerivation rec {
  name = "vlc-${version}";
-  version = "2.0.5";
+  version = "2.0.6";

  src = fetchurl {
    url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz";
+    sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i";
  };

  buildInputs =
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-      libdc1394 libraw1394
+      libdc1394 libraw1394 libopus
    ];

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:

 stdenv.mkDerivation rec {
-  name = "qemu-1.3.1";
+  name = "qemu-1.4.0";

  src = fetchurl {
    url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
+    sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
  };

  buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
--- a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
+++ b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
@ -1,22 +0,0 @@
-commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb
-Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date:   Thu Feb 28 13:46:12 2013 +0000
-
-    Linux 3.9.0 rc0 compile fix
-
-    git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-index ec9b502..7a208d1 100644
--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -90,6 +90,9 @@
- #include <linux/slab.h>
- #include <linux/time.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
-+# include <linux/sched/rt.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
- # include <linux/jiffies.h>
- #endif
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -11,8 +11,8 @@ with stdenv.lib;

 let

-  version = "4.2.8";
-  extpackRevision = "83876";
+  version = "4.2.12";
+  extpackRevision = "84980";

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

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

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

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

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

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

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

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

  KERN_DIR = "${kernelDev}/lib/modules/*/build";
--- a/pkgs/applications/virtualization/virtualbox/strict_types.patch
+++ b/pkgs/applications/virtualization/virtualbox/strict_types.patch
@ -1,68 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-index 9cc124c..d86da0c 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice =
- DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_uid());
-+# else
-     return current->cred->uid;
-+# endif
- #else
-     return current->uid;
- #endif
-@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kgid(current_user_ns(), current_gid());
-+# else
-     return current->cred->gid;
-+# endif
- #else
-     return current->gid;
- #endif
-@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_euid());
-+# else
-     return current->cred->euid;
-+# endif
- #else
-     return current->euid;
- #endif
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index 575f739..8909e79 100644
--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-                 goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
- 
-@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-             goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
-         RTStrPrintf(szFileBuf, cMaxBuf,
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@ -1,6 +1,13 @@
 # generic builder for Cabal packages

-{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, enableLibraryProfiling ? false }:
+{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal
+, enableLibraryProfiling ? false
+, enableCheckPhase ? true
+}:
+
+# The Cabal library shipped with GHC versions older than 7.x doesn't accept the --enable-tests configure flag.
+assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
+
 {
  mkDerivation =
    args : # arguments for the individual package, can modify the defaults
@ -18,6 +25,7 @@
          x : (removeAttrs x internalAttrs) // {
                buildInputs           = stdenv.lib.filter (y : ! (y == null)) x.buildInputs;
                propagatedBuildInputs = stdenv.lib.filter (y : ! (y == null)) x.propagatedBuildInputs;
+                doCheck               = enableCheckPhase && x.doCheck;
              };

        defaults =
@ -92,7 +100,7 @@

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

            extraConfigureFlags = [
              (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@ -58,7 +58,7 @@ stdenv.mkDerivation {

  crossAttrs = {
    shell = shell.crossDrv + shell.crossDrv.shellPath;
-    libc = libc.crossDrv;
+    libc = stdenv.gccCross.libc;
    coreutils = coreutils.crossDrv;
    binutils = binutils.crossDrv;
    gcc = gcc.crossDrv;
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation (
              KEEPBUILDDIR="$out/`basename $TMPDIR`"
              header "Copying build directory to $KEEPBUILDDIR"
              mkdir -p $KEEPBUILDDIR
-              cp -R $TMPDIR/* $KEEPBUILDDIR
+              cp -R "$TMPDIR/"* $KEEPBUILDDIR
              stopNest
          fi
      fi
@ -68,7 +68,7 @@ stdenv.mkDerivation (
          export CFLAGS="-O0"
          export CXXFLAGS="-O0"
      fi
-    ''; # */
+    '';

    initPhase = ''
      mkdir -p $out/nix-support
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@ -333,6 +333,7 @@ stdenv.mkDerivation ({

  crossAttrs = {
    patches = patches ++ [ ./hurd-sigrtmin.patch ];
+    postPatch = "";
    AR = "${stdenv.cross.config}-ar";
    LD = "${stdenv.cross.config}-ld";
    CC = "${stdenv.cross.config}-gcc";
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@ -49,7 +49,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;

-let version = "4.7.2";
+let version = "4.7.3";

    # Whether building a cross-compiler for GNU/Hurd.
    crossGNU = cross != null && cross.config == "i586-pc-gnu";
@ -197,7 +197,7 @@ stdenv.mkDerivation ({

  src = fetchurl {
    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "115h03hil99ljig8lkrq4qk426awmzh0g99wrrggxf8g07bq74la";
+    sha256 = "1hx9h64ivarlzi4hxvq42as5m9vlr5cyzaaq4gzj4i619zmkfz1g";
  };

  inherit patches;
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@ -28,18 +28,18 @@ in

 stdenv.mkDerivation {
  name =
-    if installjdk then "jdk-1.6.0_38b04" else "jre-1.6.0_38b04";
+    if installjdk then "jdk-1.6.0_45b06" else "jre-1.6.0_45b06";

  src =
    if stdenv.system == "i686-linux" then
      fetchurl {
-        url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-i586-31_oct_2012.bin;
-        md5 = "0595473ad371981c7faa709798a5f78e";
+        url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin;
+        sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym";
      }
    else if stdenv.system == "x86_64-linux" then
      fetchurl {
-        url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-amd64-31_oct_2012.bin;
-        md5 = "b98c80a963915de32b1abe02c50385de";
+        url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin;
+        sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb";
      }
    else
      abort "jdk requires i686-linux or x86_64 linux";
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@ -1,10 +1,10 @@
 {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:

-stdenv.mkDerivation {
-  name = "mono-2.10.8.1";
+stdenv.mkDerivation rec {
+  name = "mono-2.11.4";
  src = fetchurl {
-    url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
-    sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
+    url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
+    sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr";
  };

  buildInputs = [bison pkgconfig glib gettext perl libgdiplus];
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@ -3,14 +3,14 @@
   fontconfig }:

 let
-  version = "5.10.5";
+  version = "6.2.6";
 in
 stdenv.mkDerivation {
  name = "swi-prolog-${version}";

  src = fetchurl {
    url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
-    sha256 = "38d938d6a64e894685aa44bf9ea34b5505764cd084e07e6b4c21a9dd89b579d5";
+    sha256 = "0ii14ghmky91kkh017khahl00s4igkz03b5gy6y0vhv179sz04ll";
  };

  buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
+{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }:

 stdenv.mkDerivation rec {

@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
    sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3";
  };

-  nativeBuildInputs = [ yacc flex pkgconfig xz ];
+  nativeBuildInputs = [ yacc flex pkgconfig ];

-  buildInputs = [ glib ];
+  buildInputs = [ glib ] ++ libintlOrEmpty;

  meta = {
    description = "Compiler for the GObject type system";
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@ -9,7 +9,7 @@ in

 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {

-  version = "5.3.18";
+  version = "5.3.24";

  name = "php-${version}";

@ -43,7 +43,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
      libxml2 = {
        configureFlags = [
          "--with-libxml-dir=${libxml2}"
-          "--with-iconv-dir=${libiconv}"
+          #"--with-iconv-dir=${libiconv}"
          ];
        buildInputs = [ libxml2 ];
      };
@ -196,7 +196,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)

  src = fetchurl {
    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "0bqsdwil13m1r449c4rhrc8cmx2a09k8h2g107qqxfwanzndwrgh";
+    sha256 = "00sphz1y6bjb2qshbcbadh5f2xvhfy82rfdc62qjfn6337gwlfzw";
    name = "php-${version}.tar.bz2";
  };

--- a/pkgs/development/libraries/aacskeys/default.nix
+++ b/pkgs/development/libraries/aacskeys/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, jdk, premake}:
+{stdenv, fetchurl, openssl, jdk, premake3}:

 # Info on how to use / obtain aacs keys:
 # http://vlc-bluray.whoknowsmy.name/
@ -22,7 +22,7 @@ stdenv.mkDerivation {
    sha256 = "0d3zvwixpkixfkkc16wj37h2xbcq5hsqqhqngzqr6pslmqr67vnr";
  };

-  buildInputs = [openssl jdk premake];
+  buildInputs = [openssl jdk premake3];

  installPhase = ''
    ensureDir $out/{bin,lib,share/${baseName}}
--- a/pkgs/development/libraries/boost/1.44.nix
+++ b/pkgs/development/libraries/boost/1.44.nix
@ -68,6 +68,7 @@ stdenv.mkDerivation {
       url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
       sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
     })
+    ./time_utc_144.patch
  ];

  crossAttrs = rec {
--- a/pkgs/development/libraries/boost/time_utc_144.patch
+++ b/pkgs/development/libraries/boost/time_utc_144.patch
@ -0,0 +1,520 @@
+diff -rc boost_1_44_0/boost/thread/xtime.hpp boost_1_44_0-new/boost/thread/xtime.hpp
+*** boost_1_44_0/boost/thread/xtime.hpp	2008-06-18 15:01:08.000000000 +0200
+--- boost_1_44_0-new/boost/thread/xtime.hpp	2013-04-12 14:00:27.125713549 +0200
+***************
+*** 20,26 ****
+  
+  enum xtime_clock_types
+  {
+!     TIME_UTC=1
+  //    TIME_TAI,
+  //    TIME_MONOTONIC,
+  //    TIME_PROCESS,
+--- 20,26 ----
+  
+  enum xtime_clock_types
+  {
+!     TIME_UTC_=1
+  //    TIME_TAI,
+  //    TIME_MONOTONIC,
+  //    TIME_PROCESS,
+***************
+*** 68,74 ****
+  
+  inline int xtime_get(struct xtime* xtp, int clock_type)
+  {
+!     if (clock_type == TIME_UTC)
+      {
+          *xtp=get_xtime(get_system_time());
+          return clock_type;
+--- 68,74 ----
+  
+  inline int xtime_get(struct xtime* xtp, int clock_type)
+  {
+!     if (clock_type == TIME_UTC_)
+      {
+          *xtp=get_xtime(get_system_time());
+          return clock_type;
+diff -rc boost_1_44_0/libs/interprocess/test/condition_test_template.hpp boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp
+*** boost_1_44_0/libs/interprocess/test/condition_test_template.hpp	2009-10-15 20:45:53.000000000 +0200
+--- boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp	2013-04-12 14:00:20.215658855 +0200
+***************
+*** 49,56 ****
+      const int NANOSECONDS_PER_MILLISECOND = 1000000;
+  
+      boost::xtime xt;
+!     int ret = boost::xtime_get(&xt, boost::TIME_UTC);
+!     assert(ret == static_cast<int>(boost::TIME_UTC));(void)ret;
+      nsecs += xt.nsec;
+      msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
+      secs += msecs / MILLISECONDS_PER_SECOND;
+--- 49,56 ----
+      const int NANOSECONDS_PER_MILLISECOND = 1000000;
+  
+      boost::xtime xt;
+!     int ret = boost::xtime_get(&xt, boost::TIME_UTC_);
+!     assert(ret == static_cast<int>(boost::TIME_UTC_));(void)ret;
+      nsecs += xt.nsec;
+      msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
+      secs += msecs / MILLISECONDS_PER_SECOND;
+diff -rc boost_1_44_0/libs/interprocess/test/util.hpp boost_1_44_0-new/libs/interprocess/test/util.hpp
+*** boost_1_44_0/libs/interprocess/test/util.hpp	2009-10-15 20:45:53.000000000 +0200
+--- boost_1_44_0-new/libs/interprocess/test/util.hpp	2013-04-12 14:00:20.219658887 +0200
+***************
+*** 71,77 ****
+  boost::xtime xsecs(int secs)
+  {
+     boost::xtime ret;
+!    boost::xtime_get(&ret, boost::TIME_UTC);
+     ret.sec += secs;
+     return ret;
+  }
+--- 71,77 ----
+  boost::xtime xsecs(int secs)
+  {
+     boost::xtime ret;
+!    boost::xtime_get(&ret, boost::TIME_UTC_);
+     ret.sec += secs;
+     return ret;
+  }
+diff -rc boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp
+*** boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp	2008-06-22 17:05:38.000000000 +0200
+--- boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp	2013-04-12 14:00:18.836647940 +0200
+***************
+*** 70,76 ****
+  {
+      static long const nanoseconds_per_second = 1000L*1000L*1000L;
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC);
+      xt.nsec+=1000*1000*milliseconds;
+      while (xt.nsec > nanoseconds_per_second)
+      {
+--- 70,76 ----
+  {
+      static long const nanoseconds_per_second = 1000L*1000L*1000L;
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC_);
+      xt.nsec+=1000*1000*milliseconds;
+      while (xt.nsec > nanoseconds_per_second)
+      {
+diff -rc boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp
+*** boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp	2008-06-22 17:05:38.000000000 +0200
+--- boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp	2013-04-12 14:00:18.836647940 +0200
+***************
+*** 86,92 ****
+              return test_size;
+  
+          boost::xtime now;
+!         boost::xtime_get(&now, boost::TIME_UTC);
+          unsigned long seconds = now.sec - start_time.sec;
+          if (seconds < 4)
+          {
+--- 86,92 ----
+              return test_size;
+  
+          boost::xtime now;
+!         boost::xtime_get(&now, boost::TIME_UTC_);
+          unsigned long seconds = now.sec - start_time.sec;
+          if (seconds < 4)
+          {
+***************
+*** 187,193 ****
+  void concurrent_creation_of_objects()
+  {
+      {
+!         boost::xtime_get(&start_time, boost::TIME_UTC);
+          boost::thread thread1(callable_ref(test1));
+          boost::thread thread2(callable_ref(test2));
+          boost::thread thread3(callable_ref(test3));
+--- 187,193 ----
+  void concurrent_creation_of_objects()
+  {
+      {
+!         boost::xtime_get(&start_time, boost::TIME_UTC_);
+          boost::thread thread1(callable_ref(test1));
+          boost::thread thread2(callable_ref(test2));
+          boost::thread thread3(callable_ref(test3));
+diff -rc boost_1_44_0/libs/thread/example/starvephil.cpp boost_1_44_0-new/libs/thread/example/starvephil.cpp
+*** boost_1_44_0/libs/thread/example/starvephil.cpp	2006-09-14 23:51:01.000000000 +0200
+--- boost_1_44_0-new/libs/thread/example/starvephil.cpp	2013-04-12 14:00:19.413652507 +0200
+***************
+*** 50,56 ****
+                        << "very hot ..." << std::endl;
+          }
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC);
+          xt.sec += 3;
+          boost::thread::sleep(xt);
+          m_chickens += value;
+--- 50,56 ----
+                        << "very hot ..." << std::endl;
+          }
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC_);
+          xt.sec += 3;
+          boost::thread::sleep(xt);
+          m_chickens += value;
+***************
+*** 85,91 ****
+              std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
+          }
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC);
+          xt.sec += 2;
+          boost::thread::sleep(xt);
+          {
+--- 85,91 ----
+              std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
+          }
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC_);
+          xt.sec += 2;
+          boost::thread::sleep(xt);
+          {
+***************
+*** 111,117 ****
+              if (m_id > 0)
+              {
+                  boost::xtime xt;
+!                 boost::xtime_get(&xt, boost::TIME_UTC);
+                  xt.sec += 3;
+                  boost::thread::sleep(xt);
+              }
+--- 111,117 ----
+              if (m_id > 0)
+              {
+                  boost::xtime xt;
+!                 boost::xtime_get(&xt, boost::TIME_UTC_);
+                  xt.sec += 3;
+                  boost::thread::sleep(xt);
+              }
+diff -rc boost_1_44_0/libs/thread/example/tennis.cpp boost_1_44_0-new/libs/thread/example/tennis.cpp
+*** boost_1_44_0/libs/thread/example/tennis.cpp	2009-10-19 11:18:13.000000000 +0200
+--- boost_1_44_0-new/libs/thread/example/tennis.cpp	2013-04-12 14:00:19.412652499 +0200
+***************
+*** 104,110 ****
+      boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
+  
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC);
+      xt.sec += 1;
+      boost::thread::sleep(xt);
+      {
+--- 104,110 ----
+      boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
+  
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC_);
+      xt.sec += 1;
+      boost::thread::sleep(xt);
+      {
+diff -rc boost_1_44_0/libs/thread/example/thread.cpp boost_1_44_0-new/libs/thread/example/thread.cpp
+*** boost_1_44_0/libs/thread/example/thread.cpp	2006-09-14 23:51:01.000000000 +0200
+--- boost_1_44_0-new/libs/thread/example/thread.cpp	2013-04-12 14:00:19.414652515 +0200
+***************
+*** 14,20 ****
+      void operator()()
+      {
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC);
+          xt.sec += m_secs;
+  
+          boost::thread::sleep(xt);
+--- 14,20 ----
+      void operator()()
+      {
+          boost::xtime xt;
+!         boost::xtime_get(&xt, boost::TIME_UTC_);
+          xt.sec += m_secs;
+  
+          boost::thread::sleep(xt);
+diff -rc boost_1_44_0/libs/thread/example/xtime.cpp boost_1_44_0-new/libs/thread/example/xtime.cpp
+*** boost_1_44_0/libs/thread/example/xtime.cpp	2006-09-14 23:51:01.000000000 +0200
+--- boost_1_44_0-new/libs/thread/example/xtime.cpp	2013-04-12 14:00:19.413652507 +0200
+***************
+*** 10,16 ****
+  int main(int argc, char* argv[])
+  {
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC);
+      xt.sec += 1;
+      boost::thread::sleep(xt); // Sleep for 1 second
+  }
+--- 10,16 ----
+  int main(int argc, char* argv[])
+  {
+      boost::xtime xt;
+!     boost::xtime_get(&xt, boost::TIME_UTC_);
+      xt.sec += 1;
+      boost::thread::sleep(xt); // Sleep for 1 second
+  }
+diff -rc boost_1_44_0/libs/thread/src/pthread/thread.cpp boost_1_44_0-new/libs/thread/src/pthread/thread.cpp
+*** boost_1_44_0/libs/thread/src/pthread/thread.cpp	2010-07-09 21:13:09.000000000 +0200
+--- boost_1_44_0-new/libs/thread/src/pthread/thread.cpp	2013-04-12 14:00:19.415652523 +0200
+***************
+*** 350,356 ****
+                      cond.timed_wait(lock, xt);
+  #   endif
+                      xtime cur;
+!                     xtime_get(&cur, TIME_UTC);
+                      if (xtime_cmp(xt, cur) <= 0)
+                          return;
+                  }
+--- 350,356 ----
+                      cond.timed_wait(lock, xt);
+  #   endif
+                      xtime cur;
+!                     xtime_get(&cur, TIME_UTC_);
+                      if (xtime_cmp(xt, cur) <= 0)
+                          return;
+                  }
+***************
+*** 365,371 ****
+              BOOST_VERIFY(!pthread_yield());
+  #   else
+              xtime xt;
+!             xtime_get(&xt, TIME_UTC);
+              sleep(xt);
+  #   endif
+          }
+--- 365,371 ----
+              BOOST_VERIFY(!pthread_yield());
+  #   else
+              xtime xt;
+!             xtime_get(&xt, TIME_UTC_);
+              sleep(xt);
+  #   endif
+          }
+diff -rc boost_1_44_0/libs/thread/src/pthread/timeconv.inl boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl
+*** boost_1_44_0/libs/thread/src/pthread/timeconv.inl	2010-04-01 17:04:15.000000000 +0200
+--- boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl	2013-04-12 14:00:19.414652515 +0200
+***************
+*** 20,27 ****
+  inline void to_time(int milliseconds, boost::xtime& xt)
+  {
+      int res = 0;
+!     res = boost::xtime_get(&xt, boost::TIME_UTC);
+!     BOOST_ASSERT(res == boost::TIME_UTC);
+  
+      xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
+      xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
+--- 20,27 ----
+  inline void to_time(int milliseconds, boost::xtime& xt)
+  {
+      int res = 0;
+!     res = boost::xtime_get(&xt, boost::TIME_UTC_);
+!     BOOST_ASSERT(res == boost::TIME_UTC_);
+  
+      xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
+      xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
+***************
+*** 57,64 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     BOOST_ASSERT(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+      {
+--- 57,64 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     BOOST_ASSERT(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+      {
+***************
+*** 88,95 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     BOOST_ASSERT(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          milliseconds = 0;
+--- 88,95 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     BOOST_ASSERT(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          milliseconds = 0;
+***************
+*** 110,117 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     BOOST_ASSERT(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          microseconds = 0;
+--- 110,117 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     BOOST_ASSERT(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          microseconds = 0;
+diff -rc boost_1_44_0/libs/thread/src/win32/timeconv.inl boost_1_44_0-new/libs/thread/src/win32/timeconv.inl
+*** boost_1_44_0/libs/thread/src/win32/timeconv.inl	2007-11-25 19:38:02.000000000 +0100
+--- boost_1_44_0-new/libs/thread/src/win32/timeconv.inl	2013-04-12 14:00:19.416652531 +0200
+***************
+*** 17,24 ****
+  inline void to_time(int milliseconds, boost::xtime& xt)
+  {
+      int res = 0;
+!     res = boost::xtime_get(&xt, boost::TIME_UTC);
+!     assert(res == boost::TIME_UTC);
+  
+      xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
+      xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
+--- 17,24 ----
+  inline void to_time(int milliseconds, boost::xtime& xt)
+  {
+      int res = 0;
+!     res = boost::xtime_get(&xt, boost::TIME_UTC_);
+!     assert(res == boost::TIME_UTC_);
+  
+      xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
+      xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
+***************
+*** 54,61 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     assert(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+      {
+--- 54,61 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     assert(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+      {
+***************
+*** 85,92 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     assert(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          milliseconds = 0;
+--- 85,92 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     assert(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          milliseconds = 0;
+***************
+*** 107,114 ****
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC);
+!     assert(res == boost::TIME_UTC);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          microseconds = 0;
+--- 107,114 ----
+  {
+      boost::xtime cur;
+      int res = 0;
+!     res = boost::xtime_get(&cur, boost::TIME_UTC_);
+!     assert(res == boost::TIME_UTC_);
+  
+      if (boost::xtime_cmp(xt, cur) <= 0)
+          microseconds = 0;
+diff -rc boost_1_44_0/libs/thread/test/test_xtime.cpp boost_1_44_0-new/libs/thread/test/test_xtime.cpp
+*** boost_1_44_0/libs/thread/test/test_xtime.cpp	2008-07-08 09:44:55.000000000 +0200
+--- boost_1_44_0-new/libs/thread/test/test_xtime.cpp	2013-04-12 14:00:19.432652657 +0200
+***************
+*** 17,24 ****
+  {
+      boost::xtime xt1, xt2, cur;
+      BOOST_CHECK_EQUAL(
+!         boost::xtime_get(&cur, boost::TIME_UTC),
+!         static_cast<int>(boost::TIME_UTC));
+  
+      xt1 = xt2 = cur;
+      xt1.nsec -= 1;
+--- 17,24 ----
+  {
+      boost::xtime xt1, xt2, cur;
+      BOOST_CHECK_EQUAL(
+!         boost::xtime_get(&cur, boost::TIME_UTC_),
+!         static_cast<int>(boost::TIME_UTC_));
+  
+      xt1 = xt2 = cur;
+      xt1.nsec -= 1;
+***************
+*** 42,55 ****
+      boost::xtime orig, cur, old;
+      BOOST_CHECK_EQUAL(
+          boost::xtime_get(&orig,
+!             boost::TIME_UTC), static_cast<int>(boost::TIME_UTC));
+      old = orig;
+  
+      for (int x=0; x < 100; ++x)
+      {
+          BOOST_CHECK_EQUAL(
+!             boost::xtime_get(&cur, boost::TIME_UTC),
+!             static_cast<int>(boost::TIME_UTC));
+          BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
+          BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
+          old = cur;
+--- 42,55 ----
+      boost::xtime orig, cur, old;
+      BOOST_CHECK_EQUAL(
+          boost::xtime_get(&orig,
+!             boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC));
+      old = orig;
+  
+      for (int x=0; x < 100; ++x)
+      {
+          BOOST_CHECK_EQUAL(
+!             boost::xtime_get(&cur, boost::TIME_UTC_),
+!             static_cast<int>(boost::TIME_UTC_));
+          BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
+          BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
+          old = cur;
+diff -rc boost_1_44_0/libs/thread/test/util.inl boost_1_44_0-new/libs/thread/test/util.inl
+*** boost_1_44_0/libs/thread/test/util.inl	2008-11-03 23:29:39.000000000 +0100
+--- boost_1_44_0-new/libs/thread/test/util.inl	2013-04-12 14:00:19.433652665 +0200
+***************
+*** 28,35 ****
+      const int NANOSECONDS_PER_MILLISECOND = 1000000;
+  
+      boost::xtime xt;
+!     if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC))
+!         BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC");
+  
+      nsecs += xt.nsec;
+      msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
+--- 28,35 ----
+      const int NANOSECONDS_PER_MILLISECOND = 1000000;
+  
+      boost::xtime xt;
+!     if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC))
+!         BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_");
+  
+      nsecs += xt.nsec;
+      msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
--- a/pkgs/development/libraries/cairo/1.12.2.nix
+++ b/pkgs/development/libraries/cairo/1.12.2.nix
@ -5,7 +5,7 @@
 , gobjectSupport ? true, glib
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, gettext, libiconvOrEmpty
+, libiconvOrEmpty, libintlOrEmpty
 }:

 assert postscriptSupport -> zlib != null;
@ -23,10 +23,7 @@ stdenv.mkDerivation rec {
  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
-
+    ++ libintlOrEmpty
    ++ libiconvOrEmpty;

  propagatedBuildInputs =
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@ -5,7 +5,7 @@
 , gobjectSupport ? true, glib
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, gettext, libiconvOrEmpty
+, libiconvOrEmpty, libintlOrEmpty
 }:

 assert postscriptSupport -> zlib != null;
@ -21,13 +21,10 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ pkgconfig x11 fontconfig ] 
+    [ 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.
-    ++ stdenv.lib.optional (!stdenv.isLinux) gettext
-
+    ++ libintlOrEmpty
    ++ libiconvOrEmpty;

  propagatedBuildInputs =
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "ffms-2.17";
+  
+  src = fetchurl {
+    url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
+    sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
+  };
+
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  buildInputs = [ zlib ffmpeg pkgconfig ];
+
+  meta = {
+    homepage = http://code.google.com/p/ffmpegsource/;
+    description = "Libav/ffmpeg based source library for easy frame accurate access";
+    license = "MIT";
+  };
+}
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";

  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-  buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
+  buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake;

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "accelerate";
-  version = "0.12.1.0";
-  sha256 = "1zvrb36xvvzfdl0k7a25329mdplwa76k9wk0yf3za3j0kb20d4f4";
+  version = "0.12.2.0";
+  sha256 = "1fv7d2prpkwy2gy0llafksayka76jv8c0sd66x6632gb586pfwgs";
  meta = {
    homepage = "https://github.com/AccelerateHS/accelerate/";
    description = "An embedded language for accelerated array processing";
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@ -0,0 +1,18 @@
+{ cabal, cereal, extensibleExceptions, filepath, mtl, network
+, safecopy, stm
+}:
+
+cabal.mkDerivation (self: {
+  pname = "acid-state";
+  version = "0.8.3";
+  sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc";
+  buildDepends = [
+    cereal extensibleExceptions filepath mtl network safecopy stm
+  ];
+  meta = {
+    homepage = "http://acid-state.seize.it/";
+    description = "Add ACID guarantees to any serializable Haskell data structure";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/asn1-types/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-types/default.nix
@ -0,0 +1,14 @@
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+  pname = "asn1-types";
+  version = "0.1.0";
+  sha256 = "1520jq65fzlpi4jfrqwry3dg4lajdk6pssb7cqbrmplda0zi2d12";
+  buildDepends = [ time ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-asn1-types";
+    description = "ASN.1 types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
  buildDepends = [
    asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time
  ];
+  jailbreak = true;
  meta = {
    homepage = "http://github.com/vincenthz/hs-certificate";
    description = "Certificates and Key Reader/Writer";
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
  version = "0.11";
  sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy";
  buildDepends = [ cereal entropy tagged transformers ];
+  jailbreak = true;
  meta = {
    homepage = "http://trac.haskell.org/crypto-api/wiki";
    description = "A generic interface for cryptographic operations";
--- a/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix
+++ b/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "cuda";
-  version = "0.5.0.1";
-  sha256 = "0gxkf97c4cm9d7kk0izgz3m44ycys1lcl4bq828c6l1wim1xz28b";
+  version = "0.5.0.2";
+  sha256 = "1if730wcww5qx5qki1ir0d576wwpwrh00krp1svgdlx2j50rmgq5";
  buildTools = [ c2hs ];
  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
  doCheck = false;
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@ -3,8 +3,8 @@

 cabal.mkDerivation (self: {
  pname = "digestive-functors-heist";
-  version = "0.6.1.0";
-  sha256 = "08h883731cb5kqsv33f6dpf2lgh1r6qn9maqjkn5766vqf7m28nx";
+  version = "0.6.2.0";
+  sha256 = "03wxdmgwc6qialwhp5zdj3s3a8a8yz6vswfgryjx4izaaq7pdhl1";
  buildDepends = [
    blazeBuilder digestiveFunctors heist mtl text xmlhtml
  ];
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "fsnotify";
-  version = "0.0.6";
-  sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5";
+  version = "0.0.8";
+  sha256 = "05vfiddp5m28rm02ci7fcfg1zgw5ydj084173mpp1w124bfqf940";
  buildDepends = [ hinotify systemFileio systemFilepath text time ];
  testDepends = [
    Cabal Glob hinotify hspec QuickCheck random systemFileio
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "ghc-vis";
-  version = "0.6.1";
-  sha256 = "0q0v1l44vagcg0nl4iv8m872g4qblj9syjlcgbf6fpgx1fqnyp24";
+  version = "0.6.1.1";
+  sha256 = "1fg8bxkhw2s3y8w0ljnnqbf8f5ld17p70v4aikc26ybmb0938yl6";
  buildDepends = [
    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
    transformers xdot
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@ -1,23 +1,18 @@
-{ cabal, fetchurl, aeson, attoparsec, caseInsensitive, conduit, dataDefault
+{ cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault
 , failure, HTTP, httpConduit, httpTypes, network, text, time
 , unorderedContainers, vector
 }:

 cabal.mkDerivation (self: {
  pname = "github";
-  version = "0.5.0-patched";
-  src = fetchurl {
-    url = "https://github.com/mike-burns/github/archive/df415af64ebd4a28f1f8e5cc726e933545efdd7e.tar.gz";
-    sha256 = "1d1ya5j1qz1nf5kfkxp48gb0xbcr4fmf9y0kfpd3gxivfrdkfrig";
-    name = "github-${self.version}.tar.gz";
-  };
-  patches = [ (fetchurl { url = "https://github.com/mike-burns/github/pull/33.patch"; sha256 = "1d0m73ygzpk5rd6ahbrf58mxca56s5sd70yrf7fn2r1bh0rlacap"; }) ];
+  version = "0.6.0";
+  sha256 = "1bg443rhh57p10q9dwx4aa2964qwg00swmdlvh1r72c343lrv1gj";
  buildDepends = [
    aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
    httpConduit httpTypes network text time unorderedContainers vector
  ];
  meta = {
-    homepage = "https://github.com/mike-burns/github";
+    homepage = "https://github.com/fpco/github";
    description = "Access to the Github API, v3";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hamlet";
-  version = "1.1.7";
-  sha256 = "0vx2z8zvlr3860cypa3lkd8q51k6gngw65jqcbik3bxfbjj2qcv3";
+  version = "1.1.7.1";
+  sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p";
  buildDepends = [
    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
  ];
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "happstack-server";
-  version = "7.1.7";
-  sha256 = "1gd7qa224z04aya44fdrbhpiy5iw88wjcvqihz6l95ks9ilbzmg7";
+  version = "7.1.7.1";
+  sha256 = "1q897av0ynfh6jn4jhmmamkwda7zg36p4ncn9yic69calzvjpz72";
  buildDepends = [
    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
    html monadControl mtl network parsec sendfile syb systemFilepath
--- a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
@ -1,10 +1,10 @@
-{ cabal, filepath, terminfo, transformers }:
+{ cabal, filepath, terminfo, transformers, utf8String }:

 cabal.mkDerivation (self: {
  pname = "haskeline";
  version = "0.7.0.3";
  sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg";
-  buildDepends = [ filepath terminfo transformers ];
+  buildDepends = [ filepath terminfo transformers utf8String ];
  configureFlags = "-fterminfo";
  meta = {
    homepage = "http://trac.haskell.org/haskeline";
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hspec-meta";
-  version = "1.5.2";
-  sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
+  version = "1.5.3";
+  sha256 = "13yzk3qgqbb5jlrvy1mdq5782jzjllhnfi6ylrv8zix192y8v1mh";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- 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.2.2";
-  sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf";
+  version = "1.9.3";
+  sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk";
  buildDepends = [
    asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
    caseInsensitive certificate conduit cookie cprngAes dataDefault
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "multiarg";
-  version = "0.12.0.2";
-  sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
+  version = "0.14.0.0";
+  sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb";
  buildDepends = [ explicitException utf8String ];
  meta = {
    homepage = "https://github.com/massysett/multiarg";
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
  testDepends = [
    HUnit testFramework testFrameworkHunit testFrameworkThPrime
  ];
+  jailbreak = true;
  meta = {
    homepage = "https://github.com/pcapriotti/optparse-applicative";
    description = "Utilities and combinators for parsing command line options";
--- 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.4";
-  sha256 = "0qwx2739pmmjfy6w3iri1fgyin3295vzn6rvazh34qd89i5vi3pb";
+  version = "0.1";
+  sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
  buildDepends = [ cereal dataDefault text utf8String ];
  testDepends = [ cereal dataDefault HUnit idna text utf8String ];
  meta = {
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@ -2,10 +2,9 @@

 cabal.mkDerivation (self: {
  pname = "repa";
-  version = "3.2.3.1";
-  sha256 = "0r5z781h9v6ri2m3ih7jbymvc3i2m26qaf29pxwmaks0sdlp4qmr";
+  version = "3.2.3.2";
+  sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh";
  buildDepends = [ QuickCheck vector ];
-  jailbreak = true;
  meta = {
    homepage = "http://repa.ouroborus.net";
    description = "High performance, regular, shape polymorphic parallel arrays";
--- a/pkgs/development/libraries/haskell/safecopy/default.nix
+++ b/pkgs/development/libraries/haskell/safecopy/default.nix
@ -0,0 +1,14 @@
+{ cabal, cereal, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "safecopy";
+  version = "0.8.2";
+  sha256 = "0l2kqymsxv244fahxcpxlrspk6xipz3br6j854ipbfh8b0bfvr4m";
+  buildDepends = [ cereal text time ];
+  meta = {
+    homepage = "http://acid-state.seize.it/safecopy";
+    description = "Binary serialization with version control";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "semigroups";
-  version = "0.9";
-  sha256 = "0cwyjjlr9zgpxryzdf26pb58dmad0cp8d0493rarhh5zmgighh90";
+  version = "0.9.1";
+  sha256 = "1i49180fw9bxnszmqc5jl877kjhkaa22py1jwfh69slx4z3giyxq";
  buildDepends = [ nats ];
  meta = {
    homepage = "http://github.com/ekmett/semigroups/";
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@ -2,10 +2,11 @@

 cabal.mkDerivation (self: {
  pname = "skein";
-  version = "1.0.0";
-  sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa";
+  version = "1.0.1";
+  sha256 = "1mvyq6wp03fs6sjppgalaacargvi69yf5d59k473pgr1g89v4ni1";
  buildDepends = [ cereal cryptoApi tagged ];
  testDepends = [ cereal cryptoApi filepath hspec tagged ];
+  jailbreak = true;
  meta = {
    homepage = "https://github.com/meteficha/skein";
    description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@ -1,28 +1,25 @@
 { cabal, aeson, attoparsec, cereal, clientsession, comonad
 , configurator, directoryTree, dlist, errors, filepath, hashable
 , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
-, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
-, time, transformers, unorderedContainers, vector, vectorAlgorithms
-, xmlhtml
+, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, tagged
+, text, time, transformers, unorderedContainers, vector
+, vectorAlgorithms, xmlhtml
 }:

 cabal.mkDerivation (self: {
  pname = "snap";
-  version = "0.11.2";
-  sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a";
+  version = "0.11.2.2";
+  sha256 = "1fwm60rx2ginlphi00kn3ghs9rxdx4br8p4f3prpfmhvjikwgv8n";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    aeson attoparsec cereal clientsession comonad configurator
    directoryTree dlist errors filepath hashable heist lens logict
    MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
-    snapCore snapServer stm syb text time transformers
+    snapCore snapServer stm syb tagged text time transformers
    unorderedContainers vector vectorAlgorithms xmlhtml
  ];
  jailbreak = true;
-  patchPhase = ''
-    sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal
-  '';
  meta = {
    homepage = "http://snapframework.com/";
    description = "Top-level package for the Snap Web Framework";
--- a/pkgs/development/libraries/haskell/split/0.2.1.3.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "split";
-  version = "0.2.1.3";
-  sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
+  version = "0.2.2";
+  sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
  testDepends = [ QuickCheck ];
  meta = {
    description = "Combinator library for splitting lists";
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@ -6,15 +6,16 @@

 cabal.mkDerivation (self: {
  pname = "statistics";
-  version = "0.10.2.0";
-  sha256 = "1sv0fhbi52maq9c4ni109m0051a1nndi3ncz9v29mkxqzyckrp9x";
+  version = "0.10.3.1";
+  sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s";
  buildDepends = [
    deepseq erf mathFunctions monadPar mwcRandom primitive vector
    vectorAlgorithms
  ];
  testDepends = [
-    erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms
+    erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 vector
+    vectorAlgorithms
  ];
  doCheck = false;
  meta = {
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "stm-conduit";
-  version = "1.0.0";
-  sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
+  version = "1.1.0";
+  sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7";
  buildDepends = [ conduit resourcet stm stmChans transformers ];
  testDepends = [
    conduit HUnit QuickCheck stm stmChans testFramework
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "tagged";
-  version = "0.4.5";
-  sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0";
+  version = "0.6";
+  sha256 = "0w2sx6lys074y5ck2ll53dmak39pfnckbh6llgmicrj4zhgcd8jm";
  meta = {
    homepage = "http://github.com/ekmett/tagged";
    description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@ -1,17 +0,0 @@
-{ cabal, HUnit, mtl, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "testpack";
-  version = "2.1.2.1";
-  sha256 = "1fm4dy9vs2whc48cr00ncqqzz6r5yp7bvgil86idbbgi8igld5j0";
-  buildDepends = [ HUnit mtl QuickCheck random ];
-  patches = [ ./support-recent-quickcheck.patch ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
-    description = "Test Utililty Pack for HUnit and QuickCheck";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
--- a/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch
+++ b/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch
@ -1,22 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index 01fac30..0de5526 100644
--- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -128,7 +128,7 @@ Often used like this:
- >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
- -}
- qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
-+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest})
- 
- {- | Run verbose tests.  Example:
- 
-@@ -174,7 +174,7 @@ localquickCheckWithResult args p =
-               Just (rnd,_) -> return rnd
-      test MkState{ terminal          = tm
-                  , maxSuccessTests   = maxSuccess args
-                 , maxDiscardedTests = maxDiscard args
-+                 , maxDiscardedTests = 20000
-                  , computeSize       = case replay args of
-                                          Nothing    -> \n d -> (n * maxSize args)
-                                                          `div` maxSuccess args
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "utility-ht";
-  version = "0.0.8";
-  sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8";
+  version = "0.0.9";
+  sha256 = "1m5mjxwf51jd00swp1f4cimaqaral6827y1sidbq61qkw7l6ss8r";
  testDepends = [ QuickCheck ];
  meta = {
    description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@ -1,19 +1,19 @@
-{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
-, caseInsensitive, conduit, dataDefault, dateCache, fastLogger
-, hspec, httpTypes, HUnit, network, resourcet, stringsearch, text
-, time, transformers, void, wai, waiLogger, waiTest, zlib
-, zlibBindings, zlibConduit
+{ cabal, ansiTerminal, base64Bytestring, blazeBuilder
+, blazeBuilderConduit, caseInsensitive, conduit, dataDefault
+, dateCache, fastLogger, hspec, httpTypes, HUnit, network
+, resourcet, stringsearch, text, time, transformers, void, wai
+, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
 }:

 cabal.mkDerivation (self: {
  pname = "wai-extra";
-  version = "1.3.3.2";
-  sha256 = "0kw1v68a8dxpxg87r2vjah6n5906mw6cnyy2xx0jbk95qx5g5z8y";
+  version = "1.3.4";
+  sha256 = "1ay82q58pizc48rh4d8z7ybf2jjvzxqylj6mx34nvrxxlmxf5gfx";
  buildDepends = [
-    ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
-    conduit dataDefault dateCache fastLogger httpTypes network
-    resourcet stringsearch text time transformers void wai waiLogger
-    zlibConduit
+    ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
+    caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
+    network resourcet stringsearch text time transformers void wai
+    waiLogger word8 zlibConduit
  ];
  testDepends = [
    blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@ -1,16 +1,17 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, cookie, httpTypes, HUnit, network, text, transformers
-, wai
+, conduit, cookie, hspec, httpTypes, HUnit, network, text
+, transformers, wai
 }:

 cabal.mkDerivation (self: {
  pname = "wai-test";
-  version = "1.3.0.5";
-  sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw";
+  version = "1.3.1";
+  sha256 = "0dw9lbwb27yr3953ill0r727ivqav5b2ica8gbaalvnh3h5c8akg";
  buildDepends = [
    blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
    httpTypes HUnit network text transformers wai
  ];
+  testDepends = [ hspec wai ];
  meta = {
    homepage = "http://www.yesodweb.com/book/web-application-interface";
    description = "Unit test framework (built on HUnit) for WAI applications";
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@ -8,8 +8,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-auth";
-  version = "1.1.6";
-  sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
+  version = "1.1.7";
+  sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn";
  buildDepends = [
    aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
    httpConduit httpTypes liftedBase mimeMail network persistent
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@ -13,13 +13,15 @@ stdenv.mkDerivation {
    sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7";
  };

-  postUnpack = "
-    sourceRoot=\${sourceRoot}/source
-    echo Source root reset to \${sourceRoot}
-  ";
+  postUnpack = ''
+    sourceRoot=''${sourceRoot}/source
+    echo Source root reset to ''${sourceRoot}
+  '';

  configureFlags = "--disable-debug";

+  enableParallelBuilding = true;
+
  meta = {
    description = "Unicode and globalization support library";
    homepage = http://site.icu-project.org/;
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;

 stdenv.mkDerivation rec {
-  name = "libextractor-0.6.2";
+  name = "libextractor-1.0.1";

  src = fetchurl {
    url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "1pyh599717vjblyjch95r76afdxfhrzqr7nx1pz1davy5fpsw5aw";
+    sha256 = "1khy9s86vq6667h02zp2fvb16sqm27xlmr0xchgfxvsd6ascnl9j";
  };

  preConfigure =
--- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
+++ b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
@ -0,0 +1,29 @@
+From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001
+From: David Goulet <dgoulet@ev0ke.net>
+Date: Sat, 19 Jan 2013 15:53:23 -0500
+Subject: [PATCH] Fix: pass opdata when sending message fragment
+
+The inject_message callback was missing the opdata when sending message
+fragments.
+
+Signed-off-by: David Goulet <dgoulet@ev0ke.net>
+---
+ src/message.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/message.c b/src/message.c
+index 7c39529..aa71df2 100644
+--- a/src/message.c
+++ b/src/message.c
+@@ -441,7 +441,7 @@ fragment:
+ 	/* Fragment and send according to policy */
+ 	if (!err && messagep && *messagep) {
+ 	    if (context) {
+-		err = fragment_and_send(ops, NULL, context, *messagep,
+		err = fragment_and_send(ops, opdata, context, *messagep,
+ 			fragPolicy, messagep);
+ 	    }
+ 	}
+-- 
+1.7.10.4
+
--- a/pkgs/development/libraries/libotr/3.2.nix
+++ b/pkgs/development/libraries/libotr/3.2.nix
@ -0,0 +1,11 @@
+{stdenv, fetchurl, libgcrypt}:
+
+stdenv.mkDerivation {
+  name = "libotr-3.2.0";
+  src = fetchurl {
+    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
+    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
+  };
+
+  propagatedBuildInputs = [libgcrypt];
+}
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@ -1,11 +1,27 @@
 {stdenv, fetchurl, libgcrypt}:

-stdenv.mkDerivation {
-  name = "libotr-3.2.0";
+stdenv.mkDerivation rec {
+  name = "libotr-4.0.0";
  src = fetchurl {
-    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
-    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
+    urls = [
+      "http://www.cypherpunks.ca/otr/${name}.tar.gz"
+      # The site is down at the time of updating to 4.0.0, so I add this url
+      http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz
+    ];
+    sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4";
  };

-  propagatedBuildInputs = [libgcrypt];
+  # Crashes without it, still not accepted upstream.
+  # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21
+  patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ];
+
+  NIX_LDFLAGS = "-lssp";
+
+  propagatedBuildInputs = [ libgcrypt ];
+
+  meta = {
+    homepage = "http://www.cypherpunks.ca/otr/";
+    license = "LGPLv2.1";
+    description = "Library for Off-The-Record Messaging";
+  };
 }
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@ -56,6 +56,6 @@ if stdenv.system != "x86_64-linux" then throw ''

    maintainers = [ stdenv.lib.maintainers.shlevy ];

-    license = stdenv.lib.licenses.proprietary;
+    license = stdenv.lib.licenses.unfree;
  };
 }
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/pkgs/development/libraries/log4cpp/default.nix
@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "log4cpp-1.1";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
+    sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2";
+  };
+
+  meta = {
+    homepage = http://log4cpp.sourceforge.net/;
+    description = "A logging framework for C++ patterned after Apache log4j";
+    license = "LGPLv2.1+";
+  };
+}
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl }:

-let version = "4.9.5"; in
+let version = "4.9.6"; in

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

  src = fetchurl {
    url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha1 = "03885e992607e2be975f6525c6764c2167fe2eff";
+    sha256 = "1yf6sr21fisr0mlh4cq0ymcfp8nsvjskmx8dlm9mvhaw7kfzv4vn";
  };

  preConfigure = "cd mozilla/nsprpub";
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
  propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
  nativeBuildInputs = [ cmake ];
  buildInputs = [ lua5 stdenv.gcc.libc ];
+
+  crossAttrs = {
+    propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv
+      libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv
+      lua5.crossDrv stdenv.gccCross.libc ];
+  };
+
  cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";

  meta = {
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;

 stdenv.mkDerivation {
-  name = "sqlite-3.7.14.1";
+  name = "sqlite-3.7.16.1";

  src = fetchurl {
-    url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz;
-    sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc";
+    url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz;
+    sha1 = "b0d9b3e2ca3c50f72e5921e9532130787871b7ae";
  };

  buildInputs = [ readline ncurses ];
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@ -1,11 +1,19 @@
-{pkgs, pkgs_i686}:
+{pkgs, pkgs_i686, version ? "3.1"}:

+let
+  titaniumexpr = if version == "2.1" then
+    ./titaniumsdk-2.1.nix
+  else if version == "3.1" then
+    ./titaniumsdk.nix
+  else
+    throw "Unknown Titanium SDK version: ${version}";
+in
 rec {
  androidenv = pkgs.androidenv;

  xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv else null;
-
-  titaniumsdk = import ./titaniumsdk.nix {
+  
+  titaniumsdk = import titaniumexpr {
    inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
  };
  
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@ -1,19 +1,23 @@
 { nixpkgs ? <nixpkgs>
 , system ? builtins.currentSystem
+, version ? "3.1"
 }:

 let
  pkgs = import nixpkgs { inherit system; };
  pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
+  versionString = pkgs.stdenv.lib.replaceChars [ "." ] [ "_" ] version;
 in
 rec {
  kitchensink_android = import ./kitchensink {
-    inherit (pkgs) fetchgit titaniumenv;
+    inherit (pkgs) fetchgit;
+    titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs;
    target = "android";
  };
  
  kitchensink_iphone = import ./kitchensink {
-    inherit (pkgs_darwin_x86_64) fetchgit titaniumenv;
+    inherit (pkgs_darwin_x86_64) fetchgit;
+    titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs_darwin_x86_64;
    target = "iphone";
  };
  
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@ -3,7 +3,7 @@
 androidenv.emulateApp {
  name = "kitchensink";
  app = kitchensink;
-  platformVersion = "8";
+  platformVersion = "16";
  useGoogleAPIs = true;
  package = "com.appcelerator.kitchensink";
  activity = "KitchensinkActivity";
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@ -1,12 +1,12 @@
-{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "8" ]}:
+{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ]}:

 titaniumenv.buildApp {
  name = "KitchenSink";
  appId = "com.appcelerator.kitchensink";
  src = fetchgit {
    url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "0f2c0b818034cc4e6867f0aa2afc98bf77dbff02";
-    sha256 = "de31496cfb5625d7a193bbbc32a8021e4094ffab20ae13ef2e1583b0394d7c60";
+    rev = "b68757ef6639e3da564e21038dc9c1aee1f80907";
+    sha256 = "17yabdkl0p6pf2a2lcgw1kid2smwc8rnpx0i9fa4avj6930cbh5i";
  };
  
  inherit target androidPlatformVersions;
--- a/pkgs/development/mobile/titaniumenv/fixso.sed
+++ b/pkgs/development/mobile/titaniumenv/fixso.sed
@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()|
--- a/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
+++ b/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, 'libtiprofiler.so'), lib_dest_dir + 'libtiprofiler.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiprofiler.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiprofiler.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()\n|
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-2.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-2.1.nix
@ -0,0 +1,60 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "titanium-mobilesdk-2.1.4.v20121109124659";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.4.v20121109124659-linux.zip;
+    sha1 = "381eb4b06b5a261ddf336c52d4714e5626142697";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.4.v20121109124659-osx.zip;
+    sha1 = "1cef5803f0c7b7bb35feb88d3f91bbb191e3953e";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    yes y | unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+   
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd mobilesdk/*/*/android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixselfruntimev8.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    wrapProgram `pwd`/builder.py \
+      --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
+      --prefix PATH : ${jdk}/bin \
+      --prefix JAVA_HOME : ${jdk}
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+  '';
+}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@ -1,18 +1,16 @@
-{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:

 stdenv.mkDerivation {
-  name = "titanium-mobilesdk-2.1.5.v20121112144658";
-  src = if src == null then
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
-      sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
-    }
-    else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
-      sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
-    }
-    else throw "Platform: ${stdenv.system} not supported!"
-  else src;
+  name = "titanium-mobilesdk-3.1.0.v20130415184552";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-linux.zip;
+    sha1 = "7a8b34b92f6c3eff33eefb9a1b6b0d2e3670001d";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-osx.zip;
+    sha1 = "e0ed7e399a104e0838e245550197bf787a66bf98";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
  
  buildInputs = [ unzip makeWrapper ];
  
@ -34,7 +32,8 @@ stdenv.mkDerivation {
    cd mobilesdk/*/*/android
    
    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixselfruntimev8.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
    sed -i -f ${./fixnativelibs.sed} builder.py
    
    # Patch some executables
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:

 buildPerlPackage rec {
-  name = "DBD-SQLite-1.35";
+  name = "DBD-SQLite-1.37";

  src = fetchurl {
    url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-    sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z";
+    sha256 = "0197kvlziaj2wfdbzlhdlqmzvb29fmfyy6y2isbbwlg0b0f7ccd1";
  };

  propagatedBuildInputs = [ DBI ];
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`s\|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)\|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()\|`