Merge master into x-updates

74 files changed, 1684 insertions, 834 deletions

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ee2f5e9b4f61..2b075bf6a6d2 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -199,7 +199,7 @@ in
         "unix"
 
         # Misc. stuff.
-        "pcips2" "xtkbd"
+        "pcips2" "atkbd"
 
         # To wait for SCSI devices to appear.
         "scsi_wait_scan"
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index a543aa32eea5..791763ced362 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
+{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.6";
+  name = "opus-tools-0.1.8";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
+    sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4";
   };
 
-  buildInputs = [ libogg libao pkgconfig libopus ];
+  buildInputs = [ libogg libao pkgconfig libopus flac ];
 
   meta = {
     description = "Tools to work with opus encoded audio streams";
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
new file mode 100644
index 000000000000..50df35b974f6
--- /dev/null
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
+
+stdenv.mkDerivation rec {
+  name = "opusfile-0.4";
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
+    sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq";
+  };
+
+  buildInputs = [ pkgconfig openssl libogg libopus ];
+
+  meta = {
+    description = "High-level API for decoding and seeking in .opus files";
+    homepage = http://www.opus-codec.org/;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index e70d51ce857c..1531fd87b952 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.9";
+  version = "0.3.10";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
+    sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
   };
 
   buildInputs = [ qt4 alsaLib jackaudio dbus ];
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index f8160e4d6885..8748c808dc07 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl";
+    sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
   ];
 
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 689bcf89ef97..cdaeb49f14c6 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
+{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
 
 stdenv.mkDerivation rec {
 
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =  ''
-    export CLUCENE_HOME=${cluceneCore};
+    export CLUCENE_HOME=${clucene_core};
     export SWORD_HOME=${sword};
   '';
 
-  buildInputs = [ cmake sword qt4 boost cluceneCore ];
+  buildInputs = [ cmake sword qt4 boost clucene_core ];
 
   cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
 
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 6ceca2ea871f..24edc0e128a7 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, db45, gtk, bzip2 }:
+{ stdenv, fetchurl, db4, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
 
-  # Debian sources 
+  # Debian sources
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz;
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
@@ -13,12 +13,12 @@ stdenv.mkDerivation {
     url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
     sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
   };
-  
-  buildInputs = [ db45 gtk bzip2 ];
+
+  buildInputs = [ db4 gtk bzip2 ];
 
   configureFlags = "--without-libdb";
 
-  meta = { 
+  meta = {
     description = "Download utility that can fetch files from several sources simultaneously";
     homepage = http://atterer.net/jigdo/;
     license = "GPLv2";
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index ef2d846dd2e4..1d050182da33 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-281";
+  name = "xterm-300";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7";
+    sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index b44a39d87aa1..fc84f7fcecc2 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20130817-1";
+  name = "conkeror-1.0pre-20131116-1";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "refs/tags/debian-1.0--pre+git130817-1";
-    sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf";
+    rev = "refs/tags/debian-1.0--pre+git131116-1";
+    sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 49c1e5951b6d..27363482be09 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base
+, cairo, gstreamer, gst_plugins_base, icu
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -33,11 +33,7 @@ rec {
   };
 
   commonConfigureFlags =
-    [ "--enable-optimize"
-      #"--enable-profiling"
-      (if debugBuild then "--enable-debug" else "--disable-debug")
-      "--enable-strip"
-      "--with-system-jpeg"
+    [ "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
       "--with-system-nspr"
@@ -45,18 +41,24 @@ rec {
       "--with-system-libevent"
       "--with-system-libvpx"
       "--with-system-png"
-      "--enable-startup-notification"
+      "--with-system-icu"
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
       "--enable-system-cairo"
+      "--enable-gstreamer"
+      "--enable-startup-notification"
+      # "--enable-content-sandbox"            # available since 26.0, but not much info available
+      # "--enable-content-sandbox-reporter"   # keeping disabled for now
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-installer"
       "--disable-updater"
-    ];
+    ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+                        else [ "--disable-debug" "--enable-release"
+                               "--enable-optimize" "--enable-strip" ]);
 
 
   xulrunner = stdenv.mkDerivation rec {
@@ -72,7 +74,7 @@ rec {
         xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
         xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
         hunspell libevent libstartup_notification libvpx cairo
-        gstreamer gst_plugins_base
+        gstreamer gst_plugins_base icu
       ];
 
     configureFlags =
@@ -138,7 +140,7 @@ rec {
         dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
         xlibs.pixman yasm mesa sqlite file unzip pysqlite
         hunspell libevent libstartup_notification libvpx cairo
-        gstreamer gst_plugins_base
+        gstreamer gst_plugins_base icu
       ];
 
     patches = [
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
index 2e1b745790a4..a63468a9ee7e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pidgin} :
 
 stdenv.mkDerivation {
-  name = "pidgin-msn-pecan-0.1.0";
+  name = "pidgin-msn-pecan-0.1.4";
   src = fetchurl {
-    url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
-    sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
+    url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2;
+    sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index b2fd13837d79..ffc29a52aa1f 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-haze";
-  name = "${pname}-0.7.0";
+  name = "${pname}-0.8.0";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b";
+    sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
   };
 
   buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 97683ff56deb..5d44f97a1be1 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.14.1";
+  name = "${pname}-5.16.0";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
+    sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
   };
 
   buildInputs = [ telepathy_glib ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
index a60e207b7527..538a8d7f6d2b 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-rakia";
-  name = "${pname}-0.7.4";
+  name = "${pname}-0.8.0";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
-    sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
+    sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
   };
 
   nativeBuildInputs = [pkgconfigUpstream libxslt python];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 4300ac15c998..b1341af7a9d9 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
-  name = "${pname}-0.8.0";
+  name = "${pname}-0.8.1";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m";
+    sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
   };
 
   buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 63f18ee7dc4c..ad8b677a2ec5 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -12,11 +12,11 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="1.2.0";
+    version="1.2.3";
     baseName="vacuum-im";
     name="${baseName}-${version}";
     url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
-    hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc";
+    hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh";
   };
 in
 rec {
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 7e5fdc6ccd36..a5ca5e7b488f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
-, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
-, heimdal, python, lynx, lua5
-, makeDesktopItem
+{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt
+, geoip, heimdal, lua5, gtk, makeDesktopItem
 }:
 
-let version = "1.8.11"; in
+let version = "1.10.3"; in
 
 stdenv.mkDerivation {
   name = "wireshark-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
-    sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw";
+    sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61";
   };
 
   buildInputs =
-    [ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
-      glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
-    ];
+    [ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ];
 
-  configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
+  configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl";
 
   desktopItem = makeDesktopItem {
     name = "Wireshark";
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 1bdc41d1fb57..f4389716b76d 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.0";
+  name = "gnumeric-1.12.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111";
+    sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
   };
 
   configureFlags = "--disable-component";
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 579492248ea3..493af97d1567 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ng-spice-rework-24";
+  name = "ng-spice-rework-25";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz";
-    sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6";
+    url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
+    sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h";
   };
 
   buildInputs = [ readline libX11 bison libICE libXaw libXext ];
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
index 59fb1f5a867f..6373eb9f7f97 100644
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
 
+# the homepage mentions this is the final release.
+# from now on, kdesvn will be part of the official kde software distribution
 stdenv.mkDerivation rec {
-  name = "kdesvn-1.5.5";
+  name = "kdesvn-1.6.0";
 
-  src = fetchurl {
-    url = "${meta.homepage}/downloads/${name}.tar.bz2";
-    sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
+  src = fetchurl rec {
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2";
+    md5 = "7e6adc98ff4777a06d5752d3f2b58fa3";
   };
 
   prePatch = ''
     sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
   '';
 
-  patches = [ ./docbook.patch ./virtual_inheritance.patch ];
-  
-
   buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
 
   nativeBuildInputs = [ gettext ];
diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch
deleted file mode 100644
index 54f43c779580..000000000000
--- a/pkgs/applications/version-management/kdesvn/docbook.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-The name of the dtd changed in kdelibs 4.5, so we need to increase it.
-
-diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
-index 8747869..a9676aa 100644
---- a/doc/nl/index.docbook
-+++ b/doc/nl/index.docbook
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdesvn "<application>kdesvn</application>">
-   <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
-   <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
deleted file mode 100644
index faaf6afcd6ba..000000000000
--- a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
-+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
-@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
- /**
- 	@author Rajko Albrecht <ral@alwins-world.de>
- */
--class RevGraphView : virtual public QGraphicsView
-+class RevGraphView : public QGraphicsView
- {
-     Q_OBJECT
- public:
diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index 24f53884e39c..74b74037e50e 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -66,12 +66,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mplayer2-20130130";
+  name = "mplayer2-20130428";
 
   src = fetchgit {
     url = "git://git.mplayer2.org/mplayer2.git";
-    rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
-    sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
+    rev = "6c87a981baa4972fd71c25dfddea017b5a972e89";
+    sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851";
   };
 
   prePatch = ''
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index bb91ca5beb5c..e382481b6f60 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -55,11 +55,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "mpv-20130812";
+  name = "mpv-20131222";
 
   src = fetchgit {
     url = "https://github.com/mpv-player/mpv.git";
-    rev = "62925a5c15a76568c155259bafa1361ec139c66b";
+    rev = "e6bea0ec5a";
+    sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8";
   };
 
   buildInputs = with stdenv.lib;
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index ab48d74c00da..8bd5b7c6160a 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-0.8.5";
+  name = "smplayer-0.8.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw";
+    sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0";
   };
 
   buildInputs = [ qt4 ];
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
new file mode 100644
index 000000000000..2abdc51e4c6a
--- /dev/null
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
+
+let
+  loader386 = "${glibc}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc}/lib/ld-linux.so.3";
+in
+
+stdenv.mkDerivation {
+  name = "go-1.2";
+
+  src = fetchurl {
+    url = http://go.googlecode.com/files/go1.2.src.tar.gz;
+    sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
+  };
+
+  buildInputs = [ bison glibc bash makeWrapper ];
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+    cd go
+
+    patchShebangs ./ # replace /bin/bash
+    # !!! substituteInPlace does not seems to be effective.
+    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
+
+    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
+    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
+    #  src/pkg/exec/exec_test.go
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
+    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+  '';
+
+  patches = [ ./cacert-1.2.patch ];
+
+  GOOS = "linux";
+  GOARCH = if stdenv.system == "i686-linux" then "386"
+          else if stdenv.system == "x86_64-linux" then "amd64"
+          else if stdenv.system == "armv5tel-linux" then "arm"
+          else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    ./all.bash
+    cd -
+
+    # Copy the emacs configuration for Go files.
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp ./misc/emacs/* $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/go/cacert-1.2.patch b/pkgs/development/compilers/go/cacert-1.2.patch
new file mode 100644
index 000000000000..1ad6910915f1
--- /dev/null
+++ b/pkgs/development/compilers/go/cacert-1.2.patch
@@ -0,0 +1,15 @@
+Go comes with hardcoded cacert. We add the usual in NixOS,
+for easier NixOS life.
+
+diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
+index 76e79f4..6ef1dd3 100644
+--- a/src/pkg/crypto/x509/root_unix.go
++++ b/src/pkg/crypto/x509/root_unix.go
+@@ -15,6 +15,7 @@ var certFiles = []string{
+	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
+	"/etc/ssl/cert.pem",                      // OpenBSD
+	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
++	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
+ }
+ 
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index 98a6c35c8b87..f51e3ccd3c00 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,13 +21,13 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10";
-  
+  name = "ffmpeg-0.10.10";
+
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
+    sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
   };
-  
+
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
   # the resulting library is GPL'ed, so it can only be used in GPL'ed
   # applications.
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support libdc1394;
 
   enableParallelBuilding = true;
-    
+
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index a2e01fdd41f8..34d0a4e49fe7 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.3";
+  name = "ffmpeg-1.2.4";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r";
+    sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 38371ec276d1..92146c12e302 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "ffms-2.17";
-  
+stdenv.mkDerivation rec {
+  name = "ffms-2.19";
+
   src = fetchurl {
-    url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
-    sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
+    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19;
+    name = "${name}.tar.gz";
+    sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 76d1d8c41f75..c7c639f2adb8 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.0";
+  name = "gperftools-2.1";
 
   src = fetchurl {
     url = "https://gperftools.googlecode.com/files/${name}.tar.gz";
-    sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b";
+    sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";
   };
 
-  patches = [ ./glibc-2.16.patch ];
-
   buildInputs = [ libunwind ];
 
+  # some packages want to link to the static tcmalloc_minimal
+  # to drop the runtime dependency on gperftools
+  dontDisableStatic = true;
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/gperftools/glibc-2.16.patch b/pkgs/development/libraries/gperftools/glibc-2.16.patch
deleted file mode 100644
index b17e0d57f5fb..000000000000
--- a/pkgs/development/libraries/gperftools/glibc-2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gperftools-2.0/src/base/linuxthreads.cc
-===================================================================
---- gperftools-2.0.orig/src/base/linuxthreads.cc
-+++ gperftools-2.0/src/base/linuxthreads.cc
-@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
- /* Signal handler to help us recover from dying while we are attached to
-  * other threads.
-  */
--static void SignalHandler(int signum, siginfo_t *si, void *data) {
-+static void SignalHandler(int signum, struct siginfo *si, void *data) {
-   if (sig_pids != NULL) {
-     if (signum == SIGABRT) {
-       while (sig_num_threads-- > 0) {
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index e7aaaa46a96a..49c612f59e74 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.12";
+  name = "gst-ffmpeg-0.10.13";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
+    sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
   };
 
   # Upstream strongly recommends against using --with-system-ffmpeg,
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
 
   buildInputs =
-    [ pkgconfig bzip2 gst_plugins_base ]
+    [ pkgconfig bzip2 gst_plugins_base orc ]
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
index 470cc29eb8e3..a433d717039f 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libdvdnav, libdvdread }:
+, libdvdnav, libdvdread, orc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-0.10.23";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
+    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index d6717d799f17..59ee86da86d4 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
-, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
+, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
@@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
+
     sed -i 's@/bin/echo@echo@g' configure
     sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
   '';
 
   # TODO : v4l, libvisual
   buildInputs =
-    [ pkgconfig glib cairo ]
+    [ pkgconfig glib cairo orc ]
     # can't build alsaLib on darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
     ++ stdenv.lib.optionals (!minimalDeps)
@@ -37,9 +38,9 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   propagatedBuildInputs = [ gstreamer ];
- 
+
   postInstall = "rm -rf $out/share/gtk-doc";
-  
+
   meta = with stdenv.lib; {
     homepage    = http://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
@@ -48,4 +49,3 @@ stdenv.mkDerivation rec {
     platforms   = platforms.unix;
   };
 }
-
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 85468b309c55..a09f82797608 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
-, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
-, libiec61883, libavc1394, taglib, pulseaudio
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
+, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
       aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
-      taglib bzip2
+      taglib bzip2 libvpx gdk_pixbuf orc
     ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
index 3a59ef16529d..769de911fd6a 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix
new file mode 100644
index 000000000000..16b73d9bfb36
--- /dev/null
+++ b/pkgs/development/libraries/haskell/event-list/default.nix
@@ -0,0 +1,16 @@
+{ cabal, nonNegative, QuickCheck, transformers, utilityHt }:
+
+cabal.mkDerivation (self: {
+  pname = "event-list";
+  version = "0.1.0.2";
+  sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ nonNegative QuickCheck transformers utilityHt ];
+  meta = {
+    homepage = "http://code.haskell.org/~thielema/event-list/";
+    description = "Event lists with relative or absolute time stamps";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
new file mode 100644
index 000000000000..7e3ebb6476bb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskore/default.nix
@@ -0,0 +1,21 @@
+{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi
+, nonNegative, parsec, random, transformers, utilityHt
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haskore";
+  version = "0.2.0.3";
+  sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    dataAccessor eventList haskellSrc markovChain midi nonNegative
+    parsec random transformers utilityHt
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Haskore";
+    description = "The Haskore Computer Music System";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix
new file mode 100644
index 000000000000..5907fce4f176
--- /dev/null
+++ b/pkgs/development/libraries/haskell/markov-chain/default.nix
@@ -0,0 +1,14 @@
+{ cabal, random, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "markov-chain";
+  version = "0.0.3.2";
+  sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk";
+  buildDepends = [ random transformers ];
+  meta = {
+    homepage = "http://code.haskell.org/~thielema/markov-chain/";
+    description = "Markov Chains for generating random sequences with a user definable behaviour";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
new file mode 100644
index 000000000000..e50843c6ff23
--- /dev/null
+++ b/pkgs/development/libraries/haskell/midi/default.nix
@@ -0,0 +1,21 @@
+{ cabal, binary, eventList, explicitException, monoidTransformer
+, nonNegative, QuickCheck, random, transformers, utilityHt
+}:
+
+cabal.mkDerivation (self: {
+  pname = "midi";
+  version = "0.2.1";
+  sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary eventList explicitException monoidTransformer nonNegative
+    QuickCheck random transformers utilityHt
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/MIDI";
+    description = "Handling of MIDI messages and files";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
new file mode 100644
index 000000000000..d4e5962ec858
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "monoid-transformer";
+  version = "0.0.2";
+  sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j";
+  meta = {
+    description = "Monoid counterparts to some ubiquitous monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
new file mode 100644
index 000000000000..7b14fabd8b15
--- /dev/null
+++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
@@ -0,0 +1,14 @@
+{ cabal, protocolBuffers }:
+
+cabal.mkDerivation (self: {
+  pname = "protocol-buffers-descriptor";
+  version = "2.0.14";
+  sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3";
+  buildDepends = [ protocolBuffers ];
+  meta = {
+    homepage = "http://code.haskell.org/protocol-buffers/";
+    description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
new file mode 100644
index 000000000000..bf74e4fc4d63
--- /dev/null
+++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
@@ -0,0 +1,14 @@
+{ cabal, binary, filepath, mtl, syb, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "protocol-buffers";
+  version = "2.0.14";
+  sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i";
+  buildDepends = [ binary filepath mtl syb utf8String ];
+  meta = {
+    homepage = "http://code.haskell.org/protocol-buffers/";
+    description = "Parse Google Protocol Buffer specifications";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix
new file mode 100644
index 000000000000..4a299e9f556e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, attoparsec, dataDefault, mtl, network
+, protocolBuffers, protocolBuffersDescriptor, text, time
+, unorderedContainers, utf8String, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "rethinkdb";
+  version = "1.8.0.5";
+  sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq";
+  buildDepends = [
+    aeson attoparsec dataDefault mtl network protocolBuffers
+    protocolBuffersDescriptor text time unorderedContainers utf8String
+    vector
+  ];
+  meta = {
+    homepage = "http://github.com/atnnn/haskell-rethinkdb";
+    description = "RethinkDB is a distributed document store with a powerful query language";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
index bf5f2f0d0a70..ac6cfdd43ae1 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix
@@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2,"
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
+      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5,"
   '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix
index f7b9a7aea811..de876fa7f67a 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.2.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix
@@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2,"
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
+      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
   '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 983fabc041e2..e62fa2fa1c5f 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
-, apr, aprutil, db45, expat
+, apr, aprutil, db4, expat
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
        src/main/cpp/socketoutputstream.cpp
   '';
 
-  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
+  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat];
 
   meta = {
     homepage = http://logging.apache.org/log4cxx/index.html;
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
new file mode 100644
index 000000000000..9c6c8e5e3340
--- /dev/null
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.1";
+  name = "mdds-${version}";
+
+  src = fetchurl {
+    url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
+    sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
+  };
+
+  meta = {
+    homepage = https://code.google.com/p/multidimalgorithm/;
+    description = "A collection of multi-dimensional data structure and indexing algorithm";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index cb534cfbf313..0525043b6cf1 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -13,11 +13,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="simgear";
-    version="2.12.0";
+    version="2.12.1";
     name="${baseName}-${version}";
     extension="tar.bz2";
     url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
-    hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f";
+    hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4";
   };
 in
 rec {
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 3486981463f3..bd177ffc6600 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}:
+{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg";
   };
 
-  buildInputs = [ pkgconfig icu cluceneCore curl ];
+  buildInputs = [ pkgconfig icu clucene_core curl ];
 
   # because curl/types.h disappeared since at least curl 7.21.7
   patches = [ ./dont_include_curl_types_h.patch ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 12bbe0914e0e..b2c2f0d0851b 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tcllib-${version}";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
-    sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x";
+    sha256 = "1zdzaqdpxljsaabgknq3paakgs262qy255ib4p329knsv608jc3d";
   };
 
   passthru = {
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 8c08a342a903..f44e4cbcd8b2 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-glib-0.20.4";
+  name = "telepathy-glib-0.22.0";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9";
+    sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
   };
 
   propagatedBuildInputs = [dbus_glib glib python];
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index 6ba7f9f8d024..c26347c52437 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, python, db4}:
 
-stdenv.mkDerivation {
-  name = "bsddb3-4.5.0";
+stdenv.mkDerivation rec {
+  name = "bsddb3-6.0.1";
   src = fetchurl {
-    url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz;
-    sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v";
+    url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
+    md5 = "2b22ab1b4d896961c30e4106660e9139";
   };
   buildInputs = [python];
   buildPhase = "true";
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index b35ad14b32c1..e3bd4ac7a5a9 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "bison-3.0.2";
 
   src = fetchurl {
-    url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2";
+    url = "mirror://gnu/bison/${name}.tar.gz";
+    sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 3a619220bcf8..fb51985afd1e 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.4";
+  version = "1.4.1";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
+    sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 01ce5f423c35..40a0d7af4968 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }:
 
 /*
 About Vim and plugins
@@ -197,6 +197,22 @@ in rec
     };
   };
 
+  golang = simpleDerivation {
+    name = "vim-golang-20131127";
+    src = fetchgit {
+      url = "https://github.com/jnwhiteh/vim-golang.git";
+      rev = "832d64e5a813511ed52217aa24f0255c49671bab";
+    };
+    path = "golang";
+    meta = with stdenv.lib; {
+      description = "Vim plugins for Go";
+      homepage    = https://github.com/jnwhiteh/vim-golang;
+      license     = licenses.publicDomain;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
   ipython = simpleDerivation {
     name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960";
     src = fetchurl {
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 4de8ad6db0f4..702ebc5d8284 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.2";
+  name = "powertop-2.5";
 
   src = fetchurl {
     url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
-    sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k";
+    sha256 = "02rwqbpasdayl201v0549gbp2f82rd0hqiv3i111r7npanjhhb4b";
   };
 
   buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
new file mode 100644
index 000000000000..e81ccb396322
--- /dev/null
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }:
+
+stdenv.mkDerivation rec {
+  name = "rethinkdb-1.11.2";
+
+  src = fetchurl {
+    url = "http://download.rethinkdb.com/dist/${name}.tgz";
+    sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj";
+  };
+
+  preConfigure = ''
+    export ALLOW_WARNINGS=1
+    patchShebangs .
+  '';
+
+  configureFlags = "--lib-path ${gperftools}/lib";
+
+  buildInputs = [ protobuf v8 ncurses boost ];
+
+  nativeBuildInputs = [ which m4 ];
+
+
+  meta = {
+    description = "An open-source distributed database built with love";
+    longDescription = ''
+      RethinkDB is built to store JSON documents, and scale to multiple machines with very little
+      effort. It has a pleasant query language that supports really useful queries like table joins
+      and group by, and is easy to setup and learn.
+    '';
+    homepage = http://www.rethinkdb.com;
+    license = "AGPLv3";
+
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index a94c05d5627e..a41343c0cf90 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -30,10 +30,10 @@ rec {
   };
 
   squid32 = squid30.merge rec {
-    name = "squid-3.2.2";
+    name = "squid-3.2.13";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
-      sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l";
+      sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
     };
     buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
       libtool openssl];
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index b8995430f92a..d7d1533b3be3 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, buildPythonPackage
 , python, cython, pkgconfig
 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
-, ffmpeg_1, x264, libvpx, pil, libwebp }:
+, ffmpeg, x264, libvpx, pil, libwebp }:
 
 buildPythonPackage rec {
   name = "xpra-0.9.5";
-  
+
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.bz2";
     sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw";
   };
 
-  buildInputs = [ 
-    python cython pkgconfig 
+  buildInputs = [
+    python cython pkgconfig
 
     xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
     xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
@@ -21,10 +21,10 @@ buildPythonPackage rec {
 
     pango cairo gdk_pixbuf atk gtk glib
 
-    ffmpeg_1 libvpx x264 libwebp
+    ffmpeg libvpx x264 libwebp
   ];
 
-  propagatedBuildInputs = [ 
+  propagatedBuildInputs = [
     pil pygtk pygobject
   ];
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
     python ./setup.py build --enable-Xdummy
   '';
-  
+
   meta = {
     homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 9d00288f6940..26ffc9d50c25 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
 
 stdenv.mkDerivation rec {
   name = "netatalk-3.1.0";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
   };
 
-  buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ];
+  buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
 
   configureFlags = [
-    "--with-bdb=${db48}"
+    "--with-bdb=${db4}"
     "--with-openssl=${openssl}"
   ];
 
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 2ec7f433596c..09d8e888837e 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, flex, bdb}:
+{fetchurl, stdenv, flex, db4}:
 
 stdenv.mkDerivation rec {
   name = "bogofilter-1.2.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   # FIXME: We would need `pax' as a "propagated build input" (for use
   # by the `bf_tar' script) but we don't have it currently.
 
-  buildInputs = [ flex bdb ];
+  buildInputs = [ flex db4 ];
 
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index cab3e69688ca..eb6baf41fe47 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2013.12.17.2";
+  version = "2013.12.20";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv";
+    sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 91061a457d41..ae0007c1f2d0 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, sysstat, unzip }:
 
 stdenv.mkDerivation rec {
-    version = "3.8.0";
+    version = "4.0.1";
     name = "dd-agent-${version}";
 
     src = fetchurl {
       url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
+      sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1";
     };
 
     buildInputs = [ python unzip ];
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index f987d6fa6bac..acea2d6da6a9 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.4.0";
+  name = "tcpdump-4.5.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj";
+    sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql";
   };
 
   buildInputs = [ libpcap ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index c4e955056f4f..97020ce2e42f 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
+{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.2.7";
+  name = "rsyslog-7.4.7";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz;
-    sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
+    sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];
+  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
 
-  configureFlags = "--enable-gnutls";
+  preConfigure = ''
+     export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
+  '';
 
   meta = {
     homepage = "http://www.rsyslog.com/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b22f287b24..224a61754dd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -392,8 +392,9 @@ let
 
   acct = callPackage ../tools/system/acct { };
 
-  acoustidFingerprinter = callPackage
-    ../tools/audio/acoustid-fingerprinter { };
+  acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
+    ffmpeg = ffmpeg_1;
+  };
 
   actdiag = pythonPackages.actdiag;
 
@@ -612,9 +613,7 @@ let
     inherit unzip;
   };
 
-  bogofilter = callPackage ../tools/misc/bogofilter {
-    bdb = db4;
-  };
+  bogofilter = callPackage ../tools/misc/bogofilter { };
 
   bsdiff = callPackage ../tools/compression/bsdiff { };
 
@@ -643,8 +642,7 @@ let
   cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
 
   cfdg = builderDefsPackage ../tools/graphics/cfdg {
-    inherit libpng bison flex;
-    ffmpeg = ffmpeg_1;
+    inherit libpng bison flex ffmpeg;
   };
 
   checkinstall = callPackage ../tools/package-management/checkinstall { };
@@ -1205,7 +1203,9 @@ let
 
   klavaro = callPackage ../games/klavaro {};
 
-  minidlna = callPackage ../tools/networking/minidlna { };
+  minidlna = callPackage ../tools/networking/minidlna {
+    ffmpeg = ffmpeg_0_10;
+  };
 
   mmv = callPackage ../tools/misc/mmv { };
 
@@ -2792,7 +2792,9 @@ let
     else
       callPackage ../development/compilers/go/1.1.nix { };
 
-  go = go_1_1;
+  go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
+
+  go = go_1_2;
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
@@ -3334,7 +3336,6 @@ let
   regina = callPackage ../development/interpreters/regina {};
 
   renpy = callPackage ../development/interpreters/renpy {
-    ffmpeg = ffmpeg_1;
     wrapPython = pythonPackages.wrapPython;
   };
 
@@ -4022,9 +4023,9 @@ let
 
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
 
-  clucene_core = callPackage ../development/libraries/clucene-core { };
+  clucene_core_1 = callPackage ../development/libraries/clucene-core { };
 
-  cluceneCore = clucene_core; # !!! remove this
+  clucene_core = clucene_core_1;
 
   clutter = callPackage ../development/libraries/clutter { };
 
@@ -4057,7 +4058,7 @@ let
 
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
 
-  db4 = db45;
+  db4 = db48;
 
   db44 = callPackage ../development/libraries/db4/db4-4.4.nix { };
 
@@ -4129,20 +4130,20 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg = callPackage ../development/libraries/ffmpeg {
+  ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
     vpxSupport = !stdenv.isMips;
-
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
   };
 
-  ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
+  ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
     vpxSupport = !stdenv.isMips;
   };
 
-  ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
+  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     vpxSupport = !stdenv.isMips;
+
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
@@ -4155,6 +4156,8 @@ let
     texinfo = texinfo5;
   };
 
+  ffmpeg = ffmpeg_2;
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw {
@@ -4416,7 +4419,9 @@ let
 
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {};
 
-  gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {};
+  gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {
+    ffmpeg = ffmpeg_0_10;
+  };
 
   gst_python = callPackage ../development/libraries/gstreamer/gst-python {};
 
@@ -5245,12 +5250,11 @@ let
 
   lzo = callPackage ../development/libraries/lzo { };
 
+  mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
   mdds = callPackage ../development/libraries/mdds { };
 
   # failed to build
-  mediastreamer = callPackage ../development/libraries/mediastreamer {
-    ffmpeg = ffmpeg_1;
-  };
+  mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
@@ -5294,9 +5298,7 @@ let
 
   mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
 
-  mlt = callPackage ../development/libraries/mlt {
-    ffmpeg = ffmpeg_1;
-  };
+  mlt = callPackage ../development/libraries/mlt { };
 
   libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
 
@@ -5397,12 +5399,9 @@ let
 
   openct = callPackage ../development/libraries/openct { };
 
-  opencv = callPackage ../development/libraries/opencv {
-    ffmpeg = ffmpeg_0_6_90;
-  };
+  opencv = callPackage ../development/libraries/opencv { };
 
   opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
-    ffmpeg = ffmpeg_0_6_90;
     libpng = libpng12;
   };
 
@@ -5427,6 +5426,7 @@ let
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {
     giflib = giflib_4_1;
+    ffmpeg = ffmpeg_0_10;
   };
 
   openssl = callPackage ../development/libraries/openssl {
@@ -5863,20 +5863,22 @@ let
       inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild
       inherit gtk3 glib atk cairo pango fontconfig freetype;
       inherit (gnome) gtkdoc libsoup;
-      inherit pkgconfig libtool intltool autoconf automake gperf bison flex
+      inherit pkgconfig libtool intltool autoconf automake gperf flex
         libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
         which libproxy geoclue enchant python ruby perl mesa xlibs;
       inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
+      bison = bison2;
     };
 
   webkit_gtk2 =
     builderDefsPackage ../development/libraries/webkit/gtk2.nix {
       inherit gtk2 glib atk cairo pango fontconfig freetype;
       inherit (gnome) gtkdoc libsoup;
-      inherit pkgconfig libtool intltool autoconf automake gperf bison flex
+      inherit pkgconfig libtool intltool autoconf automake gperf flex
         libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
         which libproxy geoclue enchant python ruby perl mesa xlibs;
       inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
+      bison = bison2;
     };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
@@ -5928,7 +5930,9 @@ let
 
   xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
 
-  xineLib = callPackage ../development/libraries/xine-lib { };
+  xineLib = callPackage ../development/libraries/xine-lib {
+    ffmpeg = ffmpeg_1;
+  };
 
   xautolock = callPackage ../misc/screensavers/xautolock { };
 
@@ -6302,9 +6306,7 @@ let
 
   mailman = callPackage ../servers/mail/mailman { };
 
-  mediatomb = callPackage ../servers/mediatomb {
-    ffmpeg = ffmpeg_0_6_90;
-  };
+  mediatomb = callPackage ../servers/mediatomb { };
 
   memcached = callPackage ../servers/memcached {};
 
@@ -6432,6 +6434,8 @@ let
 
   restund = callPackage ../servers/restund {};
 
+  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;
@@ -7503,7 +7507,9 @@ let
 
   audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity { };
+  audacity = callPackage ../applications/audio/audacity {
+    ffmpeg = ffmpeg_0_10;
+  };
 
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
@@ -7531,7 +7537,9 @@ let
   };
   awesome = awesome-3-5;
 
-  baresip = callPackage ../applications/networking/instant-messengers/baresip {};
+  baresip = callPackage ../applications/networking/instant-messengers/baresip {
+    ffmpeg = ffmpeg_1;
+  };
 
   batik = callPackage ../applications/graphics/batik { };
 
@@ -7548,9 +7556,7 @@ let
 
   bibletime = callPackage ../applications/misc/bibletime { };
 
-  bitcoin = callPackage ../applications/misc/bitcoin {
-    db4 = db48;
-  };
+  bitcoin = callPackage ../applications/misc/bitcoin { };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
     # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
@@ -7941,8 +7947,9 @@ let
       lib flex bison cairo fontconfig
       gdal zlib ncurses gdbm proj pkgconfig swig
       blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
-      readline sqlite tcl tk libtiff freetype ffmpeg makeWrapper wxGTK;
+      readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
     fftw = fftwSinglePrec;
+    ffmpeg = ffmpeg_0_10;
     motif = lesstif;
     opendwg = libdwg;
     wxPython = wxPython28;
@@ -8020,13 +8027,13 @@ let
   xfontsel = callPackage ../applications/misc/xfontsel { };
   xlsfonts = callPackage ../applications/misc/xlsfonts { };
 
-  freerdp = callPackage ../applications/networking/remote/freerdp { };
+  freerdp = callPackage ../applications/networking/remote/freerdp {
+    ffmpeg = ffmpeg_1;
+  };
 
   freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
 
-  freicoin = callPackage ../applications/misc/freicoin {
-    db4 = db48;
-  };
+  freicoin = callPackage ../applications/misc/freicoin { };
 
   fspot = callPackage ../applications/graphics/f-spot {
     inherit (gnome) libgnome libgnomeui;
@@ -8368,6 +8375,7 @@ let
     poppler = poppler_0_18;
     clucene_core = clucene_core_2;
     lcms = lcms2;
+    mdds = mdds_0_7_1;
   };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea { };
@@ -8512,9 +8520,7 @@ let
     pulseSupport = config.pulseaudio or false;
   };
 
-  mplayer2 = callPackage ../applications/video/mplayer2 {
-    ffmpeg = ffmpeg_1;
-  };
+  mplayer2 = callPackage ../applications/video/mplayer2 { };
 
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
@@ -8525,7 +8531,7 @@ let
     };
 
   mpv = callPackage ../applications/video/mpv {
-    ffmpeg = ffmpeg_1;
+    ffmpeg = ffmpeg_2;
     bs2bSupport = true;
     quviSupport = true;
     cacaSupport = true;
@@ -8648,6 +8654,8 @@ let
     inherit (pkgs.kde4) kdelibs;
   };
 
+  opusfile = callPackage ../applications/audio/opusfile { };
+
   opusTools = callPackage ../applications/audio/opus-tools { };
 
   pan = callPackage ../applications/networking/newsreaders/pan {
@@ -9106,9 +9114,7 @@ let
     inherit (xlibs) libX11;
   };
 
-  vlc = callPackage ../applications/video/vlc {
-    ffmpeg = ffmpeg_1;
-  };
+  vlc = callPackage ../applications/video/vlc { };
 
   vnstat = callPackage ../applications/networking/vnstat { };
 
@@ -9189,10 +9195,8 @@ let
           ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
           ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
          );
-      libs =
-        if cfg.enableQuakeLive or false
-        then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
-        else [ ];
+      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
+             (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
       gtk_modules = [ libcanberra ];
     };
 
@@ -9212,7 +9216,9 @@ let
 
   xbindkeys = callPackage ../tools/X11/xbindkeys { };
 
-  xbmc = callPackage ../applications/video/xbmc { };
+  xbmc = callPackage ../applications/video/xbmc {
+    ffmpeg = ffmpeg_1;
+  };
 
   xca = callPackage ../applications/misc/xca { };
 
@@ -9692,7 +9698,6 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libusb = libusb1;
-      ffmpeg = ffmpeg_1;
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.10;
 
@@ -9701,7 +9706,6 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libusb = libusb1;
-      ffmpeg = ffmpeg_1;
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.11;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a837314cee1d..4f42f9912554 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -981,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
 
+  eventList = callPackage ../development/libraries/haskell/event-list {};
+
   exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; };
 
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
@@ -1205,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
+  haskore = callPackage ../development/libraries/haskell/haskore {};
+
   hastache = callPackage ../development/libraries/haskell/hastache {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
@@ -1498,6 +1502,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
 
+  markovChain = callPackage ../development/libraries/haskell/markov-chain {};
+
   maude = callPackage ../development/libraries/haskell/maude {};
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
@@ -1506,6 +1512,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
 
+  midi = callPackage ../development/libraries/haskell/midi {};
+
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {};
@@ -1552,6 +1560,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
 
+  monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {};
+
   mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
 
   monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {};
@@ -1813,6 +1823,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     fgl = self.fgl_5_4_2_4;
   };
 
+  protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
+
+  protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};
+
   PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
 
   publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
@@ -1925,6 +1939,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   resourcet = callPackage ../development/libraries/haskell/resourcet {};
 
+  rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
+
   rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
 
   rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 9baf51c2d3d8..92f23ed14007 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -364,6 +364,26 @@
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.15";
+  by-spec."ascli"."*" =
+    self.by-version."ascli"."0.3.0";
+  by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ascli-0.3.0";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
+        sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ascli" or []);
+    deps = [
+      self.by-version."colour"."0.7.1"
+      self.by-version."optjs"."3.2.1-boom"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ascli" ];
+  };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -509,35 +529,53 @@
     self.by-version."async"."0.2.9";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.9";
+  by-spec."async-foreach"."~0.1.3" =
+    self.by-version."async-foreach"."0.1.3";
+  by-version."async-foreach"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "async-foreach-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz";
+        sha1 = "36121f845c0578172de419a97dbeb1d16ec34542";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async-foreach" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async-foreach" ];
+  };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.0.0-rc1";
-  by-version."aws-sdk"."2.0.0-rc1" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-2.0.0-rc1";
+    self.by-version."aws-sdk"."2.0.0-rc2";
+  by-version."aws-sdk"."2.0.0-rc2" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-2.0.0-rc2";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc1.tgz";
-        sha1 = "8f3b045ffa2050695a692f12ea76eff6d01a2349";
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc2.tgz";
+        sha1 = "26087265045b9506749244c9a2beb5611b18dc59";
       })
     ];
     buildInputs =
       (self.nativeDeps."aws-sdk" or []);
     deps = [
       self.by-version."xml2js"."0.2.4"
-      self.by-version."xmlbuilder"."1.0.2"
+      self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc2";
   by-spec."aws-sdk".">=1.2.0 <2" =
-    self.by-version."aws-sdk"."1.13.0";
-  by-version."aws-sdk"."1.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.13.0";
+    self.by-version."aws-sdk"."1.14.0";
+  by-version."aws-sdk"."1.14.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-1.14.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.13.0.tgz";
-        sha1 = "575b56296006d555bc0d14c1109174d44c194545";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.14.0.tgz";
+        sha1 = "e79b92cda9a74522ad90d0d8357eb01fd14de008";
       })
     ];
     buildInputs =
@@ -586,6 +624,24 @@
     ];
     passthru.names = [ "aws-sign" ];
   };
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sign2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sign2" ];
+  };
   by-spec."backbone"."*" =
     self.by-version."backbone"."1.1.0";
   by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -825,7 +881,7 @@
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
-      self.by-version."junk"."0.2.1"
+      self.by-version."junk"."0.2.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."mout"."0.7.1"
       self.by-version."nopt"."2.1.2"
@@ -837,12 +893,12 @@
       self.by-version."request"."2.27.0"
       self.by-version."request-progress"."0.3.1"
       self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."semver"."2.1.0"
       self.by-version."stringify-object"."0.1.7"
       self.by-version."sudo-block"."0.2.1"
-      self.by-version."tar"."0.1.18"
-      self.by-version."tmp"."0.0.22"
+      self.by-version."tar"."0.1.19"
+      self.by-version."tmp"."0.0.23"
       self.by-version."update-notifier"."0.1.7"
       self.by-version."which"."1.0.5"
       self.by-version."p-throttler"."0.0.1"
@@ -976,7 +1032,7 @@
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -1046,7 +1102,7 @@
     deps = [
       self.by-version."hat"."0.0.3"
       self.by-version."connect"."2.11.2"
-      self.by-version."request"."2.27.0"
+      self.by-version."request"."2.29.0"
     ];
     peerDependencies = [
     ];
@@ -1096,7 +1152,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bson/-/bson-0.2.3.tgz";
-        sha1 = "d9f6c343fd9f146e27da03b60f2e13e1406a1aea";
+        sha1 = "7651d2c4ec7cb90d10b5de0ef61663273b784839";
       })
     ];
     buildInputs =
@@ -1205,6 +1261,25 @@
     ];
     passthru.names = [ "bunyan" ];
   };
+  by-spec."bytebuffer".">=2.1 && <3" =
+    self.by-version."bytebuffer"."2.1.0";
+  by-version."bytebuffer"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bytebuffer-2.1.0";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.1.0.tgz";
+        sha1 = "931ae9a46fcb3868614ad3368a569dc7ce4e9ab9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bytebuffer" or []);
+    deps = [
+      self.by-version."long"."1.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bytebuffer" ];
+  };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1363,45 +1438,43 @@
   };
   by-spec."chalk"."~0.2.1" =
     self.by-version."chalk"."0.2.1";
-  by-spec."character-parser"."1.2.0" =
-    self.by-version."character-parser"."1.2.0";
-  by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "character-parser-1.2.0";
+  by-spec."chalk"."~0.3.0" =
+    self.by-version."chalk"."0.3.0";
+  by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chalk-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
-        sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz";
+        sha1 = "1c98437737f1199ebcc1d4c48fd41b9f9c8e8f23";
       })
     ];
     buildInputs =
-      (self.nativeDeps."character-parser" or []);
+      (self.nativeDeps."chalk" or []);
     deps = [
+      self.by-version."has-color"."0.1.1"
+      self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "character-parser" ];
+    passthru.names = [ "chalk" ];
   };
-  by-spec."cheerio"."~0.10.8" =
-    self.by-version."cheerio"."0.10.8";
-  by-version."cheerio"."0.10.8" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.10.8";
+  by-spec."character-parser"."1.2.0" =
+    self.by-version."character-parser"."1.2.0";
+  by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "character-parser-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.10.8.tgz";
-        sha1 = "ece5ad0c8baa9b9adc87394bbdb1c68bc4552ba0";
+        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
+        sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
       })
     ];
     buildInputs =
-      (self.nativeDeps."cheerio" or []);
+      (self.nativeDeps."character-parser" or []);
     deps = [
-      self.by-version."cheerio-select"."0.0.3"
-      self.by-version."htmlparser2"."2.6.0"
-      self.by-version."underscore"."1.4.4"
-      self.by-version."entities"."0.3.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "cheerio" ];
+    passthru.names = [ "character-parser" ];
   };
   by-spec."cheerio"."~0.12.0" =
     self.by-version."cheerio"."0.12.4";
@@ -1578,25 +1651,6 @@
     ];
     passthru.names = [ "cli-color" ];
   };
-  by-spec."cli-table"."~0.2.0" =
-    self.by-version."cli-table"."0.2.0";
-  by-version."cli-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cli-table-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli-table/-/cli-table-0.2.0.tgz";
-        sha1 = "34c63eb532c206e9e5e4ae0cb0104bd1fd27317c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli-table" or []);
-    deps = [
-      self.by-version."colors"."0.3.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli-table" ];
-  };
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
   by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -1719,13 +1773,13 @@
   };
   by-spec."coffee-script"."~1.6" =
     self.by-version."coffee-script"."1.6.3";
-  by-spec."coffee-script-redux"."git://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" =
+  by-spec."coffee-script-redux"."git+https://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" =
     self.by-version."coffee-script-redux"."2.0.0-beta4";
   by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage {
     name = "coffee-script-redux-2.0.0-beta4";
     src = [
       (fetchgit {
-        url = "git://github.com/michaelficarra/CoffeeScriptRedux.git";
+        url = "https://github.com/michaelficarra/CoffeeScriptRedux.git";
         rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3";
         sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d";
       })
@@ -1797,24 +1851,6 @@
     ];
     passthru.names = [ "color-string" ];
   };
-  by-spec."colors"."0.3.0" =
-    self.by-version."colors"."0.3.0";
-  by-version."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-0.3.0.tgz";
-        sha1 = "c247d64d34db0ca4dc8e43f3ecd6da98d0af94e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
-  };
   by-spec."colors"."0.5.x" =
     self.by-version."colors"."0.5.1";
   by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -1875,6 +1911,24 @@
     self.by-version."colors"."0.6.2";
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
+  by-spec."colour"."*" =
+    self.by-version."colour"."0.7.1";
+  by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "colour-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
+        sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colour" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colour" ];
+  };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.4";
   by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -2015,22 +2069,23 @@
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
   by-spec."configstore"."~0.1.0" =
-    self.by-version."configstore"."0.1.5";
-  by-version."configstore"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "configstore-0.1.5";
+    self.by-version."configstore"."0.1.6";
+  by-version."configstore"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "configstore-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.1.5.tgz";
-        sha1 = "807cfd60ef69c87f4a7b60561d940190a438503e";
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.1.6.tgz";
+        sha1 = "3a437dd231db3da8d2d0d6b7be2da64d87a397a6";
       })
     ];
     buildInputs =
       (self.nativeDeps."configstore" or []);
     deps = [
-      self.by-version."lodash"."1.3.1"
+      self.by-version."lodash"."2.4.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."js-yaml"."2.1.3"
       self.by-version."osenv"."0.0.3"
+      self.by-version."graceful-fs"."2.0.1"
     ];
     peerDependencies = [
     ];
@@ -2273,13 +2328,13 @@
     passthru.names = [ "connect-flash" ];
   };
   by-spec."connect-jade-static"."*" =
-    self.by-version."connect-jade-static"."0.1.1";
-  by-version."connect-jade-static"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-jade-static-0.1.1";
+    self.by-version."connect-jade-static"."0.1.3";
+  by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-jade-static-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.1.tgz";
-        sha1 = "11d16fa00aca28cb004e89cd0a7d6b0fa0342cdb";
+        url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz";
+        sha1 = "ad0e0538c9124355d6da03de13fae63f7b5e0b1b";
       })
     ];
     buildInputs =
@@ -2291,7 +2346,7 @@
     ];
     passthru.names = [ "connect-jade-static" ];
   };
-  "connect-jade-static" = self.by-version."connect-jade-static"."0.1.1";
+  "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3";
   by-spec."connect-mongo"."*" =
     self.by-version."connect-mongo"."0.4.0";
   by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -2305,13 +2360,31 @@
     buildInputs =
       (self.nativeDeps."connect-mongo" or []);
     deps = [
-      self.by-version."mongodb"."1.3.20"
+      self.by-version."mongodb"."1.3.19"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "connect-mongo" ];
   };
   "connect-mongo" = self.by-version."connect-mongo"."0.4.0";
+  by-spec."connection-parse"."0.0.x" =
+    self.by-version."connection-parse"."0.0.7";
+  by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "connection-parse-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+        sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connection-parse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connection-parse" ];
+  };
   by-spec."console-browserify"."0.1.x" =
     self.by-version."console-browserify"."0.1.6";
   by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage {
@@ -2343,7 +2416,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.6"
+      self.by-version."uglify-js"."2.4.7"
     ];
     peerDependencies = [
     ];
@@ -2542,7 +2615,7 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.27.0"
+      self.by-version."request"."2.29.0"
     ];
     peerDependencies = [
     ];
@@ -2551,13 +2624,13 @@
   by-spec."couch-login"."~0.1.18" =
     self.by-version."couch-login"."0.1.19";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.5.0";
-  by-version."coveralls"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.5.0";
+    self.by-version."coveralls"."2.6.0";
+  by-version."coveralls"."2.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.5.0.tgz";
-        sha1 = "96d9bdb844438cd98ee9cdcb435a4d6d6aea326f";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.0.tgz";
+        sha1 = "4bee45246010b5f99d803ebc48ad5b3858708274";
       })
     ];
     buildInputs =
@@ -2572,7 +2645,7 @@
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.5.0";
+  "coveralls" = self.by-version."coveralls"."2.6.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -2928,6 +3001,31 @@
     ];
     passthru.names = [ "debuglog" ];
   };
+  by-spec."decompress"."~0.1.0" =
+    self.by-version."decompress"."0.1.4";
+  by-version."decompress"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.4.tgz";
+        sha1 = "b5608768911f794017bfb8017344be6a7cfaf919";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."decompress" or []);
+    deps = [
+      self.by-version."adm-zip"."0.4.3"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mout"."0.6.0"
+      self.by-version."rimraf"."2.2.5"
+      self.by-version."stream-combiner"."0.0.2"
+      self.by-version."tar"."0.1.19"
+      self.by-version."temp"."0.6.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "decompress" ];
+  };
   by-spec."decompress-zip"."~0.0.3" =
     self.by-version."decompress-zip"."0.0.3";
   by-version."decompress-zip"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -3162,25 +3260,6 @@
     ];
     passthru.names = [ "domhandler" ];
   };
-  by-spec."domutils"."1.0" =
-    self.by-version."domutils"."1.0.1";
-  by-version."domutils"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "domutils-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.0.1.tgz";
-        sha1 = "58b58d774774911556c16b8b02d99c609d987869";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domutils" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domutils" ];
-  };
   by-spec."domutils"."1.1" =
     self.by-version."domutils"."1.1.6";
   by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage {
@@ -3219,6 +3298,29 @@
     ];
     passthru.names = [ "domutils" ];
   };
+  by-spec."download"."~0.1.6" =
+    self.by-version."download"."0.1.7";
+  by-version."download"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz";
+        sha1 = "78be2278a5600e515eff6b01cbf41d694baee855";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."download" or []);
+    deps = [
+      self.by-version."decompress"."0.1.4"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."request"."2.25.0"
+      self.by-version."through2"."0.1.0"
+      self.by-version."async-foreach"."0.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "download" ];
+  };
   by-spec."dtrace-provider"."0.2.8" =
     self.by-version."dtrace-provider"."0.2.8";
   by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -3237,6 +3339,24 @@
     ];
     passthru.names = [ "dtrace-provider" ];
   };
+  by-spec."duplexer"."~0.0.3" =
+    self.by-version."duplexer"."0.0.4";
+  by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "duplexer-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz";
+        sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."duplexer" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "duplexer" ];
+  };
   by-spec."editor"."0.0.5" =
     self.by-version."editor"."0.0.5";
   by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -3384,20 +3504,21 @@
   };
   "escape-html" = self.by-version."escape-html"."1.0.0";
   by-spec."escodegen"."*" =
-    self.by-version."escodegen"."1.0.0";
-  by-version."escodegen"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.0.0";
+    self.by-version."escodegen"."1.0.1";
+  by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.0.tgz";
-        sha1 = "8428e45aec9f8d15ccd57859a83c34a91688fd2d";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz";
+        sha1 = "84c92c4a07440271b90e6b78e620973bf721226e";
       })
     ];
     buildInputs =
       (self.nativeDeps."escodegen" or []);
     deps = [
       self.by-version."esprima"."1.0.4"
-      self.by-version."estraverse"."1.4.0"
+      self.by-version."estraverse"."1.5.0"
+      self.by-version."esutils"."1.0.0"
       self.by-version."source-map"."0.1.31"
     ];
     peerDependencies = [
@@ -3449,6 +3570,8 @@
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
+  by-spec."esprima"."~1.0.4" =
+    self.by-version."esprima"."1.0.4";
   by-spec."estraverse"."*" =
     self.by-version."estraverse"."1.5.0";
   by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -3485,23 +3608,25 @@
     ];
     passthru.names = [ "estraverse" ];
   };
-  by-spec."estraverse"."~1.4.0" =
-    self.by-version."estraverse"."1.4.0";
-  by-version."estraverse"."1.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "estraverse-1.4.0";
+  by-spec."estraverse"."~1.5.0" =
+    self.by-version."estraverse"."1.5.0";
+  by-spec."esutils"."~1.0.0" =
+    self.by-version."esutils"."1.0.0";
+  by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "esutils-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.4.0.tgz";
-        sha1 = "c6e1ad13b3f1b389da32214f2debe4788382bfc6";
+        url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
       })
     ];
     buildInputs =
-      (self.nativeDeps."estraverse" or []);
+      (self.nativeDeps."esutils" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "estraverse" ];
+    passthru.names = [ "esutils" ];
   };
   by-spec."event-emitter"."~0.2.2" =
     self.by-version."event-emitter"."0.2.2";
@@ -3979,6 +4104,31 @@
     ];
     passthru.names = [ "faye-websocket" ];
   };
+  by-spec."file-utils"."~0.1.1" =
+    self.by-version."file-utils"."0.1.5";
+  by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "file-utils-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz";
+        sha1 = "dc8153c855387cb4dacb0a1725531fa444a6b48c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."file-utils" or []);
+    deps = [
+      self.by-version."lodash"."2.1.0"
+      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."rimraf"."2.2.5"
+      self.by-version."glob"."3.2.7"
+      self.by-version."minimatch"."0.2.12"
+      self.by-version."findup-sync"."0.1.2"
+      self.by-version."isbinaryfile"."0.1.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "file-utils" ];
+  };
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -4123,14 +4273,32 @@
     ];
     passthru.names = [ "forEachAsync" ];
   };
+  by-spec."foreach"."~2.0.1" =
+    self.by-version."foreach"."2.0.4";
+  by-version."foreach"."2.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "foreach-2.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/foreach/-/foreach-2.0.4.tgz";
+        sha1 = "cc5d0d8ae1d46cc9a555c2682f910977859935df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."foreach" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "foreach" ];
+  };
   by-spec."forever"."*" =
-    self.by-version."forever"."0.10.9";
-  by-version."forever"."0.10.9" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-0.10.9";
+    self.by-version."forever"."0.10.10";
+  by-version."forever"."0.10.10" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.10.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.10.9.tgz";
-        sha1 = "e4849f459ec27d5a6524fd466e67dfd6222bd9bb";
+        url = "http://registry.npmjs.org/forever/-/forever-0.10.10.tgz";
+        sha1 = "2328bc366bd392e1536f34f866ec39d31ddf5a12";
       })
     ];
     buildInputs =
@@ -4144,7 +4312,7 @@
       self.by-version."nssocket"."0.5.1"
       self.by-version."optimist"."0.4.0"
       self.by-version."pkginfo"."0.3.0"
-      self.by-version."timespan"."2.0.1"
+      self.by-version."timespan"."2.1.0"
       self.by-version."watch"."0.7.0"
       self.by-version."utile"."0.1.7"
       self.by-version."winston"."0.7.1"
@@ -4153,7 +4321,7 @@
     ];
     passthru.names = [ "forever" ];
   };
-  "forever" = self.by-version."forever"."0.10.9";
+  "forever" = self.by-version."forever"."0.10.10";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4430,7 +4598,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."jsonfile"."1.0.1"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
     ];
     peerDependencies = [
     ];
@@ -4490,7 +4658,7 @@
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."inherits"."2.0.1"
@@ -4551,13 +4719,13 @@
     passthru.names = [ "fstream-npm" ];
   };
   by-spec."generator-angular"."*" =
-    self.by-version."generator-angular"."0.6.0-rc.2";
-  by-version."generator-angular"."0.6.0-rc.2" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-angular-0.6.0-rc.2";
+    self.by-version."generator-angular"."0.6.0";
+  by-version."generator-angular"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-angular-0.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.2.tgz";
-        sha1 = "775a858e5dd9dc9f0a85730274d02c6af5d232b1";
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0.tgz";
+        sha1 = "84479e9ab2476dfbf571feb45e6fe8edbad2c951";
       })
     ];
     buildInputs =
@@ -4567,11 +4735,11 @@
     ];
     peerDependencies = [
       self.by-version."generator-karma"."0.6.0"
-      self.by-version."yo"."1.0.4"
+      self.by-version."yo"."1.0.5"
     ];
     passthru.names = [ "generator-angular" ];
   };
-  "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.2";
+  "generator-angular" = self.by-version."generator-angular"."0.6.0";
   by-spec."generator-karma"."~0.6.0" =
     self.by-version."generator-karma"."0.6.0";
   by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -4588,26 +4756,27 @@
       self.by-version."yeoman-generator"."0.13.4"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.0.4"
+      self.by-version."yo"."1.0.5"
     ];
     passthru.names = [ "generator-karma" ];
   };
   by-spec."generator-mocha"."~0.1.1" =
-    self.by-version."generator-mocha"."0.1.1";
-  by-version."generator-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-mocha-0.1.1";
+    self.by-version."generator-mocha"."0.1.2";
+  by-version."generator-mocha"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-mocha-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.1.tgz";
-        sha1 = "818f7028a1c149774a882a0e3c7c04ba9852d7d1";
+        url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.2.tgz";
+        sha1 = "f59f93e08aeeceeb8150e39ef2b35925fb30692c";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-mocha" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.10.5"
+      self.by-version."yeoman-generator"."0.14.1"
     ];
     peerDependencies = [
+      self.by-version."yo"."1.0.5"
     ];
     passthru.names = [ "generator-mocha" ];
   };
@@ -4628,8 +4797,8 @@
       self.by-version."cheerio"."0.12.4"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.0.4"
-      self.by-version."generator-mocha"."0.1.1"
+      self.by-version."yo"."1.0.5"
+      self.by-version."generator-mocha"."0.1.2"
     ];
     passthru.names = [ "generator-webapp" ];
   };
@@ -4845,6 +5014,8 @@
     self.by-version."graceful-fs"."2.0.1";
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.1";
+  by-spec."graceful-fs"."~2.0.1" =
+    self.by-version."graceful-fs"."2.0.1";
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.4.0";
   by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -5017,13 +5188,13 @@
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.2";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."0.8.2";
-  by-version."grunt-contrib-less"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-less-0.8.2";
+    self.by-version."grunt-contrib-less"."0.8.3";
+  by-version."grunt-contrib-less"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-less-0.8.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.2.tgz";
-        sha1 = "d94e5c69251aec1a48ee154147b808a10ff6f711";
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.3.tgz";
+        sha1 = "8a0e9183577339ad08729f57a9a4adeff6c41410";
       })
     ];
     buildInputs =
@@ -5037,7 +5208,7 @@
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.2";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.3";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.1";
   by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -5072,7 +5243,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.6"
+      self.by-version."uglify-js"."2.4.7"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -5082,13 +5253,13 @@
   };
   "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.7";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.7.1";
-  by-version."grunt-karma"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-karma-0.7.1";
+    self.by-version."grunt-karma"."0.7.2";
+  by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-karma-0.7.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.1.tgz";
-        sha1 = "7fb8c40988b8e88da454afb821a7a925ed05ff81";
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz";
+        sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e";
       })
     ];
     buildInputs =
@@ -5098,11 +5269,11 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
-      self.by-version."karma"."0.10.7"
+      self.by-version."karma"."0.11.9"
     ];
     passthru.names = [ "grunt-karma" ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.7.1";
+  "grunt-karma" = self.by-version."grunt-karma"."0.7.2";
   by-spec."grunt-lib-contrib"."~0.6.0" =
     self.by-version."grunt-lib-contrib"."0.6.1";
   by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage {
@@ -5248,6 +5419,26 @@
     ];
     passthru.names = [ "hasher" ];
   };
+  by-spec."hashring"."1.0.1" =
+    self.by-version."hashring"."1.0.1";
+  by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "hashring-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
+        sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hashring" or []);
+    deps = [
+      self.by-version."connection-parse"."0.0.7"
+      self.by-version."simple-lru-cache"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hashring" ];
+  };
   by-spec."hat"."*" =
     self.by-version."hat"."0.0.3";
   by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -5485,27 +5676,6 @@
     ];
     passthru.names = [ "hooks" ];
   };
-  by-spec."htmlparser2"."2.x" =
-    self.by-version."htmlparser2"."2.6.0";
-  by-version."htmlparser2"."2.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "htmlparser2-2.6.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-2.6.0.tgz";
-        sha1 = "b28564ea9d1ba56a104ace6a7b0fdda2f315836f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."htmlparser2" or []);
-    deps = [
-      self.by-version."domhandler"."2.0.3"
-      self.by-version."domutils"."1.0.1"
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "htmlparser2" ];
-  };
   by-spec."htmlparser2"."3.1.4" =
     self.by-version."htmlparser2"."3.1.4";
   by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -5655,14 +5825,14 @@
     passthru.names = [ "i18next" ];
   };
   "i18next" = self.by-version."i18next"."1.7.1";
-  by-spec."ibrik"."~0.0.4" =
-    self.by-version."ibrik"."0.0.4";
-  by-version."ibrik"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "ibrik-0.0.4";
+  by-spec."ibrik"."~1.0.1" =
+    self.by-version."ibrik"."1.0.1";
+  by-version."ibrik"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ibrik-1.0.1";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/ibrik/-/ibrik-0.0.4.tgz";
-        sha1 = "1ce60747afe56ecee03cd1f6f0db30ce579961e4";
+        url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz";
+        sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb";
       })
     ];
     buildInputs =
@@ -5671,7 +5841,7 @@
       self.by-version."coffee-script-redux"."2.0.0-beta4"
       self.by-version."istanbul"."0.1.46"
       self.by-version."optimist"."0.6.0"
-      self.by-version."escodegen"."1.0.0"
+      self.by-version."escodegen"."1.0.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."which"."1.0.5"
       self.by-version."estraverse"."1.5.0"
@@ -5700,6 +5870,24 @@
   };
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
+  by-spec."indexof"."~0.0.1" =
+    self.by-version."indexof"."0.0.1";
+  by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "indexof-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."indexof" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "indexof" ];
+  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -5833,14 +6021,14 @@
   };
   by-spec."inquirer"."~0.3.1" =
     self.by-version."inquirer"."0.3.5";
-  by-spec."insight"."~0.2.0" =
-    self.by-version."insight"."0.2.0";
-  by-version."insight"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "insight-0.2.0";
+  by-spec."insight"."~0.3.0" =
+    self.by-version."insight"."0.3.0";
+  by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "insight-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.2.0.tgz";
-        sha1 = "3b430f3c903558d690d1b96c7479b6f1b9186a5e";
+        url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz";
+        sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71";
       })
     ];
     buildInputs =
@@ -5848,7 +6036,7 @@
     deps = [
       self.by-version."chalk"."0.2.1"
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.1.5"
+      self.by-version."configstore"."0.1.6"
       self.by-version."async"."0.2.9"
       self.by-version."lodash"."1.3.1"
       self.by-version."inquirer"."0.2.5"
@@ -5910,6 +6098,42 @@
     passthru.names = [ "ironhorse" ];
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.9";
+  by-spec."is"."~0.2.6" =
+    self.by-version."is"."0.2.6";
+  by-version."is"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "is-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/is/-/is-0.2.6.tgz";
+        sha1 = "36681b7c4328a75a6dd4b6d8f7131e4f81de55c0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."is" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "is" ];
+  };
+  by-spec."is-object"."~0.1.2" =
+    self.by-version."is-object"."0.1.2";
+  by-version."is-object"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "is-object-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz";
+        sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."is-object" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "is-object" ];
+  };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.0";
   by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -5946,6 +6170,8 @@
     ];
     passthru.names = [ "isbinaryfile" ];
   };
+  by-spec."isbinaryfile"."~0.1.9" =
+    self.by-version."isbinaryfile"."0.1.9";
   by-spec."istanbul"."*" =
     self.by-version."istanbul"."0.1.46";
   by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage {
@@ -6340,13 +6566,13 @@
     passthru.names = [ "jsprim" ];
   };
   by-spec."junk"."~0.2.0" =
-    self.by-version."junk"."0.2.1";
-  by-version."junk"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "junk-0.2.1";
+    self.by-version."junk"."0.2.2";
+  by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "junk-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/junk/-/junk-0.2.1.tgz";
-        sha1 = "e8a4c42c421746da34b354d0510507cb79f3c583";
+        url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz";
+        sha1 = "d595eb199b37930cecd1f2c52820847e80e48ae7";
       })
     ];
     buildInputs =
@@ -6358,107 +6584,25 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.11.7";
-  "karma" = self.by-version."karma"."0.11.7";
-  by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.11.7";
-  by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.11.7";
-  by-spec."karma"."~0.10.0" =
-    self.by-version."karma"."0.10.7";
-  by-version."karma"."0.10.7" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.7";
+    self.by-version."karma"."0.11.9";
+  by-version."karma-jasmine"."0.1.4" = self.by-version."karma"."0.11.9";
+  by-version."karma-requirejs"."0.2.0" = self.by-version."karma"."0.11.9";
+  by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma"."0.11.9";
+  by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma"."0.11.9";
+  by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma"."0.11.9";
+  by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma"."0.11.9";
+  by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma"."0.11.9";
+  by-version."karma-script-launcher"."0.1.0" = self.by-version."karma"."0.11.9";
+  by-version."karma"."0.11.9" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.11.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.7.tgz";
-        sha1 = "de49e2323a187ecb688470c2ad3be6a30bc7c270";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.9.tgz";
+        sha1 = "0726f8fe8424179c660eff358476fb8b502b7d0f";
       })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma" or []);
-    deps = [
-      self.by-version."di"."0.0.1"
-      self.by-version."socket.io"."0.9.16"
-      self.by-version."chokidar"."0.7.1"
-      self.by-version."glob"."3.1.21"
-      self.by-version."minimatch"."0.2.12"
-      self.by-version."http-proxy"."0.10.3"
-      self.by-version."optimist"."0.3.7"
-      self.by-version."coffee-script"."1.6.3"
-      self.by-version."rimraf"."2.1.4"
-      self.by-version."q"."0.9.7"
-      self.by-version."colors"."0.6.0-1"
-      self.by-version."lodash"."1.1.1"
-      self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.9"
-      self.by-version."useragent"."2.0.7"
-      self.by-version."graceful-fs"."1.2.3"
-      self.by-version."connect"."2.8.8"
-    ];
-    peerDependencies = [
-      self.by-version."karma-jasmine"."0.1.3"
-      self.by-version."karma-requirejs"."0.2.0"
-      self.by-version."karma-coffee-preprocessor"."0.1.1"
-      self.by-version."karma-html2js-preprocessor"."0.1.0"
-      self.by-version."karma-chrome-launcher"."0.1.1"
-      self.by-version."karma-firefox-launcher"."0.1.2"
-      self.by-version."karma-phantomjs-launcher"."0.1.1"
-      self.by-version."karma-script-launcher"."0.1.0"
-    ];
-    passthru.names = [ "karma" ];
-  };
-  by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.1";
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1";
-  by-spec."karma-coffee-preprocessor"."*" =
-    self.by-version."karma-coffee-preprocessor"."0.1.1";
-  by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.1.3";
-  by-version."karma-coverage"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-coverage-0.1.3";
-    src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.3.tgz";
-        sha1 = "4a936fa89a2c06c339ad953a10c6d25eb6794204";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-coverage" or []);
-    deps = [
-      self.by-version."istanbul"."0.1.46"
-      self.by-version."ibrik"."0.0.4"
-      self.by-version."dateformat"."1.0.6-1.2.3"
-    ];
-    peerDependencies = [
-      self.by-version."karma"."0.11.7"
-    ];
-    passthru.names = [ "karma-coverage" ];
-  };
-  "karma-coverage" = self.by-version."karma-coverage"."0.1.3";
-  by-spec."karma-firefox-launcher"."*" =
-    self.by-version."karma-firefox-launcher"."0.1.2";
-  by-spec."karma-html2js-preprocessor"."*" =
-    self.by-version."karma-html2js-preprocessor"."0.1.0";
-  by-spec."karma-jasmine"."*" =
-    self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma"."0.11.7" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-jasmine-0.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz";
-        sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
-      })
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.11.7.tgz";
-        sha1 = "86f44de1c44016e5af3492bceb6dea99799b18fb";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.4.tgz";
+        sha1 = "6731409c0b587f3895c9b0966c249058d650b3d3";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz";
@@ -6490,8 +6634,8 @@
       })
     ];
     buildInputs =
-      (self.nativeDeps."karma-jasmine" or [])
-      ++ (self.nativeDeps."karma" or [])
+      (self.nativeDeps."karma" or [])
+      ++ (self.nativeDeps."karma-jasmine" or [])
       ++ (self.nativeDeps."karma-requirejs" or [])
       ++ (self.nativeDeps."karma-coffee-preprocessor" or [])
       ++ (self.nativeDeps."karma-html2js-preprocessor" or [])
@@ -6517,13 +6661,54 @@
       self.by-version."useragent"."2.0.7"
       self.by-version."graceful-fs"."1.2.3"
       self.by-version."connect"."2.8.8"
-      self.by-version."phantomjs"."1.9.2-4"
+      self.by-version."phantomjs"."1.9.2-5"
     ];
     peerDependencies = [
       self.by-version."requirejs"."2.1.9"
     ];
-    passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
+    passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
   };
+  "karma" = self.by-version."karma"."0.11.9";
+  by-spec."karma".">=0.9" =
+    self.by-version."karma"."0.11.9";
+  by-spec."karma".">=0.9.3" =
+    self.by-version."karma"."0.11.9";
+  by-spec."karma"."~0.11.0" =
+    self.by-version."karma"."0.11.9";
+  by-spec."karma-chrome-launcher"."*" =
+    self.by-version."karma-chrome-launcher"."0.1.1";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1";
+  by-spec."karma-coffee-preprocessor"."*" =
+    self.by-version."karma-coffee-preprocessor"."0.1.1";
+  by-spec."karma-coverage"."*" =
+    self.by-version."karma-coverage"."0.1.4";
+  by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-coverage-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz";
+        sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma-coverage" or []);
+    deps = [
+      self.by-version."istanbul"."0.1.46"
+      self.by-version."ibrik"."1.0.1"
+      self.by-version."dateformat"."1.0.6-1.2.3"
+    ];
+    peerDependencies = [
+      self.by-version."karma"."0.11.9"
+    ];
+    passthru.names = [ "karma-coverage" ];
+  };
+  "karma-coverage" = self.by-version."karma-coverage"."0.1.4";
+  by-spec."karma-firefox-launcher"."*" =
+    self.by-version."karma-firefox-launcher"."0.1.2";
+  by-spec."karma-html2js-preprocessor"."*" =
+    self.by-version."karma-html2js-preprocessor"."0.1.0";
+  by-spec."karma-jasmine"."*" =
+    self.by-version."karma-jasmine"."0.1.4";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.1";
   by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -6540,7 +6725,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.7"
+      self.by-version."karma"."0.11.9"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -6560,7 +6745,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.7"
+      self.by-version."karma"."0.11.9"
       self.by-version."mocha"."1.15.1"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -6590,7 +6775,7 @@
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.7"
+      self.by-version."karma"."0.11.9"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
@@ -6793,7 +6978,7 @@
     passthru.names = [ "lcov-result-merger" ];
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
-  by-spec."less"."~1.5.0" =
+  by-spec."less"."~1.5.1" =
     self.by-version."less"."1.5.1";
   by-version."less"."1.5.1" = lib.makeOverridable self.buildNodePackage {
     name = "less-1.5.1";
@@ -6807,7 +6992,7 @@
       (self.nativeDeps."less" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."request"."2.27.0"
+      self.by-version."request"."2.29.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."clean-css"."2.0.2"
       self.by-version."source-map"."0.1.31"
@@ -6944,8 +7129,6 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~1.1.1" =
-    self.by-version."lodash"."1.1.1";
   by-spec."lodash"."~1.2.1" =
     self.by-version."lodash"."1.2.1";
   by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -6984,6 +7167,42 @@
   };
   by-spec."lodash"."~1.3.1" =
     self.by-version."lodash"."1.3.1";
+  by-spec."lodash"."~2.1.0" =
+    self.by-version."lodash"."2.1.0";
+  by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz";
+        sha1 = "0637eaaa36a8a1cfc865c3adfb942189bfb0998d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  by-spec."lodash"."~2.2.1" =
+    self.by-version."lodash"."2.2.1";
+  by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz";
+        sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
   by-spec."lodash"."~2.3.0" =
     self.by-version."lodash"."2.3.0";
   by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -7002,6 +7221,24 @@
     ];
     passthru.names = [ "lodash" ];
   };
+  by-spec."lodash"."~2.4.1" =
+    self.by-version."lodash"."2.4.1";
+  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
+        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
   by-spec."log-driver"."1.2.1" =
     self.by-version."log-driver"."1.2.1";
   by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -7041,6 +7278,24 @@
     ];
     passthru.names = [ "log4js" ];
   };
+  by-spec."long"."*" =
+    self.by-version."long"."1.1.2";
+  by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "long-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz";
+        sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."long" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "long" ];
+  };
   by-spec."lru-cache"."2" =
     self.by-version."lru-cache"."2.5.0";
   by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -7610,13 +7865,13 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.3.20";
-  by-version."mongodb"."1.3.20" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.3.20";
+    self.by-version."mongodb"."1.4.0-rc2";
+  by-version."mongodb"."1.4.0-rc2" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.4.0-rc2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.20.tgz";
-        sha1 = "257f1570295fe020248ea8329b58d47ec9ceac62";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc2.tgz";
+        sha1 = "00396d1af8ec807c6954e8608df84360d8cd2c07";
       })
     ];
     buildInputs =
@@ -7629,7 +7884,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.3.20";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc2";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -7670,7 +7925,7 @@
     passthru.names = [ "mongodb" ];
   };
   by-spec."mongodb"."1.3.x" =
-    self.by-version."mongodb"."1.3.20";
+    self.by-version."mongodb"."1.3.19";
   by-spec."mongoose"."*" =
     self.by-version."mongoose"."3.8.1";
   by-version."mongoose"."3.8.1" = lib.makeOverridable self.buildNodePackage {
@@ -8084,6 +8339,24 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."~0.6.0" =
+    self.by-version."nan"."0.6.0";
+  by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nan-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
+        sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   by-spec."natural"."0.0.69" =
     self.by-version."natural"."0.0.69";
   by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage {
@@ -8303,24 +8576,25 @@
   };
   "nijs" = self.by-version."nijs"."0.0.12";
   by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.0.0";
-  by-version."node-expat"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-expat-2.0.0";
+    self.by-version."node-expat"."2.1.3";
+  by-version."node-expat"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-expat-2.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz";
-        sha1 = "a10271b3463484fa4b59895df61693a1de4ac735";
+        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.3.tgz";
+        sha1 = "c5c5c3bc3f3922d281087ca46e3f9926b9f55dc9";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-expat" or []);
     deps = [
+      self.by-version."nan"."0.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-expat" ];
   };
-  "node-expat" = self.by-version."node-expat"."2.0.0";
+  "node-expat" = self.by-version."node-expat"."2.1.3";
   by-spec."node-gyp"."*" =
     self.by-version."node-gyp"."0.12.1";
   by-version."node-gyp"."0.12.1" = lib.makeOverridable self.buildNodePackage {
@@ -8342,10 +8616,10 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.27.0"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."request"."2.29.0"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."semver"."2.2.1"
-      self.by-version."tar"."0.1.18"
+      self.by-version."tar"."0.1.19"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
@@ -8356,13 +8630,13 @@
   by-spec."node-gyp"."~0.12.0" =
     self.by-version."node-gyp"."0.12.1";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.6.1";
-  by-version."node-inspector"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.6.1";
+    self.by-version."node-inspector"."0.6.2";
+  by-version."node-inspector"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.1.tgz";
-        sha1 = "9ed1b1dd4410fe4f2929b93c98c55378a3edd6f0";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.2.tgz";
+        sha1 = "0471a3f4ef5c53e4e567466f93b179d77d1ba5c6";
       })
     ];
     buildInputs =
@@ -8380,7 +8654,26 @@
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.6.1";
+  "node-inspector" = self.by-version."node-inspector"."0.6.2";
+  by-spec."node-protobuf"."*" =
+    self.by-version."node-protobuf"."1.0.9";
+  by-version."node-protobuf"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-protobuf-1.0.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.9.tgz";
+        sha1 = "6b2e7682bb65e01a10e19179f8e162ac9a66a6e6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-protobuf" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-protobuf" ];
+  };
+  "node-protobuf" = self.by-version."node-protobuf"."1.0.9";
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -8399,14 +8692,14 @@
     ];
     passthru.names = [ "node-swt" ];
   };
-  by-spec."node-syslog"."1.1.3" =
-    self.by-version."node-syslog"."1.1.3";
-  by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-syslog-1.1.3";
+  by-spec."node-syslog"."1.1.7" =
+    self.by-version."node-syslog"."1.1.7";
+  by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-syslog-1.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.3.tgz";
-        sha1 = "dce11e3091d39889a2af166501e67e0098a0bb64";
+        url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
+        sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
       })
     ];
     buildInputs =
@@ -8568,13 +8861,13 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."0.9.10";
-  by-version."nodemon"."0.9.10" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-0.9.10";
+    self.by-version."nodemon"."0.9.14";
+  by-version."nodemon"."0.9.14" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-0.9.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.10.tgz";
-        sha1 = "4faca02a4df262cda9334ef24bfadca14c5c3112";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.14.tgz";
+        sha1 = "41c401aaea5b4306aab6ba71f12d3c8a1e693440";
       })
     ];
     buildInputs =
@@ -8586,7 +8879,7 @@
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."0.9.10";
+  "nodemon" = self.by-version."nodemon"."0.9.14";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -8711,10 +9004,10 @@
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."minimatch"."0.2.12"
       self.by-version."nopt"."2.1.2"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."request"."2.27.0"
       self.by-version."which"."1.0.5"
-      self.by-version."tar"."0.1.18"
+      self.by-version."tar"."0.1.19"
       self.by-version."fstream"."0.1.25"
       self.by-version."block-stream"."0.0.7"
       self.by-version."mkdirp"."0.3.5"
@@ -8736,7 +9029,7 @@
       self.by-version."lockfile"."0.4.2"
       self.by-version."retry"."0.6.0"
       self.by-version."once"."1.3.0"
-      self.by-version."npmconf"."0.1.6"
+      self.by-version."npmconf"."0.1.7"
       self.by-version."opener"."1.3.0"
       self.by-version."chmodr"."0.1.0"
       self.by-version."cmd-shim"."1.1.1"
@@ -8767,13 +9060,13 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.27.0"
+      self.by-version."request"."2.29.0"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -8795,13 +9088,13 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.27.0"
+      self.by-version."request"."2.29.0"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -8908,13 +9201,13 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.6";
-  by-version."npmconf"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.1.6";
+    self.by-version."npmconf"."0.1.7";
+  by-version."npmconf"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "npmconf-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.6.tgz";
-        sha1 = "e23b5c028758877d31ef6daf8a566059442459b6";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.7.tgz";
+        sha1 = "f0be6f90c672046b562175b6d99c2d152bd9f17c";
       })
     ];
     buildInputs =
@@ -8934,7 +9227,7 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.6" =
-    self.by-version."npmconf"."0.1.6";
+    self.by-version."npmconf"."0.1.7";
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."0.0.6";
   by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -9050,6 +9343,27 @@
     ];
     passthru.names = [ "object-additions" ];
   };
+  by-spec."object-keys"."~0.2.0" =
+    self.by-version."object-keys"."0.2.0";
+  by-version."object-keys"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "object-keys-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz";
+        sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-keys" or []);
+    deps = [
+      self.by-version."foreach"."2.0.4"
+      self.by-version."indexof"."0.0.1"
+      self.by-version."is"."0.2.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-keys" ];
+  };
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -9287,6 +9601,24 @@
     ];
     passthru.names = [ "options" ];
   };
+  by-spec."optjs"."*" =
+    self.by-version."optjs"."3.2.1-boom";
+  by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
+    name = "optjs-3.2.1-boom";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
+        sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optjs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optjs" ];
+  };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.4";
   by-version."optparse"."1.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -9458,13 +9790,13 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."~1.9" =
-    self.by-version."phantomjs"."1.9.2-4";
-  by-version."phantomjs"."1.9.2-4" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.2-4";
+    self.by-version."phantomjs"."1.9.2-5";
+  by-version."phantomjs"."1.9.2-5" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.2-5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-4.tgz";
-        sha1 = "fbf6c8df9dc963f9a4020764495152e0099d6d42";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-5.tgz";
+        sha1 = "455f8fb45bab776715e016fea3086ccc34ff102b";
       })
     ];
     buildInputs =
@@ -9475,7 +9807,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
@@ -9483,7 +9815,7 @@
     passthru.names = [ "phantomjs" ];
   };
   by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.2-4";
+    self.by-version."phantomjs"."1.9.2-5";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -9720,6 +10052,26 @@
     ];
     passthru.names = [ "proto-list" ];
   };
+  by-spec."protobufjs".">= 1.1.4" =
+    self.by-version."protobufjs"."2.0.0-rc4";
+  by-version."protobufjs"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage {
+    name = "protobufjs-2.0.0-rc4";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.0-rc4.tgz";
+        sha1 = "298d218346a7fb44566de2d74d440f664712f3ad";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."protobufjs" or []);
+    deps = [
+      self.by-version."bytebuffer"."2.1.0"
+      self.by-version."ascli"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "protobufjs" ];
+  };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
   by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -9739,7 +10091,7 @@
     ];
     passthru.names = [ "ps-tree" ];
   };
-  by-spec."punycode"."~1.2.3" =
+  by-spec."punycode".">=0.2.0" =
     self.by-version."punycode"."1.2.3";
   by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage {
     name = "punycode-1.2.3";
@@ -9757,6 +10109,8 @@
     ];
     passthru.names = [ "punycode" ];
   };
+  by-spec."punycode"."~1.2.3" =
+    self.by-version."punycode"."1.2.3";
   by-spec."q"."0.9.x" =
     self.by-version."q"."0.9.7";
   by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage {
@@ -10415,13 +10769,13 @@
     passthru.names = [ "replace" ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.27.0";
-  by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.27.0";
+    self.by-version."request"."2.29.0";
+  by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.29.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
-        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+        url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz";
+        sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3";
       })
     ];
     buildInputs =
@@ -10430,24 +10784,24 @@
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
       self.by-version."forever-agent"."0.5.0"
-      self.by-version."tunnel-agent"."0.3.0"
-      self.by-version."http-signature"."0.10.0"
-      self.by-version."hawk"."1.0.0"
-      self.by-version."aws-sign"."0.3.0"
-      self.by-version."oauth-sign"."0.3.0"
-      self.by-version."cookie-jar"."0.3.0"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
+      self.by-version."tough-cookie"."0.9.15"
       self.by-version."form-data"."0.1.2"
+      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign2"."0.5.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "request" ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.27.0";
+    self.by-version."request"."2.29.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.27.0";
+    self.by-version."request"."2.29.0";
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
@@ -10525,11 +10879,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request".">=2.12.0" =
-    self.by-version."request"."2.27.0";
+    self.by-version."request"."2.29.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.27.0";
-  by-spec."request"."~2.16.6" =
-    self.by-version."request"."2.16.6";
+    self.by-version."request"."2.29.0";
   by-spec."request"."~2.21.0" =
     self.by-version."request"."2.21.0";
   by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage {
@@ -10592,6 +10944,34 @@
   };
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
+  by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."forever-agent"."0.5.0"
+      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign"."0.3.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."cookie-jar"."0.3.0"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."mime"."1.2.11"
+      self.by-version."form-data"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   by-spec."request-progress"."~0.3.0" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -10721,6 +11101,26 @@
     ];
     passthru.names = [ "restify" ];
   };
+  by-spec."rethinkdb"."*" =
+    self.by-version."rethinkdb"."1.11.0-1";
+  by-version."rethinkdb"."1.11.0-1" = lib.makeOverridable self.buildNodePackage {
+    name = "rethinkdb-1.11.0-1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-1.tgz";
+        sha1 = "beab3376b9efa9ecf7f2fbf39c58ce80c8bd5dfd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rethinkdb" or []);
+    deps = [
+      self.by-version."protobufjs"."2.0.0-rc4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rethinkdb" ];
+  };
+  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-1";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -10778,28 +11178,27 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.4";
-  by-version."rimraf"."2.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.4";
+    self.by-version."rimraf"."2.2.5";
+  by-version."rimraf"."2.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.4.tgz";
-        sha1 = "9f0b530f829f7b655a6e4d2fd8cf4c042336ef58";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.5.tgz";
+        sha1 = "4e5c4f667b121afa806d0c5b58920996f9478aa0";
       })
     ];
     buildInputs =
       (self.nativeDeps."rimraf" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.4";
+    self.by-version."rimraf"."2.2.5";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.4";
+    self.by-version."rimraf"."2.2.5";
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10843,9 +11242,9 @@
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.4";
+    self.by-version."rimraf"."2.2.5";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.4";
+    self.by-version."rimraf"."2.2.5";
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.3";
   by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10859,7 +11258,7 @@
     buildInputs =
       (self.nativeDeps."s3http" or []);
     deps = [
-      self.by-version."aws-sdk"."1.13.0"
+      self.by-version."aws-sdk"."1.14.0"
       self.by-version."commander"."2.0.0"
       self.by-version."http-auth"."2.0.7"
       self.by-version."express"."3.4.4"
@@ -10913,13 +11312,13 @@
     passthru.names = [ "saucelabs" ];
   };
   by-spec."sax"."0.5.x" =
-    self.by-version."sax"."0.5.5";
-  by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage {
-    name = "sax-0.5.5";
+    self.by-version."sax"."0.5.8";
+  by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
+    name = "sax-0.5.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz";
-        sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3";
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
       })
     ];
     buildInputs =
@@ -10931,15 +11330,15 @@
     passthru.names = [ "sax" ];
   };
   by-spec."sax".">=0.4.2" =
-    self.by-version."sax"."0.5.5";
+    self.by-version."sax"."0.5.8";
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.37.0";
-  by-version."selenium-webdriver"."2.37.0" = lib.makeOverridable self.buildNodePackage {
-    name = "selenium-webdriver-2.37.0";
+    self.by-version."selenium-webdriver"."2.38.1";
+  by-version."selenium-webdriver"."2.38.1" = lib.makeOverridable self.buildNodePackage {
+    name = "selenium-webdriver-2.38.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.37.0.tgz";
-        sha1 = "02a8c9240203c22d0400d466253d4af3f63748b8";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.38.1.tgz";
+        sha1 = "9299e3b808bec401334ca4e80cb0b70b872be651";
       })
     ];
     buildInputs =
@@ -10950,7 +11349,7 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.37.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.38.1";
   by-spec."semver"."*" =
     self.by-version."semver"."2.2.1";
   by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -11184,14 +11583,32 @@
   };
   by-spec."shelljs"."~0.1.4" =
     self.by-version."shelljs"."0.1.4";
+  by-spec."shelljs"."~0.2.6" =
+    self.by-version."shelljs"."0.2.6";
+  by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz";
+        sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shelljs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shelljs" ];
+  };
   by-spec."should"."*" =
-    self.by-version."should"."2.1.0";
-  by-version."should"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "should-2.1.0";
+    self.by-version."should"."2.1.1";
+  by-version."should"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "should-2.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-2.1.0.tgz";
-        sha1 = "6bffa59a47892206fed91fe0f2b7217bda61e9ca";
+        url = "http://registry.npmjs.org/should/-/should-2.1.1.tgz";
+        sha1 = "c648b13a8b464465c2f838ea0c93f12e4ae06c6b";
       })
     ];
     buildInputs =
@@ -11202,7 +11619,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."2.1.0";
+  "should" = self.by-version."should"."2.1.1";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -11243,6 +11660,24 @@
     self.by-version."signals"."1.0.0";
   by-spec."signals"."~1.0.0" =
     self.by-version."signals"."1.0.0";
+  by-spec."simple-lru-cache"."0.0.x" =
+    self.by-version."simple-lru-cache"."0.0.1";
+  by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "simple-lru-cache-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
+        sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."simple-lru-cache" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "simple-lru-cache" ];
+  };
   by-spec."simplesmtp".">= 0.1.22" =
     self.by-version."simplesmtp"."0.3.16";
   by-version."simplesmtp"."0.3.16" = lib.makeOverridable self.buildNodePackage {
@@ -11642,26 +12077,46 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."statsd"."*" =
-    self.by-version."statsd"."0.6.0";
-  by-version."statsd"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "statsd-0.6.0";
+    self.by-version."statsd"."0.7.0";
+  by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "statsd-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/statsd/-/statsd-0.6.0.tgz";
-        sha1 = "9902dba319c46726f0348ced9b7b3e20184de1c4";
+        url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz";
+        sha1 = "13354345392c50a30221d3ab524bffcdda90272e";
       })
     ];
     buildInputs =
       (self.nativeDeps."statsd" or []);
     deps = [
-      self.by-version."node-syslog"."1.1.3"
+      self.by-version."node-syslog"."1.1.7"
+      self.by-version."hashring"."1.0.1"
       self.by-version."winser"."0.0.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "statsd" ];
   };
-  "statsd" = self.by-version."statsd"."0.6.0";
+  "statsd" = self.by-version."statsd"."0.7.0";
+  by-spec."stream-combiner"."~0.0.2" =
+    self.by-version."stream-combiner"."0.0.2";
+  by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "stream-combiner-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz";
+        sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-combiner" or []);
+    deps = [
+      self.by-version."duplexer"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-combiner" ];
+  };
   by-spec."stream-counter"."~0.1.0" =
     self.by-version."stream-counter"."0.1.0";
   by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -11794,13 +12249,13 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.41.0";
-  by-version."stylus"."0.41.0" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.41.0";
+    self.by-version."stylus"."0.41.2";
+  by-version."stylus"."0.41.2" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.41.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.41.0.tgz";
-        sha1 = "b9609d5663c9624d11b28952f3e6b23cde10ac28";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.41.2.tgz";
+        sha1 = "68bca2b317d32c85e7cdf7afe7ee044da9afe983";
       })
     ];
     buildInputs =
@@ -11809,13 +12264,13 @@
       self.by-version."cssom"."0.2.5"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."debug"."0.7.4"
-      self.by-version."sax"."0.5.5"
+      self.by-version."sax"."0.5.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.41.0";
+  "stylus" = self.by-version."stylus"."0.41.2";
   by-spec."stylus"."0.27.2" =
     self.by-version."stylus"."0.27.2";
   by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
@@ -11970,13 +12425,13 @@
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
   by-spec."tar"."*" =
-    self.by-version."tar"."0.1.18";
-  by-version."tar"."0.1.18" = lib.makeOverridable self.buildNodePackage {
-    name = "tar-0.1.18";
+    self.by-version."tar"."0.1.19";
+  by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
-        sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz";
+        sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac";
       })
     ];
     buildInputs =
@@ -11990,9 +12445,9 @@
     ];
     passthru.names = [ "tar" ];
   };
-  "tar" = self.by-version."tar"."0.1.18";
+  "tar" = self.by-version."tar"."0.1.19";
   by-spec."tar"."0" =
-    self.by-version."tar"."0.1.18";
+    self.by-version."tar"."0.1.19";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -12015,9 +12470,9 @@
     passthru.names = [ "tar" ];
   };
   by-spec."tar"."~0.1.17" =
-    self.by-version."tar"."0.1.18";
+    self.by-version."tar"."0.1.19";
   by-spec."tar"."~0.1.18" =
-    self.by-version."tar"."0.1.18";
+    self.by-version."tar"."0.1.19";
   by-spec."temp"."*" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -12041,6 +12496,8 @@
   "temp" = self.by-version."temp"."0.6.0";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
+  by-spec."temp"."~0.6.0" =
+    self.by-version."temp"."0.6.0";
   by-spec."text-table"."~0.1.1" =
     self.by-version."text-table"."0.1.1";
   by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -12059,6 +12516,24 @@
     ];
     passthru.names = [ "text-table" ];
   };
+  by-spec."text-table"."~0.2.0" =
+    self.by-version."text-table"."0.2.0";
+  by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "text-table-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."text-table" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "text-table" ];
+  };
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -12077,14 +12552,34 @@
     ];
     passthru.names = [ "throttleit" ];
   };
-  by-spec."timespan"."2.0.1" =
-    self.by-version."timespan"."2.0.1";
-  by-version."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "timespan-2.0.1";
+  by-spec."through2"."~0.1.0" =
+    self.by-version."through2"."0.1.0";
+  by-version."through2"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "through2-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through2/-/through2-0.1.0.tgz";
+        sha1 = "54e756cc6a543c72bb5adf55e8a248686b84c9cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.17"
+      self.by-version."xtend"."2.0.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through2" ];
+  };
+  by-spec."timespan"."2.1.0" =
+    self.by-version."timespan"."2.1.0";
+  by-version."timespan"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "timespan-2.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz";
-        sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a";
+        url = "http://registry.npmjs.org/timespan/-/timespan-2.1.0.tgz";
+        sha1 = "9a410fbbf26e213362d956f4836349e65e573832";
       })
     ];
     buildInputs =
@@ -12133,13 +12628,13 @@
     passthru.names = [ "tinycolor" ];
   };
   by-spec."tmp"."~0.0.20" =
-    self.by-version."tmp"."0.0.22";
-  by-version."tmp"."0.0.22" = lib.makeOverridable self.buildNodePackage {
-    name = "tmp-0.0.22";
+    self.by-version."tmp"."0.0.23";
+  by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
+    name = "tmp-0.0.23";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.22.tgz";
-        sha1 = "92133c8a93785fbbd3971c9454561921d58283cd";
+        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
+        sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
       })
     ];
     buildInputs =
@@ -12169,6 +12664,25 @@
     ];
     passthru.names = [ "touch" ];
   };
+  by-spec."tough-cookie"."~0.9.15" =
+    self.by-version."tough-cookie"."0.9.15";
+  by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage {
+    name = "tough-cookie-0.9.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
+        sha1 = "75617ac347e3659052b0350131885829677399f6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tough-cookie" or []);
+    deps = [
+      self.by-version."punycode"."1.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tough-cookie" ];
+  };
   by-spec."traceback".">=0.3.0 && < 0.4" =
     self.by-version."traceback"."0.3.0";
   by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -12398,13 +12912,13 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.6";
-  by-version."uglify-js"."2.4.6" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.6";
+    self.by-version."uglify-js"."2.4.7";
+  by-version."uglify-js"."2.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz";
-        sha1 = "31766a4d822babf5f32c14096251ed9259298ad3";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.7.tgz";
+        sha1 = "9f3b5bd1c657d16aaad7134a7adbeaa88e67c5ae";
       })
     ];
     buildInputs =
@@ -12638,7 +13152,7 @@
       (self.nativeDeps."update-notifier" or []);
     deps = [
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.1.5"
+      self.by-version."configstore"."0.1.6"
       self.by-version."semver"."2.1.0"
       self.by-version."chalk"."0.2.1"
     ];
@@ -12748,7 +13262,7 @@
       self.by-version."i"."0.3.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.4.2"
-      self.by-version."rimraf"."2.2.4"
+      self.by-version."rimraf"."2.2.5"
     ];
     peerDependencies = [
     ];
@@ -13011,13 +13525,13 @@
     passthru.names = [ "wd" ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.37.0-1";
-  by-version."webdrvr"."2.37.0-1" = lib.makeOverridable self.buildNodePackage {
-    name = "webdrvr-2.37.0-1";
+    self.by-version."webdrvr"."2.38.0-0";
+  by-version."webdrvr"."2.38.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.38.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-1.tgz";
-        sha1 = "8f1f2fbcc184b8964d26f0fca73264e0c1d595ea";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz";
+        sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c";
       })
     ];
     buildInputs =
@@ -13026,16 +13540,16 @@
       self.by-version."adm-zip"."0.4.3"
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."npmconf"."0.1.6"
-      self.by-version."phantomjs"."1.9.2-4"
-      self.by-version."tmp"."0.0.22"
+      self.by-version."npmconf"."0.1.7"
+      self.by-version."phantomjs"."1.9.2-5"
+      self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.37.0-1";
+  "webdrvr" = self.by-version."webdrvr"."2.38.0-0";
   by-spec."websocket-driver".">=0.3.0" =
     self.by-version."websocket-driver"."0.3.1";
   by-version."websocket-driver"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -13332,7 +13846,7 @@
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.5"
+      self.by-version."sax"."0.5.8"
     ];
     peerDependencies = [
     ];
@@ -13351,7 +13865,7 @@
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.5"
+      self.by-version."sax"."0.5.8"
     ];
     peerDependencies = [
     ];
@@ -13370,8 +13884,8 @@
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.5"
-      self.by-version."xmlbuilder"."1.0.2"
+      self.by-version."sax"."0.5.8"
+      self.by-version."xmlbuilder"."1.1.0"
     ];
     peerDependencies = [
     ];
@@ -13379,45 +13893,43 @@
   };
   by-spec."xml2js".">=0.1.7" =
     self.by-version."xml2js"."0.4.0";
-  by-spec."xmlbuilder"."*" =
-    self.by-version."xmlbuilder"."1.0.2";
-  by-version."xmlbuilder"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "xmlbuilder-1.0.2";
+  by-spec."xmlbuilder"."0.4.2" =
+    self.by-version."xmlbuilder"."0.4.2";
+  by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "xmlbuilder-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.0.2.tgz";
-        sha1 = "f3939d049e91c8c8af6165411944380798ed8e82";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
       })
     ];
     buildInputs =
       (self.nativeDeps."xmlbuilder" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "xmlbuilder" ];
   };
-  by-spec."xmlbuilder"."0.4.2" =
-    self.by-version."xmlbuilder"."0.4.2";
-  by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "xmlbuilder-0.4.2";
+  by-spec."xmlbuilder".">=0.4.2" =
+    self.by-version."xmlbuilder"."1.1.0";
+  by-version."xmlbuilder"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "xmlbuilder-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
-        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.1.0.tgz";
+        sha1 = "2b4935395f17c549e73b55730ea5e206a9c7d1c5";
       })
     ];
     buildInputs =
       (self.nativeDeps."xmlbuilder" or []);
     deps = [
+      self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "xmlbuilder" ];
   };
-  by-spec."xmlbuilder".">=0.4.2" =
-    self.by-version."xmlbuilder"."1.0.2";
   by-spec."xmlhttprequest"."1.4.2" =
     self.by-version."xmlhttprequest"."1.4.2";
   by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -13454,6 +13966,26 @@
     ];
     passthru.names = [ "xoauth2" ];
   };
+  by-spec."xtend"."~2.0.6" =
+    self.by-version."xtend"."2.0.6";
+  by-version."xtend"."2.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "xtend-2.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz";
+        sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xtend" or []);
+    deps = [
+      self.by-version."is-object"."0.1.2"
+      self.by-version."object-keys"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xtend" ];
+  };
   by-spec."yaml"."0.2.3" =
     self.by-version."yaml"."0.2.3";
   by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -13472,60 +14004,65 @@
     ];
     passthru.names = [ "yaml" ];
   };
-  by-spec."yeoman-generator"."~0.10.0" =
-    self.by-version."yeoman-generator"."0.10.5";
-  by-version."yeoman-generator"."0.10.5" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.10.5";
+  by-spec."yeoman-generator"."~0.13.0" =
+    self.by-version."yeoman-generator"."0.13.4";
+  by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.13.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.10.5.tgz";
-        sha1 = "67b28a6c453addc785e43180236df65e2f93554a";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
+        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
       })
     ];
     buildInputs =
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
-      self.by-version."cheerio"."0.10.8"
-      self.by-version."request"."2.16.6"
-      self.by-version."rimraf"."2.1.4"
-      self.by-version."tar"."0.1.18"
+      self.by-version."cheerio"."0.12.4"
+      self.by-version."request"."2.25.0"
+      self.by-version."rimraf"."2.2.5"
+      self.by-version."tar"."0.1.19"
       self.by-version."diff"."1.0.7"
       self.by-version."mime"."1.2.11"
       self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."1.1.1"
+      self.by-version."lodash"."1.3.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."read"."1.0.5"
-      self.by-version."glob"."3.1.21"
-      self.by-version."nopt"."2.1.2"
-      self.by-version."cli-table"."0.2.0"
+      self.by-version."glob"."3.2.7"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
+      self.by-version."dargs"."0.1.0"
+      self.by-version."async"."0.2.9"
+      self.by-version."inquirer"."0.3.5"
+      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."shelljs"."0.1.4"
+      self.by-version."findup-sync"."0.1.2"
+      self.by-version."chalk"."0.2.1"
+      self.by-version."text-table"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  by-spec."yeoman-generator"."~0.13.0" =
+  by-spec."yeoman-generator"."~0.13.1" =
     self.by-version."yeoman-generator"."0.13.4";
-  by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.13.4";
+  by-spec."yeoman-generator"."~0.14.0" =
+    self.by-version."yeoman-generator"."0.14.1";
+  by-version."yeoman-generator"."0.14.1" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.14.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
-        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.1.tgz";
+        sha1 = "d99358d6f65d8df0e384b45ff82f13560e06c78f";
       })
     ];
     buildInputs =
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
       self.by-version."cheerio"."0.12.4"
-      self.by-version."request"."2.25.0"
-      self.by-version."rimraf"."2.2.4"
-      self.by-version."tar"."0.1.18"
+      self.by-version."rimraf"."2.2.5"
       self.by-version."diff"."1.0.7"
       self.by-version."mime"."1.2.11"
       self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."1.3.1"
+      self.by-version."lodash"."2.2.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.7"
       self.by-version."debug"."0.7.4"
@@ -13534,37 +14071,38 @@
       self.by-version."async"."0.2.9"
       self.by-version."inquirer"."0.3.5"
       self.by-version."iconv-lite"."0.2.11"
-      self.by-version."shelljs"."0.1.4"
+      self.by-version."shelljs"."0.2.6"
       self.by-version."findup-sync"."0.1.2"
-      self.by-version."chalk"."0.2.1"
-      self.by-version."text-table"."0.1.1"
+      self.by-version."chalk"."0.3.0"
+      self.by-version."text-table"."0.2.0"
+      self.by-version."download"."0.1.7"
+      self.by-version."request"."2.27.0"
+      self.by-version."file-utils"."0.1.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  by-spec."yeoman-generator"."~0.13.1" =
-    self.by-version."yeoman-generator"."0.13.4";
-  by-spec."yeoman-generator"."~0.13.2" =
-    self.by-version."yeoman-generator"."0.13.4";
+  by-spec."yeoman-generator"."~0.14.1" =
+    self.by-version."yeoman-generator"."0.14.1";
   by-spec."yo"."*" =
-    self.by-version."yo"."1.0.4";
-  by-version."yo"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.0.4";
+    self.by-version."yo"."1.0.5";
+  by-version."yo"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "yo-1.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz";
-        sha1 = "666b5965a8e920df877d351da793f89bd1c8707a";
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.5.tgz";
+        sha1 = "4454720eb262d06395e950269fbb6ca25ed68c9e";
       })
     ];
     buildInputs =
       (self.nativeDeps."yo" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.13.4"
+      self.by-version."yeoman-generator"."0.14.1"
       self.by-version."nopt"."2.1.2"
-      self.by-version."lodash"."1.3.1"
+      self.by-version."lodash"."2.2.1"
       self.by-version."update-notifier"."0.1.7"
-      self.by-version."insight"."0.2.0"
+      self.by-version."insight"."0.3.0"
       self.by-version."sudo-block"."0.2.1"
       self.by-version."async"."0.2.9"
       self.by-version."open"."0.0.4"
@@ -13576,9 +14114,11 @@
     ];
     passthru.names = [ "yo" ];
   };
-  "yo" = self.by-version."yo"."1.0.4";
+  "yo" = self.by-version."yo"."1.0.5";
+  by-spec."yo".">=1.0.0" =
+    self.by-version."yo"."1.0.5";
   by-spec."yo".">=1.0.0-rc.1.1" =
-    self.by-version."yo"."1.0.4";
+    self.by-version."yo"."1.0.5";
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 6e525d7bd4f5..c11b7ee360ed 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -110,4 +110,6 @@
 , "meat"
 , "hipache"
 , "posix"
+, "node-protobuf"
+, "rethinkdb"
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 3daaa262280f..448904ce385a 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -5,6 +5,7 @@ rec {
     "node-expat" = [ pkgs.expat ];
     "rbytes" = [ pkgs.openssl ];
     "phantomjs" = [ pkgs.phantomjs ];
+    "node-protobuf" = [ pkgs.protobuf ];
   };
 
   buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 277b158cc4e0..03b1af896a75 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1884,10 +1884,10 @@ rec {
   };
 
   DataUUIDMT = buildPerlPackage {
-    name = "Data-UUID-MT-1.000";
+    name = "Data-UUID-MT-1.001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.000.tar.gz;
-      sha256 = "1bwrxv8fp4arwrmslsb7jlnafs8cww1p5f409d1l5kpyfj2vpsyp";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz;
+      sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h";
     };
     buildInputs = [ ListAllUtils ];
     propagatedBuildInputs = [ MathRandomMTAuto ];
@@ -1937,10 +1937,10 @@ rec {
   };
 
   DateTime = buildPerlModule {
-    name = "DateTime-1.03";
+    name = "DateTime-1.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.03.tar.gz;
-      sha256 = "384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz;
+      sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
@@ -2109,10 +2109,10 @@ rec {
   };
 
   DateTimeTimeZone = buildPerlPackage {
-    name = "DateTime-TimeZone-1.59";
+    name = "DateTime-TimeZone-1.63";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.59.tar.gz;
-      sha256 = "b1d50f6abde68671da1db883168ef8d6793a11ba75de02174f42e1dfd16b2522";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.63.tar.gz;
+      sha256 = "02a3kyz3cyrag98b1949k19axm03fa5ri82gdc1y4lnxjvjvxkfw";
     };
     buildInputs = [ TestOutput ];
     propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ];
@@ -3105,10 +3105,10 @@ rec {
   };
 
   ExtUtilsCBuilder = buildPerlPackage rec {
-    name = "ExtUtils-CBuilder-0.280205";
+    name = "ExtUtils-CBuilder-0.280212";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs";
+      sha256 = "0zc4hkcb8wk7nm0b2b6pb1lpih52blx6x2w6x99bcr0d581807xg";
     };
     buildInputs = [ PerlOSType ];
   };
@@ -3197,10 +3197,10 @@ rec {
   };
 
   ExtUtilsManifest = buildPerlPackage rec {
-    name = "ExtUtils-Manifest-1.61";
+    name = "ExtUtils-Manifest-1.63";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n";
+      sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg";
     };
   };
 
@@ -3302,10 +3302,10 @@ rec {
   };
 
   Filechdir = buildPerlPackage rec {
-    name = "File-chdir-0.1006";
+    name = "File-chdir-0.1008";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a";
+      sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr";
     };
   };
 
@@ -3591,10 +3591,10 @@ rec {
   };
 
   GD = buildPerlPackage rec {
-    name = "GD-2.49";
+    name = "GD-2.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "03wwvhvni22cs7arai7d3wkb2qfa9p20grrb32hdxv41nqxqpihh";
+      sha256 = "1qm8l0z2568byw4zmaqf954y3rm8nzx1nnz6cxnxd3d4cz894lvd";
     };
 
     buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype
@@ -3629,10 +3629,10 @@ rec {
   };
 
   GeoIP = buildPerlPackage rec {
-    name = "Geo-IP-1.39";
+    name = "Geo-IP-1.43";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz";
-      sha256 = "1yc0rn67nk4z8aq8d82axhfmgi0l91rkksqbf27ylasrhyb6ykx5";
+      sha256 = "0p7mcn4rzvhrblx72f5a1yg88mqgv6f46mq0rvhhkmkpwckb0yjq";
     };
     makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include";
     doCheck = false; # seems to access the network
@@ -3852,11 +3852,12 @@ rec {
   };
 
   HTMLFormFu = buildPerlPackage rec {
-    name = "HTML-FormFu-0.09007";
+    name = "HTML-FormFu-0.09010";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
-      sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy";
+      sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k";
     };
+    buildInputs = [ CGISimple ];
     propagatedBuildInputs =
       [ ClassAccessorChained Clone ConfigAny
         DateCalc ListMoreUtils EmailValid
@@ -4345,11 +4346,11 @@ rec {
   };
 
   ImageExifTool = buildPerlPackage rec {
-    name = "Image-ExifTool-8.41";
+    name = "Image-ExifTool-9.27";
 
     src = fetchurl {
       url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-      sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg";
+      sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c";
     };
 
     meta = {
@@ -4442,11 +4443,12 @@ rec {
   };
 
   JSON = buildPerlPackage {
-    name = "JSON-2.53";
+    name = "JSON-2.90";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz;
-      sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh";
+      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz;
+      sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd";
     };
+    buildInputs = [ TestPod ];
     meta = {
       description = "JSON (JavaScript Object Notation) encoder/decoder";
       license = "perl";
@@ -4467,10 +4469,10 @@ rec {
   };
 
   JSONPP = buildPerlPackage rec {
-    name = "JSON-PP-2.27200";
+    name = "JSON-PP-2.27203";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz;
-      sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3";
+      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz;
+      sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp";
     };
     meta = {
       description = "JSON::XS compatible pure-Perl module";
@@ -4688,10 +4690,10 @@ rec {
   };
 
   LogDispatch = buildPerlPackage {
-    name = "Log-Dispatch-2.39";
+    name = "Log-Dispatch-2.41";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.39.tar.gz;
-      sha256 = "1bi2nza0nc66i0ls2zkxi6bbwkh456pl0q8h57mq6skbhbmcwbb8";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz;
+      sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z";
     };
     propagatedBuildInputs = [ ClassLoad ParamsValidate ];
     meta = {
@@ -4845,10 +4847,10 @@ rec {
   };
 
   MailDKIM = buildPerlPackage rec {
-    name = "Mail-DKIM-0.39";
+    name = "Mail-DKIM-0.40";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz";
-      sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b";
+      sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw";
     };
     propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ];
     doCheck = false; # tries to access the domain name system
@@ -5643,10 +5645,10 @@ rec {
   };
 
   MooseXSetOnce = buildPerlPackage rec {
-    name = "MooseX-SetOnce-0.200001";
+    name = "MooseX-SetOnce-0.200002";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
-      sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6";
+      sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ Moose ];
@@ -6679,10 +6681,10 @@ rec {
   };
 
   PerlPrereqScanner = buildPerlPackage {
-    name = "Perl-PrereqScanner-1.016";
+    name = "Perl-PrereqScanner-1.018";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.016.tar.gz;
-      sha256 = "1ab70723f3d036ef91684572beacab40bf99f5ed69922769aa077664c778c474";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.018.tar.gz;
+      sha256 = "11zkam8svpgcjhjda0ap3afd797a69ndcc64fy3xw0j8v8kxa6hc";
     };
     buildInputs = [ PPI TryTiny ];
     propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ];
@@ -6826,10 +6828,10 @@ rec {
   };
 
   PodWeaver = buildPerlPackage {
-    name = "Pod-Weaver-3.101638";
+    name = "Pod-Weaver-4.004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-3.101638.tar.gz;
-      sha256 = "1232b761016221e331a266a42661fa352447d0da075ebdb41dc4c4d71e60629c";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz;
+      sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29";
     };
     buildInputs = [ PPI SoftwareLicense TestDifferences ];
     propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
@@ -7543,10 +7545,10 @@ rec {
   };
 
   SubInstall = buildPerlPackage {
-    name = "Sub-Install-0.926";
+    name = "Sub-Install-0.927";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.926.tar.gz;
-      sha256 = "0gkns6p11j46j6yzacanhbqgd4ws5r0ppg6yivz7cjbq8dk4kcmc";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz;
+      sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
@@ -8263,10 +8265,10 @@ rec {
   };
 
   TestPod = buildPerlPackage {
-    name = "Test-Pod-1.45";
+    name = "Test-Pod-1.48";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.45.tar.gz;
-      sha256 = "0yv0bglm4b9zfi9l5z6x2dy6pzlh8n5z9yl7py5v6h48mwgk74fk";
+      url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz;
+      sha256 = "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14";
     };
     meta = {
       homepage = http://search.cpan.org/dist/Test-Pod/;
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 5aafba980b90..ef7b1da92ab6 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -334,7 +334,6 @@ let
   ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };