Merge master into x-updates

author: Vladimír Čunát <vcunat@gmail.com> 2014-02-20 20:55:31 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2014-02-20 20:55:31 +0100
commit: ae5d8f67680b754381ef42545667092ac6a73f71 (patch)
tree: 960e48a196523d13f16c915402cc8164cda5fd40 /pkgs
parent: e40a059714c3ac438f0a9108f55bde1f3931b14c (diff)
parent: 95a77ea39fa5870955e5fbb6414640f7b1ec62c6 (diff)
download: nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.gz
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.bz2
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.lz
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.xz
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.zst
nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.zip
130 files changed, 1952 insertions, 880 deletions
diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index bf2ee04cbce9..4d725b43aae6 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -6,17 +6,18 @@
 , perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  # Ardour 3.0 tag
-  rev = "79db9422";
+  # Ardour 3.5.308 tag
+  rev = "40d8c5ae";
 in
 
-stdenv.mkDerivation {
-  name = "ardour-3.0";
+stdenv.mkDerivation rec {
+  name = "ardour-${version}";
+  version = "3.5.308";
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
     inherit rev;
-    sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
+    sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a";
   };
 
   buildInputs = 
@@ -28,13 +29,16 @@ stdenv.mkDerivation {
     ];
 
   patchPhase = ''
-    printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
+    # The funny revision number is from `git describe ${rev}
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${version}-g40d8c5a\"; }\n' > libs/ardour/revision.cc
+    # Note the different version number
+    sed -i '33i rev = \"3.5-308-g40d8c5a\"' wscript
+    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
     sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
     sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
-    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
   '';
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "python waf configure --optimize --prefix=$out";
 
   buildPhase = "python waf";
 
@@ -43,7 +47,7 @@ stdenv.mkDerivation {
   installPhase = ''
     python waf install
     mkdir -pv $out/gtk2/engines
-    mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
     wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
   '';
 
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 3ed650d4ae73..08cecfea064d 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
       Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
+    branch  = "2";
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 6e15478ff630..7704397e6d0a 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,27 +2,25 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
-, rubberband, vampSDK 
+, libsndfile, pkgconfig, pulseaudio, qt5, redland
+, rubberband, serd, sord, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "sonic-visualiser-${version}";
-  version = "1.9";
+  version = "2.3";
 
   src = fetchurl {
-    url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
-    sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
+
+    url = "http://code.soundsoftware.ac.uk/attachments/download/918/${name}.tar.gz";
+    sha256 = "1f06w2rin4r2mbi00bg3nmqdi2xdy9vq4jcmfanxzj3ld66ik40c";
   };
-  patches = [(fetchurl {
-    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch;
-    sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay";
-    name = "gcc47.patch";
-  })];
 
   buildInputs =
-    [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+    [ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      serd
+      sord
       pkgconfig
       # optional
       jackaudio
@@ -33,11 +31,10 @@ stdenv.mkDerivation rec {
       # fishsound
       liblo
       libX11
-      makeWrapper
     ];
 
   buildPhase = ''
-    for i in sonic-visualiser svapp svcore svgui; 
+    for i in sonic-visualiser svapp svcore svgui;
       do cd $i && qmake -makefile PREFIX=$out && cd ..;
     done
     make
@@ -45,19 +42,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,share/sonic-visualiser}
-    cp sonic-visualiser/sonic-visualiser $out/bin
-    cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
-    wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib
+    cp sonic-visualiser $out/bin/
+    cp -r samples $out/share/sonic-visualiser/
   '';
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
-    license = "GPLv2";
-    maintainers = 
-      [ stdenv.lib.maintainers.marcweber 
-        stdenv.lib.maintainers.goibhniu 
-      ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 53c8fa5bf761..1e920ff65c5f 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib
 , libXinerama, curl }:
 
 stdenv.mkDerivation rec {
@@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l";
   };
 
-  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
+  buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];
 
   preBuild = ''
     makeFlags="PREFIX=$out"
   '';
 
+  postInstall = ''
+    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin"
+  '';
+
   meta = {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 8748c808dc07..f63f41a8ed10 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "oiio-${version}";
-  version = "1.1.12";
+  version = "1.3.12";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
+    sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 99e1ec1c169b..aa09fb705f1c 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -2,11 +2,11 @@
 , intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
 
 stdenv.mkDerivation rec {
-  name = "viewnior-1.3";
+  name = "viewnior-1.4";
 
   src = fetchurl {
-    url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
-    sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
+    url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz";
+    sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a";
   };
 
   buildInputs =
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
       shared_mime_info glib gdk_pixbuf perl
     ];
 
+  preFixup = ''
+    rm $out/share/icons/*/icon-theme.cache
+  '';
+
   meta = {
     description = "Viewnior is a fast and simple image viewer for GNU/Linux";
     longDescription =
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0951340ee945..683c4242a9c1 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.67";
+  name = "blender-2.69";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l";
+    sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
   };
 
   buildInputs = [
@@ -35,11 +35,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "3D Creation/Animation/Publishing System";
     homepage = http://www.blender.org;
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
-    license = "GPLv2+";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+
   };
 }
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 7af8cbeccc63..4db4e4b10916 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "girara-0.1.9";
+  name = "girara-0.2.0";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70";
+    sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi";
   };
 
   buildInputs = [ pkgconfig gtk gettext ];
diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix
deleted file mode 100644
index b394719611de..000000000000
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-terminator-0.96";
-  
-  src = fetchurl {
-    url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz";
-    sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201";
-  };
-  
-  buildInputs =
-    [ python pygtk vte gettext intltool makeWrapper
-    ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    python setup.py --without-icon-cache install --prefix=$out
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
-            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
-    done
-  '';
-
-  meta = {
-    description = "Gnome terminal emulator with support for tiling and tabs";
-    homepage = http://www.tenshu.net/p/terminator.html;
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
index 22587a1bae04..3e652c717ec4 100644
--- a/pkgs/applications/misc/kde-wacomtablet/default.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, kdelibs, gettext }:
+{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet-1.3.5";
+  name = "wacomtablet-2.0";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
-    sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2";
+    sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax";
   };
 
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs xf86_input_wacom ];
 
   nativeBuildInputs = [ gettext ];
 
diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix
new file mode 100644
index 000000000000..a33cfbdf159a
--- /dev/null
+++ b/pkgs/applications/misc/nc-indicators/default.nix
@@ -0,0 +1,16 @@
+{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "nc-indicators";
+  version = "0.1";
+  sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ attoparsec gtk hflags lens pipes stm ];
+  meta = {
+    homepage = "https://github.com/nilcons/nc-indicators/issues";
+    description = "CPU load and memory usage indicators for i3bar";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
new file mode 100644
index 000000000000..c337cd329c92
--- /dev/null
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "terminator-${version}";
+  version = "0.97";
+  
+  src = fetchurl {
+    url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
+  };
+  
+  buildInputs = [
+    python pygtk notify keybinder vte gettext intltool makeWrapper
+  ];
+
+  installPhase = ''
+    python setup.py --without-icon-cache install --prefix="$out"
+
+    for file in "$out"/bin/*; do
+        wrapProgram "$file" \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Terminal emulator with support for tiling and tabs";
+    longDescription = ''
+      The goal of this project is to produce a useful tool for arranging
+      terminals. It is inspired by programs such as gnome-multi-term,
+      quadkonsole, etc. in that the main focus is arranging terminals in grids
+      (tabs is the most common default method, which Terminator also supports).
+    '';
+    homepage = http://gnometerminator.blogspot.no/p/introduction.html;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 00e1e6cd28a1..b86107890d86 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.6";
+  version = "0.2.7";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha1 = "d84878388969d523027a1661f49fd29638bd460b";
+    sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf";
   };
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 71c418f168c4..ce4894e6c0f1 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.4";
+  version = "0.2.5";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm";
+    sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
   };
 
   buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index ffce71ef09fa..64866243261b 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "34.0.1809.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
-    sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
+    version = "34.0.1847.3";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz";
+    sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
   };
   beta = {
-    version = "33.0.1750.46";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
-    sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
+    version = "33.0.1750.115";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
+    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
   };
   stable = {
-    version = "32.0.1700.107";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz";
-    sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz";
+    version = "33.0.1750.115";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
+    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 3b2911a97acd..c0cfb60420b7 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -82,7 +82,7 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
-    enableParallelBuilding = true;
+    #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
 
     preConfigure =
       ''
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index c8c72160b341..9ba9e3aa3fc4 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -2,17 +2,21 @@
 
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
-  version = "1.7.1";
+  version = "1.8.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
+    sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
   };
 
   buildInputs = [openssl libX11];
 
-  configureFlags = [ "--with-openssl=${openssl}" ];
+  configureFlags = [
+    "--with-openssl=${openssl}"
+    "--disable-credssp"
+    "--disable-smartcard"
+  ];
 
   meta = {
     description = "rdesktop is an open source client for Windows Terminal Services";
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 6f9de9d981f6..d4da5c113c99 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     )
   '';
 
-  installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
+  installPhase = ''make MKDIR_P="mkdir -p" install'';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index d75cca14b3a0..c38e4dea443b 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "1i4fzjv2x8mzx0bg52mgh1rrlircmb81jr58z90blbmww4mq36r1";
+    sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0";
   };
 
   buildInputs =
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
     platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 2ce134090fe5..79a208fa54c5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.18"; # changes ./guest-additions as well
+  version = "4.2.22"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,13 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "88780";
+  extpackRevision = "91556";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS
-    sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba";
+    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS
+    sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74";
+    sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 805e0b867d97..595698abcaa5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
+    sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 01424bae30b2..b22bdc88f83b 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -23,6 +23,8 @@
    server admins start using the new version?
 */
 
+assert md5 != "" || sha256 != "";
+
 stdenv.mkDerivation {
   name = "git-export";
   builder = ./builder.sh;
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 294d9a43ef7d..af4a6700153c 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -66,6 +66,7 @@ in
   showURLs ? false
 }:
 
+assert builtins.isList urls;
 assert urls != [] -> url == "";
 assert url != "" -> urls == [];
 
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 1b3454c8ce5a..4a177327e0e5 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.54";
+  name = "man-pages-3.60";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0rb75dl9hh4v2s95bcssy12j8qrbd2dmlzry68gphyxk5c7yipbl";
+    sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6";
   };
 
   preBuild =
diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix
index f060d81bd00e..25dd95c7f19c 100644
--- a/pkgs/desktops/e17/terminology/default.nix
+++ b/pkgs/desktops/e17/terminology/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp";
+    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
+    sha256 = "1ing9l19h7f1f843rcabbjaynps1as4mpc31xz2adkafb3xd3wk3";
   };
   buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
 
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
new file mode 100644
index 000000000000..7da49dbc7384
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
+, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
+, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, sqlite, gcr, avahi, nss, isocodes, itstool, file }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "epiphany-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz";
+    sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7";
+  };
+
+  # Tests need an X display
+  configureFlags = [ "--disable-static --disable-tests" ];
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  nativeBuildInputs = [ pkgconfig file ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
+                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
+                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
+                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram "$out/bin/epiphany" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Epiphany;
+    description = "WebKit based web browser for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
new file mode 100644
index 000000000000..12b2510dc436
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, which, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-common-3.10.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz";
+    sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3";
+  };
+
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
+
+  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
new file mode 100644
index 000000000000..0d2d406876b2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-icon-theme-symbolic-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz";
+    sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412";
+  };
+
+  configureFlags = "--enable-icon-mapping";
+
+  # Avoid postinstall make hooks
+  installPhase = ''
+    make install-exec-am install-data-local install-pkgconfigDATA
+    make -C src install
+  '';
+
+  buildInputs = [ pkgconfig iconnamingutils gtk];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
new file mode 100644
index 000000000000..bf630e1947de
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+, glib, desktop_file_utils, bash
+, makeWrapper, gnome3, file, itstool, libxml2 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "gucharmap-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz";
+    sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 intltool itstool glib
+                  gnome3.yelp_tools libxml2 file desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/gucharmap" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gucharmap;
+    description = "GNOME Character Map, based on the Unicode Character Database";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index 2775e87720cc..039227786522 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "libgee-0.13.4";
+  name = "libgee-0.13.90";
 
   src = fetchurl {
     url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
-    sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k";
+    sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6";
   };
 
+  doCheck = true;
+
   patches = [ ./fix_introspection_paths.patch ];
 
   buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
new file mode 100644
index 000000000000..b431a199bf72
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
+, libnotify, file }:
+
+stdenv.mkDerivation rec {
+  name = "vino-${versionMajor}.${versionMinor}";
+  versionMajor = "3.10";
+  versionMinor = "1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
+    sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
+
+  postInstall = ''
+    for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+    description = "GNOME desktop sharing server";
+    maintainers = with maintainers; [ lethalman iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
new file mode 100644
index 000000000000..39ff3838f4a8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-tools-3.10.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz";
+    sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz";
+  };
+
+  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
+    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
new file mode 100644
index 000000000000..708a8ff32d6c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, bash
+, itstool, libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-xsl-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz";
+    sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp's universal stylesheets for Mallard and DocBook";
+    maintainers = with maintainers; [ lethalman ];
+    license = [licenses.gpl2 licenses.lgpl2];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
new file mode 100644
index 000000000000..e6779abcffa4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, bash, makeWrapper, itstool, libxml2, libxslt, icu  }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz";
+    sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
+  };
+
+  propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
+                            gnome3.gnome_icon_theme hicolor_icon_theme
+                            gnome3.gnome_icon_theme_symbolic ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  gnome3.gsettings_desktop_schemas ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache
+    wrapProgram "$out/bin/yelp" \
+      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp is the help viewer in Gnome.";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 204a7600cf17..1c26c6949ca2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -4,7 +4,7 @@ rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
-  inherit (pkgs.gnome2) gnome_common ORBit2;
+  inherit (pkgs.gnome2) ORBit2;
   orbit = ORBit2;
   inherit (pkgs) libsoup;
 
@@ -20,6 +20,8 @@ rec {
 
   dconf = callPackage ./core/dconf { };
 
+  epiphany = callPackage ./core/epiphany { };
+
   evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
 
   evolution_data_server = callPackage ./core/evolution-data-server { };
@@ -36,8 +38,12 @@ rec {
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
 
+  gnome_common = callPackage ./core/gnome-common { };
+
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
 
+  gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
+
   gnome-menus = callPackage ./core/gnome-menus { };
 
   gnome_keyring = callPackage ./core/gnome-keyring { };
@@ -58,6 +64,8 @@ rec {
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
+  gucharmap = callPackage ./core/gucharmap { };
+
   gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
 
   eog = callPackage ./core/eog { };
@@ -84,6 +92,14 @@ rec {
 
   vte = callPackage ./core/vte { };
 
+  vino = callPackage ./core/vino { };
+
+  yelp = callPackage ./core/yelp { };
+
+  yelp_xsl = callPackage ./core/yelp-xsl { };
+
+  yelp_tools = callPackage ./core/yelp-tools { };
+
   zenity = callPackage ./core/zenity { };
 
 
@@ -107,6 +123,6 @@ rec {
 
   gitg = callPackage ./misc/gitg { };
 
-  libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; };
+  libgit2-glib = callPackage ./misc/libgit2-glib { };
 
 }
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 12d37ab5db50..17c3b4fa0a8c 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
 
   configureScript = "sh ./autogen.sh";
 
-  buildInputs = [ which gnome3.gnome_common autoconf automake libtool
-                  pkgconfig gtk_doc gobjectIntrospection libgit2 glib ];
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig
+                  gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index f56e64e2d158..feb6ed21409d 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -1,9 +1,10 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
 
 let
+  branch = "4.10";
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -64,7 +65,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix
index 8a6e8e167517..9424a762c8f2 100644
--- a/pkgs/desktops/kde-4.10/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
index c9fab80bffb4..fa6406043b1b 100644
--- a/pkgs/desktops/kde-4.10/l10n/default.nix
+++ b/pkgs/desktops/kde-4.10/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
index 95bf4b512c77..269bdc0d3a72 100644
--- a/pkgs/desktops/kde-4.11/default.nix
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -1,9 +1,11 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
 
 let
+  branch = "4.11";
+
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -36,7 +38,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix
index 8a6e8e167517..9424a762c8f2 100644
--- a/pkgs/desktops/kde-4.11/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.11/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix
index c9fab80bffb4..fa6406043b1b 100644
--- a/pkgs/desktops/kde-4.11/l10n/default.nix
+++ b/pkgs/desktops/kde-4.11/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix
index b8e0a828a888..6d3dd46df354 100644
--- a/pkgs/desktops/kde-4.12/default.nix
+++ b/pkgs/desktops/kde-4.12/default.nix
@@ -1,9 +1,11 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
 
 let
+  branch = "4.12";
+
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -36,7 +38,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix
index 04f798c233a1..6b4e1ba0ad87 100644
--- a/pkgs/desktops/kde-4.12/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix
index c9fab80bffb4..fa6406043b1b 100644
--- a/pkgs/desktops/kde-4.12/l10n/default.nix
+++ b/pkgs/desktops/kde-4.12/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 56fc15b0511c..698c75cfd165 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.12.3";
+  version = "0.12.4";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "1im00cki38ldsig93djlsap8zbgwv74kpgw7xg9l6ik2cbpk0131";
+    sha256 = "0f9jbijby8alwn9yv1fncr2yn0pghdqsvixkdcd6s8yvjyhylm1l";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 0302513e6fc5..d51838af5ad5 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -9,13 +9,12 @@ with stdenv.lib;
 let
 
   majorVersion = "2.6";
-  version = "${majorVersion}.8";
+  version = "${majorVersion}.9";
 
-  # http://www.python.org/download/releases/2.6.8/
-  # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
+  # python 2.6 will receive security fixes until Oct 2013
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
   };
 
   patches =
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 4897c0a5141e..e9277ce2dafb 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 let
 
   majorVersion = "2.7";
-  version = "${majorVersion}.5";
+  version = "${majorVersion}.6";
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz";
   };
 
   patches =
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 18af6487e558..af37b4372b76 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.3";
+  version = "${majorVersion}.4";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "1jwd9pw7vx6xpjyi7iv5j3rwwkf3vzrwj36kcj1qh8zn2avfj9p5";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index abfb3985f261..180de0e0bd52 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate
-, python, alsaLib, jackaudio }:
+{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
+, libsndfile, pkgconfig, python
+}:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.3.2";
+  name = "aubio-0.4.0";
 
   src = fetchurl {
-    url = "http://aubio.org/pub/${name}.tar.gz";
-    sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw";
+    url = "http://aubio.org/pub/${name}.tar.bz2";
+    sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
   };
 
-  buildInputs =
-    [ pkgconfig fftw libsndfile libsamplerate python
-      # optional:
-      alsaLib jackaudio
-    ];
+  buildInputs = [
+    alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
+  ];
 
-  meta = { 
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; { 
     description = "Library for audio labelling";
     homepage = http://aubio.org/;
-    license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index bfca4a523046..f4c4220a8792 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -6,21 +6,21 @@
 rec {
 
   vampSDK = stdenv.mkDerivation {
-    name = "vamp-sdk-2.2.1";
+    name = "vamp-sdk-2.5";
 
     src = fetchurl {
-      url = mirror://sourceforge/vamp/vamp-plugin-sdk-2.2.1.tar.gz;
-      sha256 = "09iw6gv8aqq5v322fhi872mrhjp0a2w63966g0mks4vhh84q252p";
+      url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
+      sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
     };
 
-    buildInputs = [pkgconfig libsndfile];
+    buildInputs = [ pkgconfig libsndfile ];
 
-    meta = { 
+    meta = with stdenv.lib; {
       description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
       homepage = http://sourceforge.net/projects/vamp;
-      license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.marcweber ];
-      platforms = stdenv.lib.platforms.linux;
+      license = licenses.bsd3;
+      maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+      platforms = platforms.linux;
     };
   };
 
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index 03a0c0019790..ad873b3eae85 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation (rec {
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
     maintainers = [ ];
+    platforms = platforms.all;
   };
 }
 
@@ -70,4 +71,15 @@ stdenv.mkDerivation (rec {
 (stdenv.lib.optionalAttrs stdenv.isFreeBSD {
   # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
   patches = [ ./guile-gnulib-includes.patch ];
-}))
+})
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isDarwin {
+  # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
+  # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
+  # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
+  patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ];
+})
+
+)
diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
new file mode 100644
index 000000000000..1bc3086faeb2
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
@@ -0,0 +1,59 @@
+From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Mon, 10 Feb 2014 10:43:52 +0100
+Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol
+
+---
+ lib/accelerated/x86/aes-cbc-x86-aesni.c |    2 --
+ lib/accelerated/x86/aes-cbc-x86-ssse3.c |    2 --
+ lib/accelerated/x86/x86.h               |    3 ++-
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
+index 6d4526f..1a2681f 100644
+--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
++++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
+@@ -39,8 +39,6 @@ struct aes_ctx {
+ 	int enc;
+ };
+ 
+-unsigned int _gnutls_x86_cpuid_s[4];
+-
+ static int
+ aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
+ {
+diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+index ff24578..2b2440a 100644
+--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
++++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+@@ -39,8 +39,6 @@ struct aes_ctx {
+ 	int enc;
+ };
+ 
+-unsigned int _gnutls_x86_cpuid_s[4];
+-
+ static int
+ aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
+ {
+diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h
+index ae04d32..03fc8de 100644
+--- a/lib/accelerated/x86/x86.h
++++ b/lib/accelerated/x86/x86.h
+@@ -22,6 +22,8 @@
+ 
+ #include <config.h>
+ 
++extern unsigned int _gnutls_x86_cpuid_s[4];
++
+ #if defined(ASM_X86)
+ 
+ void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
+@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void);
+  (nettle_hash_digest_func *) digest_func	\
+ } 
+ 
+-
+ #endif
+-- 
+1.7.1
+
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 81207155625a..a9137ad46a77 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.2.2";
+  name = "gst-plugins-bad-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c";
+    sha256 = "1317hik9fdmy300p7c2y3aw43y6v9dr8f1906zm7s876m48pjpar";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 01a75ce52112..0c8dbb21cfb0 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.2.2";
+  name = "gst-plugins-base-1.2.3";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69";
+    sha256 = "1qfs4lv91ggcck61pw0ybn3gzvx4kl2vsd6lp8l6ky3hq8syrvb1";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5e7548627fe2..85730c1bf259 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.2.2";
+  name = "gstreamer-1.2.3";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6";
+    sha256 = "1syqn0kki5disx01q3y0z6p5qhr2a5g388wc6s649cw4lcbri6hg";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 616f63d7da7f..71151c4e559c 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.2.2";
+  name = "gst-plugins-good-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81";
+    sha256 = "0w74hms2zg0rnhilj9cbhx9wfiryrkcvhr1g90scrg8mllv3bcxz";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 47be4c8f4a05..ee2cb8830b00 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -6,7 +6,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.2.2";
+  name = "gst-libav-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418";
+    sha256 = "1mmwyp6wahrx73zxiv67bwh9dqp7fn86igy4rkv0vx2m17hzpizb";
   };
 
   configureFlags = stdenv.lib.optionalString withSystemLibav
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 8dafbf013f37..50005004135a 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.2.2";
+  name = "gst-plugins-ugly-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3";
+    sha256 = "0fzbazgqrbyckbh2xqlzslzmm638bddp1fw8cc19kr7f0xv0lysk";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 57c37139d4f4..be9c67f797e7 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.3.2";
-  sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a";
+  version = "3.1.3.3";
+  sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
index 2857a21a8d98..e2d482b364ec 100644
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ b/pkgs/development/libraries/haskell/bert/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bert";
-  version = "1.2.2";
-  sha256 = "1dlq9fl5d2adprcybs4d4cyhj9q2c1l4kcc6vnnyhbyn201gxgpn";
+  version = "1.2.2.1";
+  sha256 = "1x23grykamyclx6a5jzyqwp3hwr2ma61zvmz89f3cj06sa49cgs0";
   buildDepends = [
     binary binaryConduit conduit mtl network networkConduit parsec time
     void
diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
index 6907a33744ff..8a0f1e62179c 100644
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ b/pkgs/development/libraries/haskell/charset/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "charset";
-  version = "0.3.6";
-  sha256 = "1g8m8nd5f100jlhvs6hbny96wy8iaggmp1lv36a5jxc54gmyxjd1";
+  version = "0.3.7";
+  sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6";
   buildDepends = [ semigroups unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/charset";
diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix
new file mode 100644
index 000000000000..95b52d50b4d8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/chunked-data/default.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath
+, text, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "chunked-data";
+  version = "0.1.0.0";
+  sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l";
+  buildDepends = [
+    blazeBuilder monoTraversable semigroups systemFilepath text
+    transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/fpco/chunked-data";
+    description = "Typeclasses for dealing with various chunked data representations";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index af740197765f..eec5677a89fa 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -1,14 +1,15 @@
-{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck
-, resourcet, systemFileio, transformers, void
+{ cabal, classyPrelude, conduit, conduitCombinators, hspec
+, monadControl, QuickCheck, resourcet, systemFileio, transformers
+, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.7.0";
-  sha256 = "0njhfqbcbsy1rv61fc4xqzqlb68hzqg9cr31f8bs6h7pa12n38zq";
+  version = "0.8.0";
+  sha256 = "1br2gjzafxgq6ksxl895m5acaffnswd1dhcjppx6gnyfa6i3fq1m";
   buildDepends = [
-    classyPrelude conduit monadControl resourcet systemFileio
-    transformers void
+    classyPrelude conduit conduitCombinators monadControl resourcet
+    systemFileio transformers void
   ];
   testDepends = [ conduit hspec QuickCheck transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index d2c0ccaf652e..f5429fb024dd 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,15 +1,15 @@
-{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase
-, monadControl, monoTraversable, QuickCheck, semigroups
+{ cabal, basicPrelude, chunkedData, enclosedExceptions, hashable
+, hspec, liftedBase, monoTraversable, QuickCheck, semigroups
 , systemFilepath, text, time, transformers, unorderedContainers
 , vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.7.0";
-  sha256 = "19n2kzzskrdwyacq14y8gf1avcy7clp7gzqh36dhw7pypy3x0k9n";
+  version = "0.8.0";
+  sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g";
   buildDepends = [
-    async basicPrelude deepseq hashable liftedBase monadControl
+    basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
     unorderedContainers vector vectorInstances
   ];
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
new file mode 100644
index 000000000000..8425c4653314
--- /dev/null
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -0,0 +1,24 @@
+{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
+, primitive, silently, systemFileio, systemFilepath, text
+, transformers, transformersBase, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "conduit-combinators";
+  version = "0.1.0.0";
+  sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx";
+  buildDepends = [
+    chunkedData conduit monoTraversable primitive systemFileio
+    systemFilepath text transformers transformersBase vector
+  ];
+  testDepends = [
+    basicPrelude chunkedData hspec monoTraversable silently text
+    transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/fpco/conduit-combinators";
+    description = "Commonly used conduit functions, for both chunked and unchunked data";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index d2d221177c85..bf28c20e714c 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,14 +1,15 @@
 { cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck
-, resourcet, text, transformers, transformersBase, void
+, resourcet, text, textStreamDecode, transformers, transformersBase
+, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.13.1";
-  sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y";
+  version = "1.0.15";
+  sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59";
   buildDepends = [
-    liftedBase mmorph monadControl mtl resourcet text transformers
-    transformersBase void
+    liftedBase mmorph monadControl mtl resourcet text textStreamDecode
+    transformers transformersBase void
   ];
   testDepends = [
     hspec mtl QuickCheck resourcet text transformers void
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index f59a80b2b65a..2cb78af7ba9c 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -1,11 +1,11 @@
-{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }:
+{ cabal, attoparsec, hspec, QuickCheck, text }:
 
 cabal.mkDerivation (self: {
   pname = "css-text";
-  version = "0.1.1";
-  sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y";
+  version = "0.1.2.0.1";
+  sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp";
   buildDepends = [ attoparsec text ];
-  testDepends = [ attoparsec hspec HUnit QuickCheck text ];
+  testDepends = [ attoparsec hspec QuickCheck text ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "CSS parser and renderer";
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index a96f1499f974..304b9e84942e 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dbus";
-  version = "0.10.5";
-  sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x";
+  version = "0.10.6";
+  sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf";
   buildDepends = [
     cereal libxmlSax network parsec random text transformers vector
     xmlTypes
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 9dd35804f430..5434db270875 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.0.0";
-  sha256 = "16h7c332qdj77dw8kvrdn1jzhzsnrcybbbm5x7pxvgpnn0wzz8si";
+  version = "1.1.1";
+  sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
new file mode 100644
index 000000000000..113c454d6db1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
@@ -0,0 +1,21 @@
+{ cabal, async, deepseq, hspec, liftedBase, monadControl
+, QuickCheck, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "enclosed-exceptions";
+  version = "1.0.0.1";
+  sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0";
+  buildDepends = [
+    async deepseq liftedBase monadControl transformers
+  ];
+  testDepends = [
+    async deepseq hspec liftedBase monadControl QuickCheck transformers
+  ];
+  meta = {
+    homepage = "https://github.com/jcristovao/enclosed-exceptions";
+    description = "Catching all exceptions from within an enclosed computation";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 739b800e28dc..b393aed07d5f 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,13 +1,15 @@
 { cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec
-, HUnit, parsec, shakespeare, text
+, HUnit, parsec, shakespeare, systemFileio, systemFilepath, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.7";
-  sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx";
+  version = "1.1.8";
+  sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x";
   buildDepends = [
-    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
+    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
+    systemFileio systemFilepath text time
   ];
   testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 4dc73996cd13..abfe150c1637 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.4";
-  sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
+  version = "0.5.5";
+  sha256 = "18k2fgwflzs2lpkhxg2xvni3l9cdn3hk9ajrd4flz12j7vp0ga4c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 04c88c257c1d..8719028bf3d1 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.5";
-  sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9";
+  version = "2.0.0.6";
+  sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index 89d277d1f406..524c2de1f734 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -1,10 +1,10 @@
-{ cabal, parsec }:
+{ cabal, attoparsec }:
 
 cabal.mkDerivation (self: {
   pname = "irc";
-  version = "0.5.1.0";
-  sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj";
-  buildDepends = [ parsec ];
+  version = "0.6.0.0";
+  sha256 = "037hpdb4b6nb5w62w34alwybchzybz0bq2cgp0mv4xlw7bks2nqv";
+  buildDepends = [ attoparsec ];
   meta = {
     description = "A small library for parsing IRC messages";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index c4438d973644..62bc3f7a2a41 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.9.4";
-  sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531";
+  version = "0.8.9.5";
+  sha256 = "0akv7zcyb3c213f8qz1xv1qyq04wa427a4mh8rmz1jlmcwiznk7z";
   buildDepends = [
     ListLike MonadCatchIOTransformers monadControl parallel
     transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index abf8df4f5569..d2cc342c4774 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.8";
-  sha256 = "0slwj2bi9v7qjr6ai5dwql7fqgsh8k9k2bzlsq407iacsv0w3b9h";
+  version = "0.5.9";
+  sha256 = "1m1fs2vaw3yn9ryd49aprxc5l10xkr86mlxxf5bk6qp51wnp9xqh";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   testDepends = [
     blazeBuilder Cabal HUnit mtl QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
index afdd782fe094..320a6f20699d 100644
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libxml-sax";
-  version = "0.7.4";
-  sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z";
+  version = "0.7.5";
+  sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
   buildDepends = [ text xmlTypes ];
   extraLibraries = [ libxml2 ];
   pkgconfigDepends = [ libxml2 ];
diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index ed88e24ffa94..03eb64da753f 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -1,16 +1,20 @@
-{ cabal, comonad, hashable, hspec, semigroupoids, semigroups, text
-, transformers, unorderedContainers, vector
+{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids
+, semigroups, text, transformers, unorderedContainers, vector
+, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.2.0.0";
-  sha256 = "1wg0yzim3ql73w5rsxjnglwlg8r2hqliddmdk8vwsbvg02kgwxvz";
+  version = "0.3.0.1";
+  sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
-    unorderedContainers vector
+    unorderedContainers vector vectorInstances
+  ];
+  testDepends = [
+    hspec QuickCheck semigroups text transformers unorderedContainers
+    vector
   ];
-  testDepends = [ hspec text ];
   meta = {
     homepage = "https://github.com/snoyberg/mono-traversable";
     description = "Type classes for mapping, folding, and traversing monomorphic containers";
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 3c5239b4737e..737ddbda5d63 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.24.0.0";
-  sha256 = "0vdhrsqwa2wq9cvf96x3hqml2vbjcvik9mpz1kbbhb61f9lbhas6";
+  version = "0.24.0.2";
+  sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s";
   buildDepends = [ utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 024cf9b1d412..b859858b8be4 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.2.1";
-  sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk";
+  version = "1.0.2.2";
+  sha256 = "1l7r40raqbhfgwgp5knkqfg2b7pqm4h23c9slbx55r829if8c54h";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
index 910d2cc6774b..cd56082d8b54 100644
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-protocol-xmpp";
-  version = "0.4.5";
-  sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg";
+  version = "0.4.6";
+  sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n";
   buildDepends = [
     gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
     xmlTypes
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 27f9d8a0b87c..7204286671e1 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.4.0";
-  sha256 = "0xffqxsh8yvfdk39mdgkf0l2v284fr31nz5k16dq752p63fnczkw";
+  version = "0.4.0.1";
+  sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 44e912514fc7..3260fd17e9e5 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.6";
-  sha256 = "1vaqwsdgi2mirplzg66zysc1ivjjr0qxyiibsh6j771hxs9qk2pr";
+  version = "0.3.7";
+  sha256 = "0zf2b2zisfx7j7i4jnb79w5hhk5dy53w23fi876flx3vl6mfvszw";
   buildDepends = [
     hashable QuickCheck text time unorderedContainers
   ];
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index d0c5f2200994..f3ec1471cbe9 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.11.1";
-  sha256 = "0fk3b4c9r4ybdv7x533afy91dcyf3ji2xsyfpi72z7637vmgv202";
+  version = "0.11.2";
+  sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 853a6294131f..4a2305cce2a4 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.6";
-  sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k";
+  version = "1.0.7.1";
+  sha256 = "1qw8hlldzdijp0vgikrbj83q4wmx6i1vswn4314dwjxcihljl8ls";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 36d3443c9585..12dcea223a90 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0.3";
-  sha256 = "1zcqq8880rsdx3xwf1czl4vn5l9igw181snbfv5k1gxpif6myhp1";
+  version = "1.2.0.4";
+  sha256 = "1y7bqv3yrlzbhd5s8w36z6vcc9jk5b9i8chhsqda5qay85rd0ipz";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 444eae235600..0a0a8f18b03e 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.2.0.4";
-  sha256 = "0pgh4sxy5plhmm55mqbcmicn28vlplk4pasgfnyy5wjaz28n6z97";
+  version = "1.2.1.1";
+  sha256 = "1if3mfkcdfls17pcfgn8grxykq8ia91i7qr4q6m1gy6q4gqs6fkg";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index bb7a3a7bc7af..2824c1c8f1c8 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "1.0.8.1";
-  sha256 = "1xh8hx1d8hk3kqg07pb2ikc814037bw1xhawskrpxq3x37xff4q4";
+  version = "1.0.9";
+  sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
new file mode 100644
index 000000000000..9954dc4f6a22
--- /dev/null
+++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, hspec, text }:
+
+cabal.mkDerivation (self: {
+  pname = "text-stream-decode";
+  version = "0.1.0.3";
+  sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv";
+  buildDepends = [ text ];
+  testDepends = [ deepseq hspec text ];
+  meta = {
+    homepage = "http://github.com/fpco/text-stream-decode";
+    description = "Streaming decoding functions for UTF encodings";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
index c46090cda9b1..4cce59f61658 100644
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-olson";
-  version = "0.1.2";
-  sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y";
+  version = "0.1.3";
+  sha256 = "02x3wq03h2zjhxrcv6vnq9hrzggdvpnj7zj8rcrq4scf67q6h8gc";
   buildDepends = [ binary extensibleExceptions time timezoneSeries ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 84f653cde168..d3c1bdbd4c7e 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.3.1";
-  sha256 = "0rbl9p1kdgvya2ah2bpaqfv73hlvhsd46nk5f5wgx244pm714kc5";
+  version = "2.0.3.2";
+  sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 24b0554ea012..c0d500ace719 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.1.3";
-  sha256 = "16iq2grgafshjwhjxwb0qdxiawr6z6hxaksix52nr8l4wm9ibhjv";
+  version = "0.8.2.0";
+  sha256 = "1gphlil7n0g9y6vqwyn9fc4sl2ccninznc59p11052j8q6yb34ia";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
new file mode 100644
index 000000000000..20e2cd2218ff
--- /dev/null
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome_common
+, gtk_doc, gtk2, python, pygtk, pygobject, lua
+}:
+
+stdenv.mkDerivation rec {
+  name = "keybinder-${version}";
+  version = "0.3.0";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
+    sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
+  };
+
+  buildInputs = [
+    autoconf automake libtool pkgconfig gnome_common gtk_doc gtk2
+    python pygtk pygobject lua
+  ];
+
+  preConfigure = ''
+    ./autogen.sh --prefix="$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Library for registering global key bindings";
+    longDescription = ''
+      keybinder is a library for registering global keyboard shortcuts.
+      Keybinder works with GTK-based applications using the X Window System.
+
+      The library contains:
+
+      * A C library, ``libkeybinder``
+      * Gobject-Introspection (gir)  generated bindings
+      * Lua bindings, ``lua-keybinder``
+      * Python bindings, ``python-keybinder``
+      * An ``examples`` directory with programs in C, Lua, Python and Vala.
+    '';
+    homepage = https://github.com/engla/keybinder/;
+    license = licenses.gpl2Plus;
+    platform = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix
index 49624fc6bd27..3e4f58a5ce0f 100644
--- a/pkgs/development/libraries/libev/src-for-default.nix
+++ b/pkgs/development/libraries/libev/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="4.11";
-   name="libev-4.11";
-   hash="1pwcjch21xc7cfmjldkw1n7lcs4pyqm9dx573wdhmmp4yrpz2mcz";
+   version="4.15";
+   name="libev-4.15";
+   hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
    url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz";
-   advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz";
+   advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz";
   
   
 }
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 33b713239c85..f3b1c2c72a77 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "mxml-${version}";
-  version = "2.6";
+  version = "2.8";
 
   src = fetchurl {
-    url = "http://ftp.easysw.com/pub/mxml/${version}/${name}.tar.gz";
-    sha256 = "15cpqr43cwvy1ms67rfav8l9fjgybkaqfq7nhag8qnhd3bd4glxh";
+    url = "http://www.msweet.org/files/project3/${name}.tar.gz";
+    sha256 = "1m8i62dfmgfc1v8y3zx0r4i2hr5n86yw01xh5kiq53bi3bwnk4qc";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 513b340e132a..28d361ea7b8d 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocio-${version}";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchurl {
-    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
-    sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
+    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip";
+    sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr";
   };
 
   buildInputs = [ cmake unzip ];
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 9e606967ab11..b0707ad15f06 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -2,20 +2,21 @@
 , vampSDK, ladspaH }:
 
 stdenv.mkDerivation {
-  name = "rubberband-1.7.0";
+  name = "rubberband-1.8.1";
 
   src = fetchurl {
-    url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.7.0.tar.bz2;
-    sha256 = "10pnfzaiws6bi17qlyj3r0alj2nvm11pkd14nms6yxas8c7gwdw0";
+    url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2;
+    sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z";
   };
 
   buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = http://www.breakfastquay.com/rubberband/index.html;
-    license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    # commercial license available as well, see homepage. You'll get some more optimized routines
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index fb24ba98b450..9a81b840b35d 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -8,13 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
   };
 
+  patches = [ ./glext85.patch
+              (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1";
+                          name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch";
+                          sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs";
+                        }) ];
+
   buildInputs = [ libvdpau mesa libva pkgconfig ];
 
   preConfigure = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  patches = [ ./glext85.patch ];
 
   meta = {
     homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/;
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 55e9d63d727a..8a0a8f460dec 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python}:
+{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}:
 { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
   
-  buildInputs = [ titanium jdk python ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
+  buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
   
   buildPhase = ''
     export HOME=$TMPDIR
@@ -38,7 +38,9 @@ stdenv.mkDerivation {
     
     echo "{}" > $TMPDIR/config.json
     titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-
+    
+    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
+    
     mkdir -p $out
     
     ${if target == "android" then
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index b77468a09536..6c80cdae3e26 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "5.0"}:
+{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}:
 
 let
   # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@@ -27,12 +27,17 @@ rec {
     version = xcodeVersion;
   } else null;
   
-  titaniumsdk = import ./titaniumsdk.nix {
-    inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
-  };
+  titaniumsdk = let
+    titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
+      else if tiVersion == "3.2.1.GA" then ./titaniumsdk-3.2.nix
+      else throw "Titanium version not supported: "+tiVersion;
+    in
+    import titaniumSdkFile {
+      inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
+    };
   
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python;
+    inherit (pkgs) stdenv python which;
     jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7
       else if pkgs.stdenv.isDarwin then jdkWrapper
       else throw "Platform not supported: ${pkgs.stdenv.system}";
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index e955a1d8865a..c9f32f8bb6b1 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,6 +1,7 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "5.0"
+, tiVersion ? "3.2.1.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
 }:
@@ -15,7 +16,8 @@ rec {
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "android";
   });
   
@@ -25,7 +27,8 @@ rec {
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "android";
     release = true;
   });
@@ -55,7 +58,8 @@ rec {
   rec {
   kitchensink_ios_development = import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "iphone";
   };
 
@@ -79,8 +83,9 @@ rec {
   {
     kitchensink_ipa = import ./kitchensink {
       inherit (pkgs) stdenv fetchgit;
-      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
       target = "iphone";
+      inherit tiVersion;
       release = true;
       rename = true;
       inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index a5cd156a8ffd..95dd09be30dc 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,4 +1,4 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], release ? false
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null
 }:
 
@@ -7,8 +7,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 let
   src = fetchgit {
     url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "d9f39950c0137a1dd67c925ef9e8046a9f0644ff";
-    sha256 = "0aj42ac262hw9n9blzhfibg61kkbp3wky69rp2yhd11vwjlcq1qc";
+    rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae";
+    sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz";
   };
   
   # Rename the bundle id to something else
@@ -28,7 +28,7 @@ in
 titaniumenv.buildApp {
   name = "KitchenSink-${target}-${if release then "release" else "debug"}";
   src = if rename then renamedSrc else src;
-  tiVersion = "3.1.4.GA";
+  inherit tiVersion;
   
   inherit target androidPlatformVersions release;
   
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
index fa01dadc7756..fa01dadc7756 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
new file mode 100644
index 000000000000..96428f4a99bc
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@@ -0,0 +1,78 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-3.2.1.v20140206170116";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-linux.zip;
+    sha1 = "89955d31d48875aca64dd0131baac5ed82abcfc9";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-osx.zip;
+    sha1 = "06d9338c619b787be83baf3c0d93748b0e430182";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    yes y | unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+   
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv 3.2.1.v20140206170116 3.2.1.GA
+    cd 3.2.1.GA
+    
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    mv builder.py .builder.py
+    cat > builder.py <<EOF
+    #!${python}/bin/python
+    
+    import os, sys
+    
+    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
+    os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'
+    
+    os.execv('$(pwd)/.builder.py', sys.argv)
+    EOF
+    
+    chmod +x builder.py
+    
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+    
+    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
+  '';
+}
diff --git a/pkgs/development/perl-modules/finance-quote-yahoo.patch b/pkgs/development/perl-modules/finance-quote-yahoo.patch
deleted file mode 100644
index 213d96c31c84..000000000000
--- a/pkgs/development/perl-modules/finance-quote-yahoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm
---- Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm	2012-09-30 13:37:20.000000000 +0000
-+++ Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm	2014-02-13 22:02:53.538698928 +0000
-@@ -41,7 +41,7 @@
- 
- # URLs of where to obtain information.
- 
--$YAHOO_URL = ("http://finance.yahoo.com/d");
-+$YAHOO_URL = ("http://finance.yahoo.com/d/quotes.csv");
- 
- sub methods {return (canada   => \&yahoo,
-                      usa      => \&yahoo,
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 0d298558e5ee..2e5701375a47 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnulib-0.0-8015-gf0aab22";
+  name = "gnulib-0.1-83-g8008cac";
 
   src = fetchgit {
     url = "http://git.savannah.gnu.org/r/gnulib.git";
-    rev = "f0aab227265173908ecaa2353de6cf791cec3304";
-    sha256 = "162i39wvrmjhkg8w07i92vg9l0f0lk57zl1ynf0lvs70rkdd8a82";
+    rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6";
+    sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm";
   };
 
   buildPhase = ":";
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 342eb3ecfd11..9dc8536a4c09 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.59";
-  sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598";
+  version = "1.60";
+  sha256 = "1jp4rq8gfdz5knm9cbralhjyw2a391cck49422bskl7c23p94y3l";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix
index 2d8169d408fe..f6793e3aeec0 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
     description = "Part of the GNU Build System";
+    branch = "2.13";
 
     longDescription = ''
       GNU Autoconf is an extensible package of M4 macros that produce
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 4ec9358a388c..fca4efc8661a 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18";
-  sha256 = "0b5hpqbzvw5dzkbjxqyc2d7ll2c6zf9wd8k182zhvz3kyxmkvs2s";
+  version = "1.18.1";
+  sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://haskell.org/cpphs/";
+    homepage = "http://projects.haskell.org/cpphs/";
     description = "A liberalised re-implementation of cpp, the C pre-processor";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/misc/teensy/default.nix b/pkgs/development/tools/misc/teensy/default.nix
new file mode 100644
index 000000000000..9902cd034539
--- /dev/null
+++ b/pkgs/development/tools/misc/teensy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, libusb }:
+let
+  version = "2.1";
+in
+stdenv.mkDerivation {
+  name = "teensy-loader-${version}";
+  src = fetchurl {
+    url = "http://www.pjrc.com/teensy/teensy_loader_cli.2.1.zip";
+    sha256 = "0iidj3q0l2hds1gaadnwgni4qdgk6r0nv101986jxda8cw6h9zfs";
+  };
+
+  buildInputs = [ unzip libusb ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v teensy_loader_cli $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    description = "Firmware uploader for the Teensy microcontroller board";
+    homepage = http://www.pjrc.com/teensy/;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
new file mode 100644
index 000000000000..2caf52f3c0a3
--- /dev/null
+++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
@@ -0,0 +1,27 @@
+From 6503848d9e0eb009e5f462116a963beacb208930 Mon Sep 17 00:00:00 2001
+From: Austin Seipp <aseipp@pobox.com>
+Date: Thu, 20 Feb 2014 00:11:44 -0600
+Subject: [PATCH] attempt to 'modprobe config' before checking kernel
+
+Signed-off-by: Austin Seipp <aseipp@pobox.com>
+---
+ checksec.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/checksec.sh b/checksec.sh
+index dd1f72e..63acc29 100644
+--- a/checksec.sh
++++ b/checksec.sh
+@@ -337,7 +337,8 @@ kernelcheck() {
+   printf "  userspace processes, this option lists the status of kernel configuration\n"
+   printf "  options that harden the kernel itself against attack.\n\n"
+   printf "  Kernel config: "
+- 
++
++  modprobe configs 2> /dev/null
+   if [ -f /proc/config.gz ] ; then
+     kconfig="zcat /proc/config.gz"
+     printf "\033[32m/proc/config.gz\033[m\n\n"
+-- 
+1.8.3.2
+
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
new file mode 100644
index 000000000000..5e5ed6da1c92
--- /dev/null
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, file, findutils, elfutils, glibc }:
+
+stdenv.mkDerivation rec {
+  name = "checksec-${version}";
+  version = "1.5";
+  src = fetchurl {
+    url    = "http://www.trapkit.de/tools/checksec.sh";
+    sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p";
+  };
+
+  patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];
+
+  unpackPhase = ''
+    mkdir ${name}-${version}
+    cp $src ${name}-${version}/checksec.sh
+    cd ${name}-${version}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp checksec.sh $out/bin/checksec
+    chmod +x $out/bin/checksec
+    substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell}
+    substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6
+    substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
+    substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
+    substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
+    substituteInPlace $out/bin/checksec --replace " readelf -" " ${elfutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "(readelf -" "(${elfutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${elfutils}/bin/readelf"
+  '';
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  meta = {
+    description = "A tool for checking security bits on executables";
+    platforms   = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index d7acc6778b4d..a9278f0c7ce0 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam }:
+{ stdenv, fetchurl, pam, qrencode }:
 
 stdenv.mkDerivation rec {
   name = "google-authenticator-1.0";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pam ];
 
+  preConfigure = ''
+    sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c
+  '';
+
   installPhase = ''
     ensureDir $out/bin $out/lib/security
     cp pam_google_authenticator.so $out/lib/security
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index cd2e5cdae872..352b3cc483dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.10";
+  version = "3.12.11";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0p30mfrf3jfp353k0fbfpbmz3sfkhlyzcispqg22dc0lzcj76aj7";
+    sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index f9135ea3e11d..cee4bf31dfe9 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.54";
+  version = "3.2.55";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15mr1mrsldvs3jx9nc25pfmmdbz2ykiaxnqc26chn6k425l4kn67";
+    sha256 = "15fj7kd3ba52in1siqbdq45i7xzb53yy88l9k4bgfgds3j8wxj9m";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c36779c295f5..d14a124dd050 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -78,11 +78,11 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_54 =
-    { name = "grsecurity-3.0-3.2.54";
+  grsecurity_3_0_3_2_55 =
+    { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch;
-        sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch;
+        sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_3 =
     { name = "grsecurity-3.0-3.13.3";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch;
-        sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch;
+        sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index f6b31177157c..64dd15be3df7 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Apache HTTPD, the world's most popular web server";
+    branch      = "2.2";
     homepage    = http://httpd.apache.org/;
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 0208420d1328..f263c8c2e7e9 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, apacheAnt, jdk, unzip}:
 
 stdenv.mkDerivation {
-  name = "axis2-1.6.1";
+  name = "axis2-1.6.2";
 
   src = fetchurl {
-    url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip;
-    sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64";
+    url = http://apache.proserve.nl//axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip;
+    sha256 = "02i6fv11ksd5ql81i501bcb11ib5gyhq3zxwrz5jm4ic80r097fp";
   };
 
   buildInputs = [ unzip apacheAnt jdk ];
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 2abc84e78e41..e5c7fbeb0d7c 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.70";
+  name = "pngcrush-1.7.71";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "04zgnqdfq7mcsgml719wb552v8cfg52d8knbhqv55kwgw7y822jh";
+    sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd";
   };
 
   configurePhase = ''
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index c1b3cd575301..ef4bc68b1c80 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 = "2014.02.13";
+  version = "2014.02.19.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq";
+    sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index ffe22a93d0d4..b42f202099b1 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -4,7 +4,7 @@ let
   rev = "f7b02ac0cc";
 in
 stdenv.mkDerivation {
-  name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}";
+  name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
     url = "https://github.com/cjdelisle/cjdns.git";
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 26b4b680a6e9..4f54404b713a 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "speedtest-cli-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q";
+    sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a87a68ae3663..d017d85bb867 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3232,7 +3232,7 @@ let
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 {
-    db = db44;
+    db = db47;
   };
   python27 = callPackage ../development/interpreters/python/2.7 {
     libX11 = xlibs.libX11;
@@ -3769,6 +3769,8 @@ let
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
+  teensy-loader = callPackage ../development/tools/misc/teensy { };
+
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
@@ -4545,6 +4547,12 @@ let
 
   judy = callPackage ../development/libraries/judy { };
 
+  keybinder = callPackage ../development/libraries/keybinder {
+    inherit (gnome2) gnome_common;
+    automake = automake111x;
+    lua = lua5_1;
+  };
+
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
   lcms = lcms1;
@@ -6493,6 +6501,8 @@ let
 
   checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
 
+  checksec = callPackage ../os-specific/linux/checksec { };
+
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 
   conky = callPackage ../os-specific/linux/conky { };
@@ -6671,7 +6681,7 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_2.modDirVersion}-grsec";
     };
@@ -7800,6 +7810,8 @@ let
 
   epdfview = callPackage ../applications/misc/epdfview { };
 
+  inherit (gnome3) epiphany;
+
   espeak = callPackage ../applications/audio/espeak { };
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
@@ -7874,6 +7886,8 @@ let
 
   gtimelog = pythonPackages.gtimelog;
 
+  inherit (gnome3) gucharmap;
+  
   guitarix = callPackage ../applications/audio/guitarix {
     fftw = fftwSinglePrec;
   };
@@ -8093,10 +8107,6 @@ let
     inherit (gnome) GConf;
   };
 
-  gnome_terminator = callPackage ../applications/misc/gnome_terminator {
-    vte = gnome.vte.override { pythonSupport = true; };
-  };
-
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
@@ -8330,7 +8340,9 @@ let
     libosip = libosip_3;
   };
 
-  linuxsampler = callPackage ../applications/audio/linuxsampler { };
+  linuxsampler = callPackage ../applications/audio/linuxsampler {
+    bison = bison2;
+  };
 
   lmms = callPackage ../applications/audio/lmms { };
 
@@ -8897,6 +8909,11 @@ let
 
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
+  terminator = callPackage ../applications/misc/terminator {
+    vte = gnome.vte.override { pythonSupport = true; };
+    inherit (pythonPackages) notify;
+  };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
@@ -9228,6 +9245,8 @@ let
 
   yate = callPackage ../applications/misc/yate { };
 
+  inherit (gnome3) yelp;
+
   qgis = callPackage ../applications/misc/qgis {};
 
   ykpers = callPackage ../applications/misc/ykpers {};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 119aca3305a2..dd996a0d5760 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -527,9 +527,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
-    attoparsec = self.attoparsec_0_11_1_0;
-  };
+  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {};
   aeson = self.aeson_0_6_2_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
@@ -756,6 +754,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   checkers = callPackage ../development/libraries/haskell/checkers {};
 
+  chunkedData = callPackage ../development/libraries/haskell/chunked-data {};
+
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
 
   cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
@@ -806,6 +806,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
+  conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   configurator = callPackage ../development/libraries/haskell/configurator {};
@@ -1017,6 +1019,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};
 
+  enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {};
+
   encoding = callPackage ../development/libraries/haskell/encoding {};
 
   enumerator = callPackage ../development/libraries/haskell/enumerator {};
@@ -2367,6 +2371,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   textIcu = callPackage ../development/libraries/haskell/text-icu {};
 
+  textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {};
+
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
   thExtras = callPackage ../development/libraries/haskell/th-extras {};
@@ -2787,6 +2793,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     QuickCheck = self.QuickCheck2;
   };
 
+  nc-indicators = callPackage ../applications/misc/nc-indicators {};
+
   taffybar = callPackage ../applications/misc/taffybar {};
 
   yi = callPackage ../applications/editors/yi/yi.nix {};
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index b50f064af0c6..8e5bab29474b 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -65,6 +65,10 @@ releaseTools.sourceTarball rec {
     header "checking eval-release.nix"
     nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
     stopNest
+
+    header "checking find-tarballs.nix"
+    nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null
+    stopNest
   '';
 
   distPhase = ''
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 139c948298a4..f2b7328f35a1 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2,37 +2,58 @@
 
 {
   by-spec."CSSselect"."0.x" =
-    self.by-version."CSSselect"."0.4.0";
-  by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSselect-0.4.0";
+    self.by-version."CSSselect"."0.5.0";
+  by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSselect-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz";
-        name = "CSSselect-0.4.0.tgz";
-        sha1 = "0ddaecd7d157f482d101dfbe154d3accd9166331";
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.5.0.tgz";
+        name = "CSSselect-0.5.0.tgz";
+        sha1 = "cd12727a4e3a85d1e862611b349c9e3c6b7e0452";
       })
     ];
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.1"
-      self.by-version."domutils"."1.3.0"
+      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."domutils"."1.4.0"
+      self.by-version."boolbase"."1.0.0"
+      self.by-version."nth-check"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "CSSselect" ];
   };
   by-spec."CSSselect"."~0.4.0" =
-    self.by-version."CSSselect"."0.4.0";
+    self.by-version."CSSselect"."0.4.1";
+  by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSselect-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
+        name = "CSSselect-0.4.1.tgz";
+        sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."CSSselect" or []);
+    deps = [
+      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."domutils"."1.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "CSSselect" ];
+  };
   by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.1";
-  by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.1";
+    self.by-version."CSSwhat"."0.4.2";
+  by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSwhat-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz";
-        name = "CSSwhat-0.4.1.tgz";
-        sha1 = "fe6580461b2a3ad550d2a7785a051234974dfca7";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz";
+        name = "CSSwhat-0.4.2.tgz";
+        sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5";
       })
     ];
     buildInputs =
@@ -106,14 +127,14 @@
     passthru.names = [ "active-x-obfuscator" ];
   };
   by-spec."addressparser"."~0.2.0" =
-    self.by-version."addressparser"."0.2.0";
-  by-version."addressparser"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-addressparser-0.2.0";
+    self.by-version."addressparser"."0.2.1";
+  by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-addressparser-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz";
-        name = "addressparser-0.2.0.tgz";
-        sha1 = "853383313b7b60259ba4558ef1c0bc30efac08fc";
+        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
+        name = "addressparser-0.2.1.tgz";
+        sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
       })
     ];
     buildInputs =
@@ -392,7 +413,7 @@
       (self.nativeDeps."archiver" or []);
     deps = [
       self.by-version."readable-stream"."1.0.25"
-      self.by-version."zip-stream"."0.1.3"
+      self.by-version."zip-stream"."0.1.4"
       self.by-version."lazystream"."0.1.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."lodash"."2.4.1"
@@ -486,14 +507,14 @@
     passthru.names = [ "asn1" ];
   };
   by-spec."assert"."*" =
-    self.by-version."assert"."1.1.0";
-  by-version."assert"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-assert-1.1.0";
+    self.by-version."assert"."1.1.1";
+  by-version."assert"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-assert-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/assert/-/assert-1.1.0.tgz";
-        name = "assert-1.1.0.tgz";
-        sha1 = "851f832b880525bb9f6c1bb1dfd93ea028247f23";
+        url = "http://registry.npmjs.org/assert/-/assert-1.1.1.tgz";
+        name = "assert-1.1.1.tgz";
+        sha1 = "766549ef4a6014b1e19c7c53f9816eabda440760";
       })
     ];
     buildInputs =
@@ -505,7 +526,7 @@
     ];
     passthru.names = [ "assert" ];
   };
-  "assert" = self.by-version."assert"."1.1.0";
+  "assert" = self.by-version."assert"."1.1.1";
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -736,26 +757,26 @@
     passthru.names = [ "aws-sign2" ];
   };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.1.0";
-  by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-backbone-1.1.0";
+    self.by-version."backbone"."1.1.1";
+  by-version."backbone"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-backbone-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz";
-        name = "backbone-1.1.0.tgz";
-        sha1 = "a3c845ea707dc210aa12b0dc16fceca4bbc18a3e";
+        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.1.tgz";
+        name = "backbone-1.1.1.tgz";
+        sha1 = "8091197fef3a58fdeae24de70d96e23ce432f399";
       })
     ];
     buildInputs =
       (self.nativeDeps."backbone" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "backbone" ];
   };
-  "backbone" = self.by-version."backbone"."1.1.0";
+  "backbone" = self.by-version."backbone"."1.1.1";
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
   by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -934,6 +955,25 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
+  by-spec."boolbase"."~1.0.0" =
+    self.by-version."boolbase"."1.0.0";
+  by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-boolbase-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+        name = "boolbase-1.0.0.tgz";
+        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."boolbase" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "boolbase" ];
+  };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage {
@@ -1002,7 +1042,7 @@
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
       self.by-version."junk"."0.2.2"
@@ -1052,7 +1092,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1075,7 +1115,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1120,7 +1160,7 @@
       (self.nativeDeps."bower-json" or []);
     deps = [
       self.by-version."deep-extend"."0.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."intersect"."0.0.3"
     ];
     peerDependencies = [
@@ -1183,7 +1223,7 @@
     deps = [
       self.by-version."async"."0.2.10"
       self.by-version."bower-config"."0.4.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
@@ -1262,7 +1302,7 @@
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.12.0"
+      self.by-version."connect"."2.13.0"
       self.by-version."request"."2.33.0"
     ];
     peerDependencies = [
@@ -1327,6 +1367,26 @@
     ];
     passthru.names = [ "bson" ];
   };
+  by-spec."bson"."0.2.6" =
+    self.by-version."bson"."0.2.6";
+  by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz";
+        name = "bson-0.2.6.tgz";
+        sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson" or []);
+    deps = [
+      self.by-version."nan"."0.8.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1602,7 +1662,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.1.2"
     ];
     peerDependencies = [
@@ -1623,7 +1683,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1646,7 +1706,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1667,7 +1727,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."1.0.0"
       self.by-version."strip-ansi"."0.1.1"
     ];
@@ -1711,7 +1771,7 @@
       self.by-version."cheerio-select"."0.0.3"
       self.by-version."htmlparser2"."3.1.4"
       self.by-version."underscore"."1.4.4"
-      self.by-version."entities"."0.3.0"
+      self.by-version."entities"."0.5.0"
     ];
     peerDependencies = [
     ];
@@ -1733,8 +1793,8 @@
     deps = [
       self.by-version."htmlparser2"."3.4.0"
       self.by-version."underscore"."1.5.2"
-      self.by-version."entities"."0.3.0"
-      self.by-version."CSSselect"."0.4.0"
+      self.by-version."entities"."0.5.0"
+      self.by-version."CSSselect"."0.4.1"
     ];
     peerDependencies = [
     ];
@@ -1754,7 +1814,7 @@
     buildInputs =
       (self.nativeDeps."cheerio-select" or []);
     deps = [
-      self.by-version."CSSselect"."0.4.0"
+      self.by-version."CSSselect"."0.5.0"
     ];
     peerDependencies = [
     ];
@@ -1857,14 +1917,14 @@
     passthru.names = [ "class-extend" ];
   };
   by-spec."clean-css"."2.0.x" =
-    self.by-version."clean-css"."2.0.7";
-  by-version."clean-css"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.0.7";
+    self.by-version."clean-css"."2.0.8";
+  by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.7.tgz";
-        name = "clean-css-2.0.7.tgz";
-        sha1 = "b973f1370019ad9b05c456ffc4950a6b95cb38f0";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz";
+        name = "clean-css-2.0.8.tgz";
+        sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20";
       })
     ];
     buildInputs =
@@ -1876,8 +1936,26 @@
     ];
     passthru.names = [ "clean-css" ];
   };
-  by-spec."clean-css"."~2.0.0" =
-    self.by-version."clean-css"."2.0.7";
+  by-spec."clean-css"."~2.1.0" =
+    self.by-version."clean-css"."2.1.0";
+  by-version."clean-css"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.0.tgz";
+        name = "clean-css-2.1.0.tgz";
+        sha1 = "2884698408337a94c33cc028acd13ea4a532132e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clean-css" or []);
+    deps = [
+      self.by-version."commander"."2.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clean-css" ];
+  };
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -2037,7 +2115,7 @@
       (self.nativeDeps."cmd-shim" or []);
     deps = [
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
@@ -2390,8 +2468,29 @@
     ];
     passthru.names = [ "commander" ];
   };
+  by-spec."commander"."2.1.x" =
+    self.by-version."commander"."2.1.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
+  by-spec."compressible"."1.0.0" =
+    self.by-version."compressible"."1.0.0";
+  by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compressible-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
+        name = "compressible-1.0.0.tgz";
+        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."compressible" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "compressible" ];
+  };
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -2455,7 +2554,32 @@
       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"
+      self.by-version."graceful-fs"."2.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "configstore" ];
+  };
+  by-spec."configstore"."~0.2.1" =
+    self.by-version."configstore"."0.2.2";
+  by-version."configstore"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.2.2.tgz";
+        name = "configstore-0.2.2.tgz";
+        sha1 = "ae0eb4f75833a4436f33456a4d2db11d69cc61ed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."configstore" or []);
+    deps = [
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."js-yaml"."3.0.1"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."uuid"."1.4.1"
+      self.by-version."object-assign"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -2636,7 +2760,40 @@
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.12.0";
+    self.by-version."connect"."2.13.0";
+  by-version."connect"."2.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.13.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.13.0.tgz";
+        name = "connect-2.13.0.tgz";
+        sha1 = "a1974986381b4ea52ded726c2b4598e88ed527d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."compressible"."1.0.0"
+      self.by-version."batch"."0.5.0"
+      self.by-version."qs"."0.6.6"
+      self.by-version."cookie-signature"."1.0.1"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."send"."0.1.4"
+      self.by-version."bytes"."0.2.1"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."pause"."0.0.1"
+      self.by-version."uid2"."0.0.3"
+      self.by-version."debug"."0.7.4"
+      self.by-version."methods"."0.1.0"
+      self.by-version."raw-body"."1.1.2"
+      self.by-version."negotiator"."0.3.0"
+      self.by-version."multiparty"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect"."~2.12.0" =
     self.by-version."connect"."2.12.0";
   by-spec."connect-flash"."*" =
@@ -3011,32 +3168,30 @@
     ];
     passthru.names = [ "couch-login" ];
   };
-  by-spec."couch-login"."~0.1.18" =
-    self.by-version."couch-login"."0.1.20";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.7.1";
-  by-version."coveralls"."2.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.7.1";
+    self.by-version."coveralls"."2.8.0";
+  by-version."coveralls"."2.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.7.1.tgz";
-        name = "coveralls-2.7.1.tgz";
-        sha1 = "86e91436d248ca9c202504e9e022d77946eded41";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.8.0.tgz";
+        name = "coveralls-2.8.0.tgz";
+        sha1 = "959b1b3cb9b5ce2ca502b025fd69eb1700756e63";
       })
     ];
     buildInputs =
       (self.nativeDeps."coveralls" or []);
     deps = [
-      self.by-version."yaml"."0.2.3"
+      self.by-version."js-yaml"."3.0.1"
       self.by-version."request"."2.16.2"
-      self.by-version."lcov-parse"."0.0.4"
+      self.by-version."lcov-parse"."0.0.6"
       self.by-version."log-driver"."1.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.7.1";
+  "coveralls" = self.by-version."coveralls"."2.8.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -3213,25 +3368,6 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
-  by-spec."cssom"."0.2.x" =
-    self.by-version."cssom"."0.2.5";
-  by-version."cssom"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cssom-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
-        name = "cssom-0.2.5.tgz";
-        sha1 = "2682709b5902e7212df529116ff788cd5b254894";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cssom" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cssom" ];
-  };
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
   by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -3656,7 +3792,7 @@
     buildInputs =
       (self.nativeDeps."dkim-signer" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
       self.by-version."mimelib"."0.2.14"
     ];
     peerDependencies = [
@@ -3782,6 +3918,26 @@
     ];
     passthru.names = [ "domutils" ];
   };
+  by-spec."domutils"."1.4" =
+    self.by-version."domutils"."1.4.0";
+  by-version."domutils"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.0.tgz";
+        name = "domutils-1.4.0.tgz";
+        sha1 = "330b95212944e340c6e0227e9ec3d35242d4dd05";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils" or []);
+    deps = [
+      self.by-version."domelementtype"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
   by-spec."download"."~0.1.6" =
     self.by-version."download"."0.1.10";
   by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage {
@@ -3797,7 +3953,7 @@
       (self.nativeDeps."download" or []);
     deps = [
       self.by-version."decompress"."0.1.6"
-      self.by-version."each-async"."0.1.1"
+      self.by-version."each-async"."0.1.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."request"."2.31.0"
       self.by-version."through2"."0.4.1"
@@ -3866,14 +4022,14 @@
     passthru.names = [ "duplexer" ];
   };
   by-spec."each-async"."~0.1.1" =
-    self.by-version."each-async"."0.1.1";
-  by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-each-async-0.1.1";
+    self.by-version."each-async"."0.1.2";
+  by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-each-async-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz";
-        name = "each-async-0.1.1.tgz";
-        sha1 = "32bcef7e3cdc741d630e29846348be4ecca624ff";
+        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz";
+        name = "each-async-0.1.2.tgz";
+        sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6";
       })
     ];
     buildInputs =
@@ -3981,14 +4137,14 @@
     passthru.names = [ "encoding" ];
   };
   by-spec."entities"."0.x" =
-    self.by-version."entities"."0.3.0";
-  by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-entities-0.3.0";
+    self.by-version."entities"."0.5.0";
+  by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-entities-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz";
-        name = "entities-0.3.0.tgz";
-        sha1 = "6ccead6010fee0c5a06f538d242792485cbfa256";
+        url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz";
+        name = "entities-0.5.0.tgz";
+        sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49";
       })
     ];
     buildInputs =
@@ -4039,14 +4195,14 @@
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."*" =
-    self.by-version."escodegen"."1.1.0";
-  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.1.0";
+    self.by-version."escodegen"."1.2.0";
+  by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
-        name = "escodegen-1.1.0.tgz";
-        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz";
+        name = "escodegen-1.2.0.tgz";
+        sha1 = "09de7967791cc958b7f89a2ddb6d23451af327e1";
       })
     ];
     buildInputs =
@@ -4055,7 +4211,7 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4077,7 +4233,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."0.0.4"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4100,7 +4256,7 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4892,7 +5048,7 @@
     buildInputs =
       (self.nativeDeps."follow-redirects" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -5304,7 +5460,7 @@
     deps = [
       self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -5515,7 +5671,7 @@
       self.by-version."copy-paste"."0.1.0"
       self.by-version."moment"."2.4.0"
       self.by-version."handlebars"."1.0.11"
-      self.by-version."github"."0.1.13"
+      self.by-version."github"."0.1.14"
       self.by-version."inquirer"."0.3.5"
       self.by-version."wordwrap"."0.0.2"
       self.by-version."nopt"."2.1.2"
@@ -5531,14 +5687,14 @@
   };
   "gh" = self.by-version."gh"."1.8.2";
   by-spec."github"."~0.1.12" =
-    self.by-version."github"."0.1.13";
-  by-version."github"."0.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-0.1.13";
+    self.by-version."github"."0.1.14";
+  by-version."github"."0.1.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-0.1.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github/-/github-0.1.13.tgz";
-        name = "github-0.1.13.tgz";
-        sha1 = "90567238d0eb54f7c58ad3a6a2bea0fa495c94fb";
+        url = "http://registry.npmjs.org/github/-/github-0.1.14.tgz";
+        name = "github-0.1.14.tgz";
+        sha1 = "2a4fc150c9aee8c7a7702fa1e620d29599246322";
       })
     ];
     buildInputs =
@@ -5644,7 +5800,28 @@
       (self.nativeDeps."glob" or []);
     deps = [
       self.by-version."minimatch"."0.2.14"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."3.2.7" =
+    self.by-version."glob"."3.2.7";
+  by-version."glob"."3.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz";
+        name = "glob-3.2.7.tgz";
+        sha1 = "275f39a0eee805694790924f36eac38e1db6d802";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    deps = [
+      self.by-version."minimatch"."0.2.14"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -5690,14 +5867,14 @@
   by-spec."glob"."~3.2.7" =
     self.by-version."glob"."3.2.8";
   by-spec."graceful-fs"."2" =
-    self.by-version."graceful-fs"."2.0.1";
-  by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-graceful-fs-2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
+  by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz";
-        name = "graceful-fs-2.0.1.tgz";
-        sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84";
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.2.tgz";
+        name = "graceful-fs-2.0.2.tgz";
+        sha1 = "26806eaca4bff8fc5dbc935e696135792175c46f";
       })
     ];
     buildInputs =
@@ -5708,6 +5885,8 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  by-spec."graceful-fs"."^2.0.2" =
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -5749,11 +5928,11 @@
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
   by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~2.0.0" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~2.0.1" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.4.1";
   by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -5888,20 +6067,21 @@
   by-spec."grunt-cli"."~0.1.7" =
     self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.7.0";
-  by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.7.0";
+    self.by-version."grunt-contrib-cssmin"."0.8.0";
+  by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz";
-        name = "grunt-contrib-cssmin-0.7.0.tgz";
-        sha1 = "a5735e9f1d263149e49fe035294e429d8c670bab";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz";
+        name = "grunt-contrib-cssmin-0.8.0.tgz";
+        sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
-      self.by-version."clean-css"."2.0.7"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."clean-css"."2.1.0"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -5909,7 +6089,7 @@
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.8.0";
   by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage {
@@ -5946,7 +6126,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.6.2"
+      self.by-version."less"."1.6.3"
       self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
     ];
@@ -5970,7 +6150,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-requirejs" or []);
     deps = [
-      self.by-version."requirejs"."2.1.10"
+      self.by-version."requirejs"."2.1.11"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -6181,14 +6361,14 @@
   by-spec."handlebars"."~1.0.11" =
     self.by-version."handlebars"."1.0.12";
   by-spec."has-color"."~0.1.0" =
-    self.by-version."has-color"."0.1.3";
-  by-version."has-color"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-has-color-0.1.3";
+    self.by-version."has-color"."0.1.4";
+  by-version."has-color"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-has-color-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.3.tgz";
-        name = "has-color-0.1.3.tgz";
-        sha1 = "b249acb22a6b481c572eeddb28b8f346c0b242a1";
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.4.tgz";
+        name = "has-color-0.1.4.tgz";
+        sha1 = "d1dadeea5b9e8b446bf08603532333710c95a290";
       })
     ];
     buildInputs =
@@ -6703,7 +6883,7 @@
       self.by-version."coffee-script-redux"."2.0.0-beta4"
       self.by-version."istanbul"."0.2.4"
       self.by-version."optimist"."0.6.1"
-      self.by-version."escodegen"."1.1.0"
+      self.by-version."escodegen"."1.2.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."which"."1.0.5"
       self.by-version."estraverse"."1.5.0"
@@ -6818,7 +6998,7 @@
     deps = [
       self.by-version."promzard"."0.2.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.6"
+      self.by-version."read-package-json"."1.1.7"
       self.by-version."semver"."2.2.1"
       self.by-version."glob"."3.2.8"
     ];
@@ -6826,29 +7006,6 @@
     ];
     passthru.names = [ "init-package-json" ];
   };
-  by-spec."inquirer"."~0.2.4" =
-    self.by-version."inquirer"."0.2.5";
-  by-version."inquirer"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inquirer-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
-        name = "inquirer-0.2.5.tgz";
-        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
-    deps = [
-      self.by-version."lodash"."1.2.1"
-      self.by-version."async"."0.2.10"
-      self.by-version."cli-color"."0.2.3"
-      self.by-version."mute-stream"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
   by-spec."inquirer"."~0.3.0" =
     self.by-version."inquirer"."0.3.5";
   by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -6901,25 +7058,26 @@
     passthru.names = [ "inquirer" ];
   };
   by-spec."insight"."~0.3.0" =
-    self.by-version."insight"."0.3.0";
-  by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-insight-0.3.0";
+    self.by-version."insight"."0.3.1";
+  by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-insight-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz";
-        name = "insight-0.3.0.tgz";
-        sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71";
+        url = "http://registry.npmjs.org/insight/-/insight-0.3.1.tgz";
+        name = "insight-0.3.1.tgz";
+        sha1 = "1a14f32c06115c0850338c38a253d707b611d448";
       })
     ];
     buildInputs =
       (self.nativeDeps."insight" or []);
     deps = [
-      self.by-version."chalk"."0.2.1"
+      self.by-version."chalk"."0.4.0"
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.1.7"
+      self.by-version."configstore"."0.2.2"
       self.by-version."async"."0.2.10"
-      self.by-version."lodash"."1.3.1"
-      self.by-version."inquirer"."0.2.5"
+      self.by-version."inquirer"."0.4.0"
+      self.by-version."object-assign"."0.1.2"
+      self.by-version."lodash.debounce"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -6968,11 +7126,11 @@
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.1"
-      self.by-version."mongoose"."3.8.6"
+      self.by-version."mongoose"."3.8.7"
       self.by-version."gridfs-stream"."0.4.1"
       self.by-version."temp"."0.6.0"
-      self.by-version."kue"."0.7.4"
-      self.by-version."redis"."0.10.0"
+      self.by-version."kue"."0.7.5"
+      self.by-version."redis"."0.10.1"
       self.by-version."hiredis"."0.1.16"
     ];
     peerDependencies = [
@@ -7170,6 +7328,8 @@
     ];
     passthru.names = [ "jade" ];
   };
+  by-spec."jade"."1.1.5" =
+    self.by-version."jade"."1.1.5";
   by-spec."jade".">= 0.0.1" =
     self.by-version."jade"."1.1.5";
   by-spec."jade"."~0.35.0" =
@@ -7300,6 +7460,8 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
+  by-spec."js-yaml"."3.0.1" =
+    self.by-version."js-yaml"."3.0.1";
   by-spec."js-yaml"."3.x" =
     self.by-version."js-yaml"."3.0.1";
   by-spec."js-yaml"."~2.0.5" =
@@ -7344,6 +7506,8 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
+  by-spec."js-yaml"."~3.0.1" =
+    self.by-version."js-yaml"."3.0.1";
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
@@ -7557,11 +7721,11 @@
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.9"
+      self.by-version."log4js"."0.6.10"
       self.by-version."useragent"."2.0.7"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -7598,14 +7762,14 @@
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.1.5";
-  by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-coverage-0.1.5";
+    self.by-version."karma-coverage"."0.2.0";
+  by-version."karma-coverage"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-coverage-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz";
-        name = "karma-coverage-0.1.5.tgz";
-        sha1 = "a4dcbe87d4a7765456ca64218b5f0601018e1371";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.0.tgz";
+        name = "karma-coverage-0.2.0.tgz";
+        sha1 = "d8edc429c35ab7c68fa90a5cd2f2ecb3aa31fde8";
       })
     ];
     buildInputs =
@@ -7620,7 +7784,7 @@
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.1.5";
+  "karma-coverage" = self.by-version."karma-coverage"."0.2.0";
   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 {
@@ -7682,7 +7846,7 @@
     ];
     peerDependencies = [
       self.by-version."karma"."0.11.14"
-      self.by-version."requirejs"."2.1.10"
+      self.by-version."requirejs"."2.1.11"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
@@ -7850,14 +8014,14 @@
     passthru.names = [ "knockout" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.8.8";
-  by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knox-0.8.8";
+    self.by-version."knox"."0.8.9";
+  by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.8.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz";
-        name = "knox-0.8.8.tgz";
-        sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774";
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz";
+        name = "knox-0.8.9.tgz";
+        sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c";
       })
     ];
     buildInputs =
@@ -7872,25 +8036,25 @@
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.8";
+  "knox" = self.by-version."knox"."0.8.9";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.7.4";
-  by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-kue-0.7.4";
+    self.by-version."kue"."0.7.5";
+  by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.7.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz";
-        name = "kue-0.7.4.tgz";
-        sha1 = "bb3315580bbf4ec8663ce4203aec92e560a044ef";
+        url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz";
+        name = "kue-0.7.5.tgz";
+        sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.10.0"
+      self.by-version."redis"."0.10.1"
       self.by-version."express"."3.1.2"
-      self.by-version."jade"."0.26.3"
-      self.by-version."stylus"."0.27.2"
+      self.by-version."jade"."1.1.5"
+      self.by-version."stylus"."0.42.2"
       self.by-version."nib"."0.5.0"
       self.by-version."reds"."0.2.4"
     ];
@@ -7898,7 +8062,7 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.7.4";
+  "kue" = self.by-version."kue"."0.7.5";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -7938,15 +8102,15 @@
     ];
     passthru.names = [ "lazystream" ];
   };
-  by-spec."lcov-parse"."0.0.4" =
-    self.by-version."lcov-parse"."0.0.4";
-  by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lcov-parse-0.0.4";
+  by-spec."lcov-parse"."0.0.6" =
+    self.by-version."lcov-parse"."0.0.6";
+  by-version."lcov-parse"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lcov-parse-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz";
-        name = "lcov-parse-0.0.4.tgz";
-        sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b";
+        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
+        name = "lcov-parse-0.0.6.tgz";
+        sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
       })
     ];
     buildInputs =
@@ -7979,14 +8143,14 @@
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
   by-spec."less"."~1.6.0" =
-    self.by-version."less"."1.6.2";
-  by-version."less"."1.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.6.2";
+    self.by-version."less"."1.6.3";
+  by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.6.2.tgz";
-        name = "less-1.6.2.tgz";
-        sha1 = "86556e6ab8f9af4d8b853db16c5f262e94fc98a0";
+        url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz";
+        name = "less-1.6.3.tgz";
+        sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde";
       })
     ];
     buildInputs =
@@ -7995,8 +8159,8 @@
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.33.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.0.7"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."clean-css"."2.0.8"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -8273,6 +8437,28 @@
     ];
     passthru.names = [ "lodash._shimkeys" ];
   };
+  by-spec."lodash.debounce"."~2.4.1" =
+    self.by-version."lodash.debounce"."2.4.1";
+  by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.debounce-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
+        name = "lodash.debounce-2.4.1.tgz";
+        sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.debounce" or []);
+    deps = [
+      self.by-version."lodash.isfunction"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash.now"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.debounce" ];
+  };
   by-spec."lodash.defaults"."~2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
   by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -8294,6 +8480,25 @@
     ];
     passthru.names = [ "lodash.defaults" ];
   };
+  by-spec."lodash.isfunction"."~2.4.1" =
+    self.by-version."lodash.isfunction"."2.4.1";
+  by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.isfunction-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+        name = "lodash.isfunction-2.4.1.tgz";
+        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.isfunction" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.isfunction" ];
+  };
   by-spec."lodash.isobject"."~2.4.1" =
     self.by-version."lodash.isobject"."2.4.1";
   by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -8336,6 +8541,26 @@
     ];
     passthru.names = [ "lodash.keys" ];
   };
+  by-spec."lodash.now"."~2.4.1" =
+    self.by-version."lodash.now"."2.4.1";
+  by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.now-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
+        name = "lodash.now-2.4.1.tgz";
+        sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.now" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.now" ];
+  };
   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 {
@@ -8356,14 +8581,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.9";
-  by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.9";
+    self.by-version."log4js"."0.6.10";
+  by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz";
-        name = "log4js-0.6.9.tgz";
-        sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz";
+        name = "log4js-0.6.10.tgz";
+        sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785";
       })
     ];
     buildInputs =
@@ -8531,15 +8756,15 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
-  by-spec."lsmod"."0.0.2" =
-    self.by-version."lsmod"."0.0.2";
-  by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lsmod-0.0.2";
+  by-spec."lsmod"."~0.0.3" =
+    self.by-version."lsmod"."0.0.3";
+  by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lsmod-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz";
-        name = "lsmod-0.0.2.tgz";
-        sha1 = "ebfe765bbfcbe85006eb315862445158b7baf613";
+        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
+        name = "lsmod-0.0.3.tgz";
+        sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244";
       })
     ];
     buildInputs =
@@ -8567,7 +8792,7 @@
       self.by-version."mimelib"."0.2.14"
       self.by-version."mime"."1.2.9"
       self.by-version."he"."0.3.6"
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
       self.by-version."follow-redirects"."0.0.3"
       self.by-version."dkim-signer"."0.1.0"
     ];
@@ -8802,7 +9027,7 @@
       (self.nativeDeps."mimelib" or []);
     deps = [
       self.by-version."encoding"."0.1.7"
-      self.by-version."addressparser"."0.2.0"
+      self.by-version."addressparser"."0.2.1"
     ];
     peerDependencies = [
     ];
@@ -8870,14 +9095,14 @@
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimist"."~0.0.1" =
-    self.by-version."minimist"."0.0.5";
-  by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimist-0.0.5";
+    self.by-version."minimist"."0.0.7";
+  by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz";
-        name = "minimist-0.0.5.tgz";
-        sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz";
+        name = "minimist-0.0.7.tgz";
+        sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7";
       })
     ];
     buildInputs =
@@ -9110,27 +9335,27 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc6";
-  by-version."mongodb"."1.4.0-rc6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc6";
+    self.by-version."mongodb"."1.4.0-rc7";
+  by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.0-rc7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc6.tgz";
-        name = "mongodb-1.4.0-rc6.tgz";
-        sha1 = "dd2f6a03d9e9da019d6aa5da66c4d5de7993aedd";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz";
+        name = "mongodb-1.4.0-rc7.tgz";
+        sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.5"
+      self.by-version."bson"."0.2.6"
       self.by-version."kerberos"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc6";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc7";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -9196,14 +9421,14 @@
   by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.6";
-  by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.8.6";
+    self.by-version."mongoose"."3.8.7";
+  by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.8.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz";
-        name = "mongoose-3.8.6.tgz";
-        sha1 = "c8a282d3c74915864b6ed1e01884388c6e91d146";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz";
+        name = "mongoose-3.8.7.tgz";
+        sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00";
       })
     ];
     buildInputs =
@@ -9650,6 +9875,25 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."~0.8.0" =
+    self.by-version."nan"."0.8.0";
+  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
+        name = "nan-0.8.0.tgz";
+        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
   by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -9666,7 +9910,7 @@
     deps = [
       self.by-version."sylvester"."0.0.21"
       self.by-version."apparatus"."0.0.8"
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -9884,7 +10128,7 @@
       self.by-version."semver"."2.1.0"
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
-      self.by-version."wrench"."1.5.6"
+      self.by-version."wrench"."1.5.7"
       self.by-version."uglify-js"."2.3.6"
       self.by-version."xmldom"."0.1.19"
     ];
@@ -9928,11 +10172,11 @@
       (self.nativeDeps."node-gyp" or []);
     deps = [
       self.by-version."glob"."3.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."fstream"."0.1.25"
       self.by-version."minimatch"."0.2.14"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
       self.by-version."request"."2.33.0"
@@ -10185,7 +10429,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.8"
-      self.by-version."simplesmtp"."0.3.20"
+      self.by-version."simplesmtp"."0.3.21"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -10236,14 +10480,14 @@
     passthru.names = [ "nomnom" ];
   };
   by-spec."nopt"."2" =
-    self.by-version."nopt"."2.1.2";
-  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.1.2";
+    self.by-version."nopt"."2.2.0";
+  by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
-        name = "nopt-2.1.2.tgz";
-        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz";
+        name = "nopt-2.2.0.tgz";
+        sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5";
       })
     ];
     buildInputs =
@@ -10277,6 +10521,26 @@
   };
   by-spec."nopt"."2.1.x" =
     self.by-version."nopt"."2.1.2";
+  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        name = "nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  by-spec."nopt"."^2.2.0" =
+    self.by-version."nopt"."2.2.0";
   by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -10303,15 +10567,15 @@
     self.by-version."nopt"."2.1.2";
   by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
-  by-spec."normalize-package-data"."~0.2.7" =
-    self.by-version."normalize-package-data"."0.2.8";
-  by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.2.8";
+  by-spec."normalize-package-data"."~0.2.9" =
+    self.by-version."normalize-package-data"."0.2.9";
+  by-version."normalize-package-data"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz";
-        name = "normalize-package-data-0.2.8.tgz";
-        sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz";
+        name = "normalize-package-data-0.2.9.tgz";
+        sha1 = "8be8a1c0a0b55a7df07bee2b488c67c1d8862a4b";
       })
     ];
     buildInputs =
@@ -10326,14 +10590,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.3.26";
-  by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.3.26";
+    self.by-version."npm"."1.4.3";
+  by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz";
-        name = "npm-1.3.26.tgz";
-        sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz";
+        name = "npm-1.4.3.tgz";
+        sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c";
       })
     ];
     buildInputs =
@@ -10343,9 +10607,9 @@
       self.by-version."ini"."1.1.0"
       self.by-version."slide"."1.1.5"
       self.by-version."abbrev"."1.0.4"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."minimatch"."0.2.14"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."request"."2.30.0"
       self.by-version."which"."1.0.5"
@@ -10357,15 +10621,15 @@
       self.by-version."lru-cache"."2.5.0"
       self.by-version."node-gyp"."0.12.2"
       self.by-version."fstream-npm"."0.1.6"
-      self.by-version."uid-number"."0.0.3"
+      self.by-version."uid-number"."0.0.4"
       self.by-version."archy"."0.0.2"
       self.by-version."chownr"."0.0.1"
       self.by-version."npmlog"."0.0.6"
       self.by-version."ansi"."0.2.1"
-      self.by-version."npm-registry-client"."0.3.5"
-      self.by-version."read-package-json"."1.1.6"
-      self.by-version."read-installed"."0.2.5"
-      self.by-version."glob"."3.2.8"
+      self.by-version."npm-registry-client"."0.4.4"
+      self.by-version."read-package-json"."1.1.7"
+      self.by-version."read-installed"."1.0.0"
+      self.by-version."glob"."3.2.7"
       self.by-version."init-package-json"."0.0.14"
       self.by-version."osenv"."0.0.3"
       self.by-version."lockfile"."0.4.2"
@@ -10386,12 +10650,34 @@
       self.by-version."ansistyles"."0.1.3"
       self.by-version."path-is-inside"."1.0.0"
       self.by-version."columnify"."0.1.2"
+      self.by-version."npm-install-checks"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.3.26";
+  "npm" = self.by-version."npm"."1.4.3";
+  by-spec."npm-install-checks"."~1.0.0" =
+    self.by-version."npm-install-checks"."1.0.0";
+  by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-install-checks-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz";
+        name = "npm-install-checks-1.0.0.tgz";
+        sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-install-checks" or []);
+    deps = [
+      self.by-version."npmlog"."0.0.6"
+      self.by-version."semver"."2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-install-checks" ];
+  };
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -10407,7 +10693,7 @@
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.33.0"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
@@ -10421,37 +10707,62 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
+  by-spec."npm-registry-client"."^0.4.4" =
+    self.by-version."npm-registry-client"."0.4.4";
+  by-version."npm-registry-client"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.4.tgz";
+        name = "npm-registry-client-0.4.4.tgz";
+        sha1 = "f9dbc383a49069d8c7f67755a3ff6e424aff584f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-registry-client" or []);
+    deps = [
+      self.by-version."request"."2.33.0"
+      self.by-version."graceful-fs"."2.0.2"
+      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.6"
+      self.by-version."retry"."0.6.0"
+      self.by-version."npmlog"."0.0.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-registry-client" ];
+  };
   by-spec."npm-registry-client"."~0.3.3" =
-    self.by-version."npm-registry-client"."0.3.5";
-  by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.3.5";
+    self.by-version."npm-registry-client"."0.3.6";
+  by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.3.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz";
-        name = "npm-registry-client-0.3.5.tgz";
-        sha1 = "98ba1ac851a3939a3fb9917c28fa8da522dc635f";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz";
+        name = "npm-registry-client-0.3.6.tgz";
+        sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.33.0"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       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.6"
       self.by-version."retry"."0.6.0"
-      self.by-version."couch-login"."0.1.20"
       self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.3.5" =
-    self.by-version."npm-registry-client"."0.3.5";
   by-spec."npm-user-validate"."0.0.3" =
     self.by-version."npm-user-validate"."0.0.3";
   by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10472,14 +10783,14 @@
     passthru.names = [ "npm-user-validate" ];
   };
   by-spec."npm2nix"."*" =
-    self.by-version."npm2nix"."5.5.0";
-  by-version."npm2nix"."5.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "npm2nix-5.5.0";
+    self.by-version."npm2nix"."5.6.0";
+  by-version."npm2nix"."5.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "npm2nix-5.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.5.0.tgz";
-        name = "npm2nix-5.5.0.tgz";
-        sha1 = "79729928cc4d2f4e765797491eeb4ced2b1d9e9e";
+        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.6.0.tgz";
+        name = "npm2nix-5.6.0.tgz";
+        sha1 = "75680a36a24fe7f434a18199552cd3e7a576e875";
       })
     ];
     buildInputs =
@@ -10498,7 +10809,7 @@
     ];
     passthru.names = [ "npm2nix" ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.5.0";
+  "npm2nix" = self.by-version."npm2nix"."5.6.0";
   by-spec."npmconf"."0.0.24" =
     self.by-version."npmconf"."0.0.24";
   by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
@@ -10518,7 +10829,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."1.1.4"
       self.by-version."ini"."1.1.0"
     ];
@@ -10545,7 +10856,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
@@ -10572,7 +10883,7 @@
       self.by-version."once"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
@@ -10627,6 +10938,26 @@
     ];
     passthru.names = [ "nssocket" ];
   };
+  by-spec."nth-check"."~1.0.0" =
+    self.by-version."nth-check"."1.0.0";
+  by-version."nth-check"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nth-check-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nth-check/-/nth-check-1.0.0.tgz";
+        name = "nth-check-1.0.0.tgz";
+        sha1 = "02fc1277aa2bf8e6083be456104d6a646101a49d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nth-check" or []);
+    deps = [
+      self.by-version."boolbase"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nth-check" ];
+  };
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
     self.by-version."oauth"."0.9.11";
   by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -10703,6 +11034,27 @@
     ];
     passthru.names = [ "object-additions" ];
   };
+  by-spec."object-assign"."~0.1.1" =
+    self.by-version."object-assign"."0.1.2";
+  by-version."object-assign"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-object-assign-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.1.2.tgz";
+        name = "object-assign-0.1.2.tgz";
+        sha1 = "036992f073aff7b2db83d06b3fb3155a5ccac37f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-assign" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-assign" ];
+  };
+  by-spec."object-assign"."~0.1.2" =
+    self.by-version."object-assign"."0.1.2";
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -10857,7 +11209,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.5"
+      self.by-version."minimist"."0.0.7"
     ];
     peerDependencies = [
     ];
@@ -10919,7 +11271,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.5"
+      self.by-version."minimist"."0.0.7"
     ];
     peerDependencies = [
     ];
@@ -11459,14 +11811,14 @@
     passthru.names = [ "proto-list" ];
   };
   by-spec."protobufjs".">= 1.1.4" =
-    self.by-version."protobufjs"."2.0.4";
-  by-version."protobufjs"."2.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "protobufjs-2.0.4";
+    self.by-version."protobufjs"."2.0.5";
+  by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "protobufjs-2.0.5";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.4.tgz";
-        name = "protobufjs-2.0.4.tgz";
-        sha1 = "109de55527459ce5bc91d72f1fd86b5a9c7f1058";
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
+        name = "protobufjs-2.0.5.tgz";
+        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
       })
     ];
     buildInputs =
@@ -11500,14 +11852,14 @@
     passthru.names = [ "ps-tree" ];
   };
   by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.2.3";
-  by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-punycode-1.2.3";
+    self.by-version."punycode"."1.2.4";
+  by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-punycode-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz";
-        name = "punycode-1.2.3.tgz";
-        sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
+        name = "punycode-1.2.4.tgz";
+        sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
       })
     ];
     buildInputs =
@@ -11519,7 +11871,7 @@
     passthru.names = [ "punycode" ];
   };
   by-spec."punycode"."~1.2.3" =
-    self.by-version."punycode"."1.2.3";
+    self.by-version."punycode"."1.2.4";
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."1.0.0";
   by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -11763,14 +12115,14 @@
     passthru.names = [ "range-parser" ];
   };
   by-spec."raven"."~0.6.0" =
-    self.by-version."raven"."0.6.1";
-  by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raven-0.6.1";
+    self.by-version."raven"."0.6.2";
+  by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz";
-        name = "raven-0.6.1.tgz";
-        sha1 = "2c307e90295517ce2d45354b0c2d905311f66a5d";
+        url = "http://registry.npmjs.org/raven/-/raven-0.6.2.tgz";
+        name = "raven-0.6.2.tgz";
+        sha1 = "391a7395b6088518a01697f639f21ce6ea9841a3";
       })
     ];
     buildInputs =
@@ -11778,7 +12130,7 @@
     deps = [
       self.by-version."node-uuid"."1.4.1"
       self.by-version."stack-trace"."0.0.7"
-      self.by-version."lsmod"."0.0.2"
+      self.by-version."lsmod"."0.0.3"
       self.by-version."cookie"."0.1.0"
     ];
     peerDependencies = [
@@ -11929,22 +12281,22 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.6"
+      self.by-version."read-package-json"."1.1.7"
       self.by-version."graceful-fs"."1.2.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
-  by-spec."read-installed"."~0.2.2" =
-    self.by-version."read-installed"."0.2.5";
-  by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-0.2.5";
+  by-spec."read-installed"."~1.0.0" =
+    self.by-version."read-installed"."1.0.0";
+  by-version."read-installed"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-installed-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz";
-        name = "read-installed-0.2.5.tgz";
-        sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-1.0.0.tgz";
+        name = "read-installed-1.0.0.tgz";
+        sha1 = "4db88d5a363f9c68eaa07e1626974bc2e0a1b3a5";
       })
     ];
     buildInputs =
@@ -11952,22 +12304,22 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.6"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."read-package-json"."1.1.7"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.6";
-  by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.1.6";
+    self.by-version."read-package-json"."1.1.7";
+  by-version."read-package-json"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz";
-        name = "read-package-json-1.1.6.tgz";
-        sha1 = "a851dbbaca48ff78a87f890f0a9fdf43b1759d5a";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.7.tgz";
+        name = "read-package-json-1.1.7.tgz";
+        sha1 = "a28da23cb4330106a0d45e86065e0fc3b79d263e";
       })
     ];
     buildInputs =
@@ -11975,15 +12327,15 @@
     deps = [
       self.by-version."glob"."3.2.8"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."normalize-package-data"."0.2.9"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.6" =
-    self.by-version."read-package-json"."1.1.6";
+  by-spec."read-package-json"."~1.1.7" =
+    self.by-version."read-package-json"."1.1.7";
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.25";
   by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage {
@@ -12077,14 +12429,14 @@
     passthru.names = [ "redeyed" ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.10.0";
-  by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.10.0";
+    self.by-version."redis"."0.10.1";
+  by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.10.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz";
-        name = "redis-0.10.0.tgz";
-        sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c";
+        url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz";
+        name = "redis-0.10.1.tgz";
+        sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec";
       })
     ];
     buildInputs =
@@ -12095,7 +12447,7 @@
     ];
     passthru.names = [ "redis" ];
   };
-  "redis" = self.by-version."redis"."0.10.0";
+  "redis" = self.by-version."redis"."0.10.1";
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -12155,7 +12507,7 @@
     passthru.names = [ "redis" ];
   };
   by-spec."redis"."~0.10.0" =
-    self.by-version."redis"."0.10.0";
+    self.by-version."redis"."0.10.1";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -12522,14 +12874,14 @@
     passthru.names = [ "request-replay" ];
   };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.10";
-  by-version."requirejs"."2.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "requirejs-2.1.10";
+    self.by-version."requirejs"."2.1.11";
+  by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.10.tgz";
-        name = "requirejs-2.1.10.tgz";
-        sha1 = "1e1d7f608790e532a422c6199dad2abe15484b54";
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz";
+        name = "requirejs-2.1.11.tgz";
+        sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442";
       })
     ];
     buildInputs =
@@ -12541,7 +12893,7 @@
     passthru.names = [ "requirejs" ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.10";
+    self.by-version."requirejs"."2.1.11";
   by-spec."resolve"."0.5.x" =
     self.by-version."resolve"."0.5.1";
   by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -12649,7 +13001,7 @@
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.4"
+      self.by-version."protobufjs"."2.0.5"
     ];
     peerDependencies = [
     ];
@@ -13152,7 +13504,7 @@
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
@@ -13281,14 +13633,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.20";
-  by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.20";
+    self.by-version."simplesmtp"."0.3.21";
+  by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.21";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz";
-        name = "simplesmtp-0.3.20.tgz";
-        sha1 = "9de032acd3f4dfee69aed80ea9843b09419bd001";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz";
+        name = "simplesmtp-0.3.21.tgz";
+        sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f";
       })
     ];
     buildInputs =
@@ -13589,14 +13941,14 @@
   };
   "sockjs" = self.by-version."sockjs"."0.3.8";
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.31";
-  by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.31";
+    self.by-version."source-map"."0.1.32";
+  by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-        name = "source-map-0.1.31.tgz";
-        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+        name = "source-map-0.1.32.tgz";
+        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
       })
     ];
     buildInputs =
@@ -13608,17 +13960,17 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.31";
+  "source-map" = self.by-version."source-map"."0.1.32";
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -13983,28 +14335,8 @@
     passthru.names = [ "stylus" ];
   };
   "stylus" = self.by-version."stylus"."0.42.2";
-  by-spec."stylus"."0.27.2" =
-    self.by-version."stylus"."0.27.2";
-  by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.27.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz";
-        name = "stylus-0.27.2.tgz";
-        sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stylus" or []);
-    deps = [
-      self.by-version."cssom"."0.2.5"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.7.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "stylus" ];
-  };
+  by-spec."stylus"."0.42.2" =
+    self.by-version."stylus"."0.42.2";
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -14135,7 +14467,7 @@
     buildInputs =
       (self.nativeDeps."swig" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -14399,14 +14731,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.23";
-  by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.23";
+    self.by-version."timezone"."0.0.28";
+  by-version."timezone"."0.0.28" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.28";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
-        name = "timezone-0.0.23.tgz";
-        sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.28.tgz";
+        name = "timezone-0.0.28.tgz";
+        sha1 = "a3fb234b48093c8edd36de5662e92ece6477a88c";
       })
     ];
     buildInputs =
@@ -14417,7 +14749,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.23";
+  "timezone" = self.by-version."timezone"."0.0.28";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -14437,15 +14769,15 @@
     ];
     passthru.names = [ "tinycolor" ];
   };
-  by-spec."titanium"."3.2.0" =
-    self.by-version."titanium"."3.2.0";
-  by-version."titanium"."3.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "titanium-3.2.0";
+  by-spec."titanium"."3.2.1" =
+    self.by-version."titanium"."3.2.1";
+  by-version."titanium"."3.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "titanium-3.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.0.tgz";
-        name = "titanium-3.2.0.tgz";
-        sha1 = "97b25af99e99d4543f5cc2c7025b2c2f6199de6e";
+        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.1.tgz";
+        name = "titanium-3.2.1.tgz";
+        sha1 = "b1d432c6c853c22096fb3ed03626e8263b27e39e";
       })
     ];
     buildInputs =
@@ -14465,13 +14797,13 @@
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
       self.by-version."winston"."0.6.2"
-      self.by-version."wrench"."1.5.6"
+      self.by-version."wrench"."1.5.7"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "titanium" ];
   };
-  "titanium" = self.by-version."titanium"."3.2.0";
+  "titanium" = self.by-version."titanium"."3.2.1";
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.23";
   by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
@@ -14525,7 +14857,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -14545,7 +14877,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -14721,7 +15053,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -14762,7 +15094,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -14784,7 +15116,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -14808,7 +15140,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -14836,14 +15168,14 @@
     passthru.names = [ "uglify-to-browserify" ];
   };
   by-spec."uid-number"."0" =
-    self.by-version."uid-number"."0.0.3";
-  by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uid-number-0.0.3";
+    self.by-version."uid-number"."0.0.4";
+  by-version."uid-number"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uid-number-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
-        name = "uid-number-0.0.3.tgz";
-        sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz";
+        name = "uid-number-0.0.4.tgz";
+        sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf";
       })
     ];
     buildInputs =
@@ -14874,14 +15206,14 @@
     passthru.names = [ "uid2" ];
   };
   by-spec."underscore"."*" =
-    self.by-version."underscore"."1.5.2";
-  by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-underscore-1.5.2";
+    self.by-version."underscore"."1.6.0";
+  by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-underscore-1.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
-        name = "underscore-1.5.2.tgz";
-        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        name = "underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       })
     ];
     buildInputs =
@@ -14892,7 +15224,7 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  "underscore" = self.by-version."underscore"."1.5.2";
+  "underscore" = self.by-version."underscore"."1.6.0";
   by-spec."underscore"."1.4.x" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -14913,13 +15245,13 @@
     passthru.names = [ "underscore" ];
   };
   by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.5.2";
+    self.by-version."underscore"."1.6.0";
   by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.5.2";
-  by-spec."underscore".">=1.4.3" =
-    self.by-version."underscore"."1.5.2";
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.5.0" =
+    self.by-version."underscore"."1.6.0";
   by-spec."underscore".">=1.5.x" =
-    self.by-version."underscore"."1.5.2";
+    self.by-version."underscore"."1.6.0";
   by-spec."underscore"."~1.4" =
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.4.3" =
@@ -14928,6 +15260,23 @@
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.5" =
     self.by-version."underscore"."1.5.2";
+  by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-underscore-1.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+        name = "underscore-1.5.2.tgz";
+        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
   by-spec."underscore"."~1.5.2" =
     self.by-version."underscore"."1.5.2";
   by-spec."underscore.string"."~2.2.1" =
@@ -14993,14 +15342,14 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.6.1";
-  by-version."ungit"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.6.1";
+    self.by-version."ungit"."0.6.2";
+  by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.1.tgz";
-        name = "ungit-0.6.1.tgz";
-        sha1 = "7fc1527eb183acf65eb72752b9c54324184d6fff";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz";
+        name = "ungit-0.6.2.tgz";
+        sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191";
       })
     ];
     buildInputs =
@@ -15031,9 +15380,9 @@
       self.by-version."keen.io"."0.0.4"
       self.by-version."getmac"."1.0.6"
       self.by-version."deep-extend"."0.2.8"
-      self.by-version."raven"."0.6.1"
+      self.by-version."raven"."0.6.2"
       self.by-version."knockout"."3.0.0"
-      self.by-version."npm-registry-client"."0.3.5"
+      self.by-version."npm-registry-client"."0.3.6"
       self.by-version."npmconf"."0.1.12"
       self.by-version."mkdirp"."0.3.5"
     ];
@@ -15041,7 +15390,7 @@
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.6.1";
+  "ungit" = self.by-version."ungit"."0.6.2";
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -15223,6 +15572,8 @@
   };
   by-spec."uuid"."~1.4.0" =
     self.by-version."uuid"."1.4.1";
+  by-spec."uuid"."~1.4.1" =
+    self.by-version."uuid"."1.4.1";
   by-spec."validator"."0.4.x" =
     self.by-version."validator"."0.4.28";
   by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage {
@@ -15489,14 +15840,14 @@
     passthru.names = [ "wd" ];
   };
   by-spec."webdrvr"."*" =
-    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";
+    self.by-version."webdrvr"."2.39.0-0";
+  by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.39.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz";
-        name = "webdrvr-2.38.0-0.tgz";
-        sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz";
+        name = "webdrvr-2.39.0-0.tgz";
+        sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f";
       })
     ];
     buildInputs =
@@ -15514,7 +15865,7 @@
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.38.0-0";
+  "webdrvr" = self.by-version."webdrvr"."2.39.0-0";
   by-spec."websocket-driver".">=0.3.0" =
     self.by-version."websocket-driver"."0.3.2";
   by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -15764,14 +16115,14 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.0" =
-    self.by-version."wrench"."1.5.6";
-  by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wrench-1.5.6";
+    self.by-version."wrench"."1.5.7";
+  by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wrench-1.5.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz";
-        name = "wrench-1.5.6.tgz";
-        sha1 = "247b7dfe5d7d4374d5e449761fba634190d9b871";
+        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz";
+        name = "wrench-1.5.7.tgz";
+        sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819";
       })
     ];
     buildInputs =
@@ -15783,7 +16134,7 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.4" =
-    self.by-version."wrench"."1.5.6";
+    self.by-version."wrench"."1.5.7";
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -15943,7 +16294,7 @@
     buildInputs =
       (self.nativeDeps."xmlbuilder" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -16026,25 +16377,6 @@
     ];
     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 {
-    name = "node-yaml-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz";
-        name = "yaml-0.2.3.tgz";
-        sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yaml" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yaml" ];
-  };
   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 {
@@ -16183,7 +16515,7 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."update-notifier"."0.1.7"
-      self.by-version."insight"."0.3.0"
+      self.by-version."insight"."0.3.1"
       self.by-version."sudo-block"."0.3.0"
       self.by-version."async"."0.2.10"
       self.by-version."open"."0.0.4"
@@ -16222,20 +16554,20 @@
     passthru.names = [ "zeparser" ];
   };
   by-spec."zip-stream"."~0.1.0" =
-    self.by-version."zip-stream"."0.1.3";
-  by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zip-stream-0.1.3";
+    self.by-version."zip-stream"."0.1.4";
+  by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zip-stream-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz";
-        name = "zip-stream-0.1.3.tgz";
-        sha1 = "06d8787133ab397ab60ef6ee688d76dd5fb10de1";
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz";
+        name = "zip-stream-0.1.4.tgz";
+        sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.10"
+      self.by-version."readable-stream"."1.0.25"
       self.by-version."lodash.defaults"."2.4.1"
     ];
     peerDependencies = [
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index e2adc137aa92..c7660c7a0a2f 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -114,6 +114,6 @@
 , "rethinkdb"
 , "bower2nix"
 , "fetch-bower"
-, { "titanium": "3.2.0" }
+, { "titanium": "3.2.1" }
 , "gh"
 ]
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a42af7720460..902d28c685fc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3053,10 +3053,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExceptionClass = buildPerlPackage rec {
-    name = "Exception-Class-1.30";
+    name = "Exception-Class-1.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "54e256fdb317c1736c2c257fa63d5b87cfb382870711b24937c36eb5171b3154";
+      sha256 = "1p6f20fi82mr5bz7d2c7nqh0322r8n2kszfw37c77g8b1b4r72w3";
     };
     propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ];
   };
@@ -3552,13 +3552,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   FinanceQuote = buildPerlPackage {
-    name = "Finance-Quote-1.18";
+    name = "Finance-Quote-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.18.tar.gz;
-      sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393";
+      url = mirror://sourceforge/finance-quote/1.19/Finance-Quote-1.19.tar.gz;
+      sha256 = "0z1dqxw4by7rkwm113qp2mlhl5r0znr22kzinvr1p82svn0zvm2d";
     };
-    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ];
-    patches = [ ../development/perl-modules/finance-quote-yahoo.patch ];
+    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
     meta = {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1afadd1a2760..2958120f9078 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7104,11 +7104,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   twisted = buildPythonPackage rec {
-    name = "twisted-13.2.0";
+    # NOTE: When updating please check if new versions still cause issues
+    # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
 
+    name = "Twisted-11.1.0";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/T/Twisted/Twisted-13.2.0.tar.bz2";
-      sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
+      url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
+      sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz";
     };
 
     propagatedBuildInputs = [ zope_interface ];
@@ -8251,30 +8253,30 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   whisper = buildPythonPackage rec {
     name = "whisper-${version}";
-    version = "0.9.10";
+    version = "0.9.12";
 
-    src = fetchurl rec {
-      url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
-      sha256 = "1zy4z4hrbiqj4ipcv2m9197hf03d4xphllqav9w4c8i6fn8zmd9n";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz";
+      md5 = "5fac757cc4822ab0678dbe0d781d904e";
     };
 
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Fixed size round-robin style database";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
 
   carbon = buildPythonPackage rec {
     name = "carbon-${version}";
-    version = "0.9.10";
+    version = "0.9.12";
 
-    src = fetchurl rec {
-      url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
-      sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz";
+      md5 = "66967d5a622fd29973838fcd10eb34f3";
     };
 
     propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
@@ -8282,10 +8284,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Backend data caching and persistence daemon for Graphite";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
 
@@ -8326,11 +8328,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   graphite_web = buildPythonPackage rec {
     name = "graphite-web-${version}";
-    version = "0.9.11";
+    version = "0.9.12";
 
     src = fetchurl rec {
       url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz";
-      md5 = "1499b5dded3d1054d598760fd450a6f9";
+      md5 = "8edbb61f1ffe11c181bd2cb9ec977c72";
     };
 
     propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];
@@ -8350,10 +8352,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Enterprise scalable realtime graphing";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
author	Vladimír Čunát <vcunat@gmail.com>	2014-02-20 20:55:31 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2014-02-20 20:55:31 +0100
commit	ae5d8f67680b754381ef42545667092ac6a73f71 (patch)
tree	960e48a196523d13f16c915402cc8164cda5fd40 /pkgs
parent	e40a059714c3ac438f0a9108f55bde1f3931b14c (diff)
parent	95a77ea39fa5870955e5fbb6414640f7b1ec62c6 (diff)
download	nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.gz nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.bz2 nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.lz nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.xz nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.tar.zst nixlib-ae5d8f67680b754381ef42545667092ac6a73f71.zip