summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/blender/default.nix4
-rw-r--r--pkgs/applications/misc/rtv/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix62
-rw-r--r--pkgs/applications/networking/browsers/qutebrowser/default.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix234
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix4
-rw-r--r--pkgs/desktops/lxde/core/lxmenu-data.nix20
-rw-r--r--pkgs/development/compilers/cudatoolkit/default.nix3
-rw-r--r--pkgs/development/compilers/gambit/default.nix8
-rw-r--r--pkgs/development/libraries/libsodium/default.nix4
-rw-r--r--pkgs/development/libraries/pcl/default.nix5
-rw-r--r--pkgs/development/tools/misc/travis/Gemfile3
-rw-r--r--pkgs/development/tools/misc/travis/Gemfile.lock51
-rw-r--r--pkgs/development/tools/misc/travis/default.nix29
-rw-r--r--pkgs/development/tools/misc/travis/gemset.nix146
-rw-r--r--pkgs/games/factorio/default.nix9
-rw-r--r--pkgs/games/steam/chrootenv.nix2
-rw-r--r--pkgs/servers/http/apt-cacher-ng/default.nix1
-rw-r--r--pkgs/servers/misc/taskserver/default.nix24
-rw-r--r--pkgs/tools/archivers/zpaq/default.nix8
-rw-r--r--pkgs/tools/graphics/graphviz/default.nix4
-rw-r--r--pkgs/tools/graphics/optipng/default.nix4
-rw-r--r--pkgs/tools/graphics/wkhtmltopdf/default.nix116
-rw-r--r--pkgs/tools/networking/aria2/default.nix4
-rw-r--r--pkgs/tools/networking/cjdns/default.nix19
-rw-r--r--pkgs/tools/security/sshuttle/default.nix4
-rw-r--r--pkgs/tools/typesetting/tex/texlive-new/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix6
-rw-r--r--pkgs/top-level/node-packages-generated.nix1032
-rw-r--r--pkgs/top-level/node-packages.json3
-rw-r--r--pkgs/top-level/python-packages.nix4
31 files changed, 973 insertions, 852 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0085da5b468fd..3e7ad83c0a121 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -10,11 +10,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.77";
+  name = "blender-2.77a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0aynm249xgrnm6h5hlp9x40ww0hn391d9ka2mg9mmqrdzhih286n";
+    sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p";
   };
 
   buildInputs =
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 68097c2e2544c..194535c7314cd 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.8.0";
+  version = "1.9.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "0vp9yapm6bm4zdhd1ibbirc23ck7smrbsrask7xkrnz7qysxgsd3";
+    sha256 = "18r3i2zlcprj6d4nzhhbd6sm1fs2x28924xsm6lcxa1643gkyb7i";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
     license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
+    maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 2b6b0d5b41236..d1a00f1bd0440 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,6 +36,13 @@
 
 }:
 
+/* When updating this package, test that the following derivations build:
+
+   * flashplayer
+   * flashplayer-standalone
+   * flashplayer-standalone-debugger
+*/
+
 let
   arch =
     if      stdenv.system == "x86_64-linux" then
@@ -49,66 +56,59 @@ let
   suffix =
     if      stdenv.system == "x86_64-linux" then
       if    debug then throw "no x86_64 debugging version available"
-      else             "-release.x86_64"
+      else             "_linux.x86_64"
     else if stdenv.system == "i686-linux"   then
       if    debug then "_linux_debug.i386"
       else             "_linux.i386"
     else throw "Flash Player is not supported on this platform";
 
+  saname =
+    if debug then "flashplayerdebugger"
+    else          "flashplayer";
+
   is-i686 = (stdenv.system == "i686-linux");
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.577";
+  version = "11.2.202.616";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j";
+    sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = ".";
 
   postUnpack = ''
-    pushd $sourceRoot
-    tar -xvzf *${arch}/*${suffix}.tar.gz
+    cd *${arch}
 
-    ${ lib.optionalString is-i686 ''
-       tar -xvzf */*_sa.*.tar.gz
-       tar -xvzf */*_sa_debug.*.tar.gz
-    ''}
+    tar -xvzf *${suffix}.tar.gz
 
-    popd
+    ${lib.optionalString is-i686 ''
+       tar -xvzf *_sa[_.]*.tar.gz
+    ''}
   '';
 
-  sourceRoot = "fp_${version}_archive";
-
   dontStrip = true;
   dontPatchELF = true;
 
-  outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ];
+  outputs = [ "out" ] ++ lib.optional is-i686 "sa";
 
   installPhase = ''
     mkdir -p $out/lib/mozilla/plugins
     cp -pv libflashplayer.so $out/lib/mozilla/plugins
-    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
-
-    ${ lib.optionalString is-i686 ''
-       mkdir -p $sa/bin
-       cp flashplayer $sa/bin/
-
-       patchelf \
-         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-         --set-rpath "$rpath" \
-         $sa/bin/flashplayer
 
+    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
 
-       mkdir -p $saDbg/bin
-       cp flashplayerdebugger $saDbg/bin/
+    ${lib.optionalString is-i686 ''
+      install -Dm755 ${saname} $sa/bin/flashplayer
 
-       patchelf \
-         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-         --set-rpath "$rpath" \
-         $saDbg/bin/flashplayerdebugger
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath "$rpath" \
+        $sa/bin/flashplayer
     ''}
   '';
 
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
-  rpath = stdenv.lib.makeLibraryPath
+  rpath = lib.makeLibraryPath
     [ zlib alsaLib curl nspr fontconfig freetype expat libX11
       libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
       libvdpau nss
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 1be28829e3512..bd7ca88638977 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -2,7 +2,7 @@
 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
 , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
-let version = "0.5.1"; in
+let version = "0.6.0"; in
 
 buildPythonApplication rec {
   name = "qutebrowser-${version}";
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb";
+    sha256 = "1vf9gh1f12wza72y3yqj568h2wsm7wfvjjs6qsh6apw5mgjysz91";
   };
 
   # Needs tox
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index e3ffa283ad9e5..781e2d27e55ab 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.7.1";
+  version = "38.7.2";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "186ba5f03adc7cb94c69351f5edcf241abdba1a3602f9b140a46682cb94b053c"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "7c6308024524c8ba458bb43cace95bdf92dfa7d797c7ff936598257c018e4807"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "61de0fc548ff70367334c82bec580caa895f3db63c6b045c5a717bfa282e69db"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "34c935a0b162e182a341699782143cad1e225ea63bf314c158d25f629889c5e1"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "4442d37c8bb411c5c151bd98d06a375dc8ffcf72fee4d03bed6ac8691ccd8e2c"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "e7226b6b42e7cfe4d36c430eca755f5deae8899fd64ea1877ad576f96fe29b8c"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "eaf46e571b55800dfaf63a807236e8bf5fa8e8ba77bc996830ab0dfcdce23300"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "62edb0cee78dd88a871355c996107901456f1fb70793d21209e75875c33d91a3"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "76e3222d9b7bc4f5948c56be6248deb23c1777550f497f115487e323c16b2f95"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "b7ad9dd397abb89b844f8a1adbd34d0dfdea6bb85b3f8ad5d5f297e7f8b1b081"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "b10c7e572ba88f79acb2d57988308c5af6fde268f64434956c4312f8a7c3ed42"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "174f671aa90307e4dd6756d60f37a0b628d7d1cee8c7bb623a1a32c55b26a967"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "b966f3381a30567db88890dd3885c56f9cf367d9c92e192d0c6c79066e482c91"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "e5d96ddd9ed6b685b872d90e95bded23124e21575e9e0bcb7aeaa77ef0226009"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "fdbe97bc87656569b20d8154619cd7b3b5c3b03cbbcd7ff2f1e07a3af547bb41"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "b24ea0ae2977d9380cadfd130f83971e798677ce956152d794523e90a54222e6"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "ba39bd39698ad0486e22806ff468b9a763712f35e943b93e6021365dc061c2ce"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "f51e4dcaeac1aeb53d858d029c34c366e948616f7ca3f35eb22b165fd2839376"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "511441bfe56749643f59e10c9219b8c3192d64c50008ee3d8a2dc342993c0133"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "9f60a1c06da4e61a415359eeaed831d61a8c8ad377952948c1475ee6a2bc0cd3"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "d48939ad0dab7c4829cd41cd6afe9239d12ab2a2337296203b660613cbba2698"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "6b1398161ab1271caa14b20c4ad0b3e4372fca743b4ae2e3d5bd1d77d8038c15"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "c30f3fea47cca28fcc928d813e8c631db43a665d8f347f174b23ef3c1fdd7550"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "592b18fa8ff3749c7a68b5f5406f5ae42f9f97e47cc8c2f9c18b242c8f192b8d"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "1ccdde8b11337e75feabbd1e40f1316c287862769d0b9c37934f22108c74bf1a"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "acb837b0120f00f6cb39e447e86cb140c0cabbe599bff70d85429126df377d85"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "ba4c223c22fda306f4b66daa6ed0d157c5c24489ec7627e1124c9f79b5aca989"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "f4bb5a60493f3fbf519a55dc7ff2fa7bb455ad344d27b133addb2864f9d9d100"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "205729f0ce14666ef98b7e23dad0882d450a508b568fc1d2c99cdfffd2cc9547"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7c7cb801ea902f93e57f944209e1358bcbe73f8ee312112e94ade2a2ef4b1194"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "8bbb39afd31656bc7cdab60b179e0a5bb9d9d9fed62e1ad398dfc5c0f40a35ab"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0d86ebebfd2ba294b0f27b5eb84b083a7c8cecc8fea944705525831cf3c161b8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "76673ffb93fb3b902366c5939619dfa11ecd724dc5ff37fe769d598dc937c353"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "6e7098cf9eb6f1b55d7504b341b709133fb5d4d20cb761984647422749b71615"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "3de2c84af3c7111a306e35f1f7304bf7a77a0e50c8d2c9bfbc896a11a6a23e5d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "a2bb5c2b6e174a65cf825293f57cc1628930686f6a674d2cb7fcee6aaf755afc"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "f0ec8c9613ee04c7f7c1b55cb81386036220a715b58edc302e2099882e2c642d"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "3ed3c4431fc604fbc05b6f17c9c6e74057278e9ef85480d60ea638843eab1394"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "e4dac93472bc5f41a75daf9ca18265de527b5fc621812bde2c634f1fa5a4692c"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "8a30c0c7a586f598e6065f20b2a0dc1e105f59d3e4adac8167da462e8e0193d2"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "adfe8aca07faf08ba780ca0f84d638d461f4a0f00b92d5a9cebe8102a94bce79"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "19ccb4a2ec44b1c8edce204627af3d0e84f214591d3b7a4f6e67e297dd9db0f9"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "88f763080b2bbfb8957ed6b52189f2195b3317a1bfb851a6e686765e8a12181a"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "5955d594802281794ef25e9fda196206464ac0594ce12e957b5c40c589c89ad0"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7fb849565e25b1bba853b434d7f0207bfc9b3f39251f08edf65a8a38ccd0dd96"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "b56cd8b5fc665ad24061fdf2ac3196aff9f953395e894007b133bc83f676be33"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "860dca420cd8c6c18bc703ab4934948e038b4e7e91a1d80d3f632980f0799424"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "4e8723dacd9a4961f02fece36066166c044880fbc0c7aab4e0f1289a36bd22c6"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "fd071bf547ba0baaf13141e30f34c15108fb6e44432b02d55508cf3dfca91cdb"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b999261eb53e28c5b43fa5d3ffcb2f9c12cca45a38c6e8fc56a342b1a5dda78a"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "2c2e7d7a459dd85f88fb3839002e2eb602d47ce5df4d0572928d8a35a0df4773"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "0c540f0ffb1224c8d3b18423690f319d25ff5e0c004d18cc8bc6b7d69ecbc48a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "5d7e14f94f53c7623dc4fce69aa991a67792e0d2405a6c7044558d5023ea0cc0"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "6355145ae642332d1798f8ce169cb85cc930af6add6c8cda142e8183666fdb71"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "897eca9ffdbf28f3d3f720dd44f68f67a289e4d2aff91005c180688b34358b08"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "43d2cf464be8be57a5d2bdba1683e6179641448e351d9a8bee9889febe1ebefd"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "5e6b806364d7e97384bf3f30e4f398c8041cd8acc000b21edcf218ca24e1903a"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "5b96ea401ec1af9473cc57e4f09f6f264598e52196dd9da38cebe3e802649fc9"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3fbd40d914f9347f09848ffb3486d1cec9734f9ae3cc969bc71a8d9c61aea92b"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9f60903ccb571eebdf7fab4c62e1f0675d4c7f5bcbca7589e669c931b355b55a"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "bd0e53bb5d792c9caf2aedc67cf1df2281d234905b96748766446e842448e39e"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "f7bc98632e15fb73c61c5fd54c3e349e93f3f07b61ee92d704b105b05386949d"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "6361b21f9a57468cb8e6273805437d4a40f90c0b461d447b17543f84f9cae8c2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "df4d4ef5a25a8aa2f9cbbfef2425056c19b568030e2b217f9bb535fcd81cc017"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "def27fdc02da10e148b3312199826157b981165a98ea9a3f5135866092e07ad3"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "3c55c72d8b9936dc0b0ecf2e88024d4e128f4cbdb32ec5770d4caa930e12d696"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "7f1e39da21362857afd57151b0bb606c7a8b52f0ea1362cbb5bf9c4eb9b18db8"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "3b70e990616d999c572a9e95f92dc62b004f5449891778a6530ee81dc1f42703"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "7023635ab8fde872b41b08f523128721863091d7bd7e76646ea2f2929a667719"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "370075633a30d3f4afbe69c617ecc4df33e51aa95704ef9fff599a13e9cb3ab2"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "f143791c658916ee2ddac2199293ded234cfd8201cd6399775ccb996cb784e18"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "5d48abb53a5b71be190dc4c127c5718704fbc12590c2c5fbcf3b4046f9840415"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "319df90e458817537f7323e97c3d7fdeb2fd965a215b1173f87378b3c94e3ac7"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "2f93a35135f387c8cb2e4ca4b0c800f846596d0f93350f3be0983797a0571359"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "8e3d9003a67a0d38821dae7a070eebe32698ae6a89272394d4f7faea91595360"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "bf2bb1676c5966b6fdcf34c93eb3444ed0f3dd6ed03c8e2a39f6757811bf0e7f"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "e938fcf2e84bc19d766c89312f8ca8e055ffeaf7fe20ba8d616aeb0b862cd064"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ab0b01922e883a34874de33f6eae08a8e4e40d23dd7ddcdf42254386218728e6"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "fd3fd9fe5280365a27ef4e81f7965da2e85ad149e4e026f6a8714a73d976eeb2"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6a68c72828036a256a8d04b1678be58c786671ef97f106b23812ebcf149f1d15"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "26bb8ca3617c70d1126ef4111787ab267bc6dcd28b2b995e07b7296bdf24723b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "de6ac16163aab662ba4fef2130dd822ec9cfecc0f4beec54f2017785fec8eb0a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "82c459a487d2a7b156f92db36e85c815c714d59474ed9bd8cde46b08c69f1d57"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "1f4caae64ced0c69fe6ba6330921fce0d220b616a0eb8b1e696da85cdcf5ec01"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "830b649a394cd844bb1b159a76d265455f6ace76dec6697491367b2f6eff1588"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "e89e906cd896c8e04754a9658dc72617954e0a097e6e3b648e5ce827c8cec7d7"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "260fc959ce74945d827c230124a451cec75b6347b78d7d8bbeb65a2bd91f5bd8"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "aa416170d0d04d0e2e570d0b0874b6c585d706f8b670de3c24bc5a9ce9819d8d"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "a24ec33c8812921ad0f15dd4306218a2443f7018be5141bcc8e87e0ce3f52929"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "5c8bb4872206cacd17cfb77ed3cf58024cdc81be181908213f80659c4d36594b"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "06bde08af3d4b73db3f0a8b87f4f5f3bbc95fd92d717a9ac83efddb7ebc0f12b"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "6adf1e6992b05b6c93152bb19a79fe39f319b5a5a62d2491191544eaaabbcc1b"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "3f757064e857d8c4d025c0de8325b3bfd81648ac2b77ee11ca847e8ea85d35a5"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "01147194ad382e4cc61c22c6a2672a01740ced6fdb3d4c2a9394ca9d62503c24"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "ffd8e8bbadb7be4672555f1ec8e4134af5c0898041cc197e1d0081b636d07642"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d1e9df7d081afa272e94534ee3d6310c3498629cd7bba0fd7ab86675ea885714"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "2835ea496c48c171efa0d79924cd3183c12f6de49ce05af72214f6ad4a407c85"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "e585b0839c2b31ef12f562c4303b46b392493c6619b7e1b0c92e21c3afdb7461"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "592ece3de096b4135c24e9079f20b85b8c394d488caa6b7907b75d49f51fb30d"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "048bcb92d0915b909e2174c990948dd5c50345452369e067bf8c5770bc7b40c4"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "b24e02beeb02d44ba64884864cdfb6605e7b3454b6e953767ceeaf4817f41d95"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "caad067689a49308c2e51385750f3d2319e3a06757cf56060ce3c5ecb74a9ed6"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a2dc5de82a1736dd3aa157da305f5db478625508444df244a3492dfaff8278f3"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "d2c4ab30e6e5d17716d7981d0039f043a41107edb917a838be66659d60653074"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "58773ebf8d949541a2c19924935eb09f0d996aa4059ad3c17a71c664357c2bcc"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "bb5c4d1d81373c1d25c1df4d896fbd1ba52acfed4e890a81650e34e5b9bd2ef0"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "c95f531aaa3d36788cf6511d51afa1242657890bdc10628218aef60d6d80b106"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "bf04a4f7b629e20f8389aad530b89b592686bd1a8340090311882934f9bea391"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "2c0c6d3a2d4228b7838864835665ff7d46cf8564d59db817ee1d8f9665828410"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c51477c9aaa96765205c163df83acb003c2db837243225d5d1e8753b1de5b71b"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "3c92aef738962dab12fa0e118d64d29bb0d110f9ef2050630b3649d574036476"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "4854536b65fb7afb8925315ff4192c369db53f55b3ccec698cb561af1bc03f68"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3aa69342828a99d075e0b70938d1360dcb9016ad322638c57fba9288e37b9b3e"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "9d590c31e369d8e1287c915cb91061f14359329c89e5038e3491052ff3df894a"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f133efa32b74f0203186abfeb5b191bf50711f04bf29762e2569b78e0feb66e3"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "15d71526ef072de2b9adacb300e0eb158170839be82a7def9efa6ac55adcda37"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "63cdb91df96bc132e0b9b6c702cdc82b9583a58be11863c76c0a1a04b689b1ed"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d1dc64cc1ca886b81da71e132b31644d89b8f61b4fab5f886c00b3b8defcd49a"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "b71ee84b0e56d7dd9b4cb40032055c8c1f8b4c18e9d679d84b71c226c928a189"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "dbb80209a669529b17553d152d5b3ccffbabd5c44b1e6a7e63a2d011e5425a2c"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "358cf7d9b9b13cbd5614daa4f140a412e777f2dffe0dfa2673b33582f59e02f9"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "bd4ac7afafcc4b4a65e34f207f7c07b24be36c06c8e067fb75f4a22ce759fb4b"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "853629b5625f9dd9a81d5f18d862f0f527043435a7c4624f6f78fa68541a5bba"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "8d094f3d934d2ca42c38b985145bec7f72b4ddb9af7c31e30413721eaecc934d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d569e6211c4c011955553f3480fd8530ba6dd853b227859f95b0d8af4d9e8c6e"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "5ed4e24f7725864b47dcbb0602463bc95bb33c8e4413483854e0bf3f33ad9376"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "683716f591654dfc843a32198d5bbf6199bccb1a035d391293c4877f0ec47b1c"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "965d58b4ea4280f20d197e28e0e9eb87b29fc955e4f6e15b6582027000d0da6f"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "eadc1248c9352574dcfcdcb3264a662d3a29f85a2f112f77a843f76d8778cba2"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "cdd631c4a32d529a85f04bee01bbc7f50396b183a0f154808e801d29f0f11aab"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "093f01ad325ba33f3f33f2efd72fb5cf3a87dd81162b094dc544744af78f3705"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f74b39dfd0d9f2241ea65d55a6e9459296796adf228def80c57dd66c3f05921d"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "f84113f32952ae91a35d2aa166f16c4683e03fa43ce6fbd911d0f7f237b22ee8"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e53fd624a5c968e60cd485ea7c7b80a68c164c2f165287ec68a180066c560cb"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "ff1f79558185d2a29487d15f95140716603f5978e8fcd891206ea0c5697342a0"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "522c53748cc7ab0faab84e124e45f3bcdb865f4b5312ff129fc50700ebc4d8ef"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "3e83bca492c325438f48880d76a259c3fbfa65eac71569a79e1fdff858268621"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "020655df7c19750f86a7e1778846ed53e2fe350d44a76f4ac0acaeb82c9d4100"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "3409d2988bb31b2dfc490e03976471e2d09139660a4c08daab518f3095b45170"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "f5d084e8efe87488fed491432d93fb74c7e14b1fbcbc2abf21af6c669110b5bf"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "514a3262c1d0e146b3dbfc24d54b73ce0a5e27e02f26692e25ba6e36897da125"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "924b0e1514cddbad893446bb6561ca9422d46f6f5303fa7f847550f2f92a988f"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "1cff7f847a1ca8a52cfc9a733b7e223a8468a82f5ea9c7d8e1c074868a9baf27"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "5e803270db14ba348ab7b8697d488d172b774a8d782c22f079db0e8ccda793bf"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "95428cacb129137747da7cab4c793f102f87a5224ad2a5adc6f52939df746432"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "828317d27c4336aebf7122e2e5268697d8d0cdcde9bf874b63798f7fc6f84fd1"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "7ec8555eeb01f126671b89fd8dcc46f219bc938cf15ca8b7f67b13a1df38a101"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "082c9ace7d6775aff0e0b379206fa5109ce5bac08686ab937b7441edd6e17d6f"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "722e87bb5dbde3a7aa6ce5a913622a050a3fd1da822656a787cac6a18881737f"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "4420c5d0b773e76bdfa4e4ac842b86f3875ad81dc5b4d0666497a30d77267720"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "a3128b1315428ec2906ff44bef49f8f448d7116bae80be7bd68bf78138cf5192"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "299284d934129a15b70ca9f2d26fb05773d555972b14afe9f65826aaeda7bbf6"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "197ba5387010a6d95fff049d780829526d1676de43f1eaa16be2ae1f04f1601a"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "fc8386c294d107994463311d3778ad507a8848af3be8a533fd2c5be7394b9222"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "db764598fb0cec2fdd0e585b3396e53fa873af303c4f9a027061a0179e445705"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "ea87a217ec9934fae484a32f4dcc655cac04116c9b0c73e458eaee7e595f2b77"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "e27563fdfcfceb5ed4b2643d63d5c26834ca9afed1d887151671fd13086fd66a"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "0ee8fdb3d0a1e50afa5f232fba57d84b97c428c41176e73a712a2438bc3e8796"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "a5a785c9ebfb40a7962e29603792de280c57ff5d77f7836c5048074d5c9d4178"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c5bbbb471fc2af310d768e7b01ff1336f78791a42a60b4473cdab00c0bd6e980"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9c18f2677315f8613203dc69a7877b83e787f6c0b96fb150ab7e4ba3ac712e54"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "ccfcca939876bcca2e3b9fd81aee747d1c94f0df02f5258c9ae43564f61c7c23"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "60031f3767779568e49ea477fd2677adf0f437d5663a53b7d96203e2cbc85f1e"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "1090d5993cfffa923be8a8bb3acb197bd7968c994a1558a1024d81283e9341b2"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "5a67627f06ae51553730e9185a11208f6ba15c421ebc5fa3ba358a341830efae"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "2f7d114cfd69859f1cecd479ad00735744efe19b8a3db1be391fcd7dfe6ca757"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "f6cd331db9669ec8d910210061e95f2c87e64afe6343f5faaf75a321a5b99471"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "f665b75ad6ad846c57007e747931b89d773984beedb825c87fcb07a86ab52f9b"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "69b5baa57f47ce77373aa9505b2ccba0baf90911f2c3ebaef28b043b601ad34b"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "7bd6d9e36e87cf2e3aadb4fc7dec2dea371004466bc9a84ead3f60a59af38ae8"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "72cd9a12387bc5dc02783bb6f6a1d55ab8444557e4d2c46c35b93ce0ab0cf394"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "27b60e8cee363317070e74702d9ba97e5d68318caba0e17fc37aad6bf0fbb362"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "b0b8219da55e81f3feb0872333eadd0f490b251fae09244d31287f2e40339861"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "fb1b52b27253280f98e01b11e6f46e01d854998831b337a52922b925570ca330"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8474bc4a1fd0f8b27131ed3ba999402e1a56b7e04be157e571b95c470f43e779"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e68036c3057ce7c369b43335397c8248e5aac83a6db6e729c8e1116ed57a20a1"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "23ea1fb9c64baf835be0a87f7633ee5b87cc05db90a652ca05f17d6b2cb1904c"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "52584ff6ec72359f44891e630b099fc9114e1266a11cd0d063db5ff6034ed02e"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "3e018dd9407823747dce9d32571a390a8fdff11339826bcd68c6879b8edb9c1b"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "f86a8cd6be21403749607690c467baa126be38e547d1b0e3f50d40477b346fde"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "82afb08b29d44aa09da71c454c42d31fbf7ee2756c6f1ddca5c456179e5a7f89"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "d449b869faf6438697bb7e3f692c9bca6c1a116441b08dbd84e775de62564470"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "02bcacb390dd85bf2e7809751d840fa7c87bb8eac467d9bc2cb50a77559060f9"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "8ee832167990dc9546775a1c32518e4524b0f92147ce11e149b0b447932f7ecc"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "374b797f6d662e3deb5a05f6939f650a0ec272f7788cc7dc1a02fc0262e5c903"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "e0308132773119f13443ab475d66e651182adf508b7ca04b0efb65fd84013916"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "dce54478d896490141be7f10ef780196ce446e3312cf5623315baedc4354f992"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "e4b478609faa58ab0e8de7e2f542290f9ecf268d68f32828182208337523d3f5"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "14b2df6e331ae651d1d913c2d7116466df63e9fd24aad02db7a7f3dd010820c4"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "779f48e75546babae4ee153ce7d16f93af9daabf70f855dd702281e948a75cba"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "faa6893cff053c090428035964fe67af8ecf9f5b71225678754e96d38d498311"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "8a3ddebc51e182175afc272f16bdb7a584d78dd7af8849844f4e02892a439efd"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "3298284a9b326eccc05343ec5795034fa46dbfe75458e19d39d23564391840ac"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "e1f2da61eaf58f723e0c0021eb728e2a78a8cf36db60353e58d0233c2de60f73"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4cb1c3b16b8d70f19e14a185bfbbc505d66795ddc4d55e1575193dd018c950d6"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "72b2c72ee5da9c4b353868efc0431b78feaeb0be8c18eecab6df4cfa0c5c7a3c"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "48e7d195e4b6b9144e32f4a254a40f10c59a167a05ce0f38a013f4b914511d55"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "ac6b2064b76b2a5f3cfad6089897126bca7cbf64922b61474eb01b0d65638221"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "57aee02d52b638d393df6a824021a1355df83711dc50663cc67a71366004a017"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "451de8f95bc2eaf67d1abb7ec604f566e5cb2f6b9a8ae2f2495f10a7157a12eb"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "98391cba2a9cfd194cb427243738e588f6de9c112762a6c1e099ba7a4fe621a0"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "92eeb485a7da11f1d600371d596c31fff778415784b54ec2fc5ba74199f49ec5"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "f4e3073d31b221dc2fb37162011d6ab9c0980137cd81f0d9bf70384cfda91e4a"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "4694fd61f7fe2a1066e08f85f041112076d63cf0fcb99db79c5833d714684388"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "088c29a337c926dcbe11ef19c072624014ae7b59cf0ba2a0b8f25a5a725ec796"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "0cb7c16955538ce7089e3aa8e5bc5c3325c4867aadf56837e7e3a05e86c4f482"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "b420443eec07c56afed8435c02c305d355935cb0131b672814878cc9fb0143e6"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5964971c7261ba0619d34ce70d1fcf00aa105f159e2e47853d67fe03579dcbb7"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "ffb21e8a7a02ec8ef445735bc519671f3f3bf90f994db750a4d29385d574fd24"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "1177e20ff9b866c4c7e49a929c1f54c47174f80a8541ad0c98d5e472c4f20d26"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "1309eaf342d7bd7a31c1022183e13e1b02275b01228fbfbd0d5e8b3ef235cceb"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "adf736651eab43de2a927cd7ad471042f35eada0a5df4a09c0bbccf75dd17b44"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "102c828dd42872ca9472d94ff842f412bd907be1f4cec8605805fea9f75250e2"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ebb608409f3c4ab44a6818020a826be7c3402977c18b08200df6b332e0a7fd3c"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "ff984951130343fdba5377f91e325e7cd21b7c4e25a524b4a1bc98978842e45c"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "15ca7d36207f8e7a80744d0d15966015c8dc395464cf7f70c98b643059f19fcb"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "6c93f80d249ab5558543cc7b13cf72c2abba1da0616a817661f790e5c17c24cd"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "3c6c64fbc264d4a3c98ae69c92ea778a87bd84ea23ded7f63117b4c77f93b4d5"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "3a82d99b249d9a99d207fc0b1d5a1bd8523833dc61ec09dd917ff427659ec338"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0bf0e9ff45b3d25ef1b31f28b91e30280e8bdb25f864a31ccac795f66e27bb68"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "d346b57092959dbc880c9dc5a8b832dc7967c171ac361aa9b7e77b5589bd4c9e"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "6d86d75981ba1850980c3fa498c804dc64b4328c90d12d3a5c13af2f1e47af6d"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "179a67fbb2420615e179d1c69cc5dccf1b135a7c61aea26bda658c724655931f"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "bc95ac4b30ae806658218df21f5d9aa6c26b8b8c5fc8a58090de92e347735c58"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "8b49fbe88dcc328b94a99f3b30af9f783910dbcdea1fc5b160526409d56994f7"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "2ab49ec5742c07c44028d8aa980a6bd96623c554699037fd64d28cf4744789ce"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "6eecd8d5fa6d6a826fec7a09ba11092348a0fa74c7c7a8c1239f41392d2e2055"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "fdb2a25480eee0659803432fea02794f73aa18e9fe5a4b1c1c70ac5aceb09b4f"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "64358161ecc5064ee9fd26e301136a58f32b387466d6127604772b59b44f32c5"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f9f54927e4ee378f56879b6ffc121d02ad300f6982d7751e730564ed9a9d8c80"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "78a6721da743bec597c9dd1e6bededffa43d675784f3585b0d1f03989007f295"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "fc3460aae0c3395220644ec0ce8c139512726e62d591ef51f4900ac3c9a9e461"; }
   ];
 }
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index b99727b2c9b61..f44baad4715b0 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices, cf-private }:
 
 let
-  version = "3.7.1";
+  version = "3.7.3";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1vfgqlb8z2k1vcx2nvcianxmml79cqqqncchw6aj40sa8hgpvlwn";
+    sha256 = "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
new file mode 100644
index 0000000000000..b75c09d2909de
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "lxmenu-data-${version}";
+  version = "0.1.5";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz";
+    sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
+  };
+
+  buildInputs = [ intltool ];
+
+  meta = {
+    homepage = "http://lxde.org/";
+    license = stdenv.lib.licenses.gpl2;
+    description = "Freedesktop.org desktop menus for LXDE";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 0ab3f52f2bff5..f13826ddb8c03 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -65,6 +65,9 @@ let
         if [ -d "$out"/cuda-samples ]; then
             mv "$out"/cuda-samples "$out"/samples
         fi
+
+        # Change the #error on GCC > 4.9 to a #warning.
+        sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
       '';
 
       meta = {
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index cc8c80653ba2a..99a4d6fc4d1fb 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.7.3";
-  devver  = "4_7_3";
+  version = "4.8.5";
+  devver  = "4_8_5";
 
   src = fetchurl {
-    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/gambc-v${devver}-devel.tgz";
-    sha256 = "12jbr6bc0zmc7vw07a9pliadbvqgwkpmw6cj8awz73clv1j7pxha";
+    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz";
+    sha256 = "02b5bm06k2qr0lvdwwsl0ygxs7n8410rrkq95picn4s02kxszqnq";
   };
 
   configureFlags = [ "--enable-shared" "--enable-single-host" ];
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 660ea28091230..1490e15c361f3 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.8";
+  name = "libsodium-1.0.10";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0";
+    sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 46e2da18aa1e8..908d1ea856f5d 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
-, libusb1, libpcap, libXt
+, libusb1, libpcap, libXt, libpng
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
+  buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap
+                  libpng vtk qt4 libXt ];
 
   meta = {
     homepage = http://pointclouds.org/;
diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile
new file mode 100644
index 0000000000000..d52f576be243a
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "travis"
diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
new file mode 100644
index 0000000000000..e84e87fb5232b
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -0,0 +1,51 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    backports (3.6.8)
+    ethon (0.8.1)
+      ffi (>= 1.3.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.10)
+    gh (0.14.0)
+      addressable
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
+    highline (1.7.8)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-http-pipeline (1.0.1)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
+    travis (1.8.2)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    websocket (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  travis
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix
new file mode 100644
index 0000000000000..adc63ce7c43f8
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "travis-${version}";
+  version = env.gems.travis.version;
+
+  env = bundlerEnv {
+    inherit ruby;
+    name = "${name}-gems";
+    gemset = ./gemset.nix;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+  };
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${env}/bin/travis $out/bin/travis
+  '';
+
+  meta = with lib; {
+    description = "CLI and Ruby client library for Travis CI";
+    homepage    = https://github.com/travis-ci/travis.rb;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms   = ruby.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
new file mode 100644
index 0000000000000..abfd352e90ece
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -0,0 +1,146 @@
+{
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  backports = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k";
+      type = "gem";
+    };
+    version = "3.6.8";
+  };
+  ethon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  faraday = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  faraday_middleware = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      type = "gem";
+    };
+    version = "1.9.10";
+  };
+  gh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2";
+      type = "gem";
+    };
+    version = "0.14.0";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  launchy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+      type = "gem";
+    };
+    version = "1.11.2";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  net-http-persistent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4";
+      type = "gem";
+    };
+    version = "2.9.4";
+  };
+  net-http-pipeline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  pusher-client = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  travis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  typhoeus = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  websocket = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index c9517b22a33b9..3118c3fffb1bb 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -1,13 +1,13 @@
 { stdenv, callPackage, fetchurl, makeWrapper
 # Begin libraries
-, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi
+, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
 # Begin download parameters
 , username ? ""
 , password ? ""
 }:
 
 let
-  version = "0.12.20";
+  version = "0.12.28";
 
   fetch = callPackage ./fetch.nix { username = username; password = password; };
   arch = if stdenv.system == "x86_64-linux" then "x64"
@@ -17,12 +17,12 @@ let
   variants = {
     x64 = {
       url = "https://www.factorio.com/get-download/${version}/alpha/linux64";
-      sha256 = "1xpzrx3q678519qgjl92fxn3qv55hd188x9jp6dcfk2ljhi1gmqk";
+      sha256 = "01si5n9hb2h0c5q8k3hr3nphsakp9kki84qyp70dgddwqsn8wfjl";
     };
 
     x32 = {
       url = "https://www.factorio.com/get-download/${version}/alpha/linux32";
-      sha256 = "1dl1dsp4nni5nda437ckyw1ss6w168g19v51h7cdvb3cgsdb7sab";
+      sha256 = "13h013ixyhv4rpvh0jv5jry3mrwv65v57nqn16bjh3hr8ip70lkq";
     };
   };
 in
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     libXinerama
     libXrandr
     libXi
+    mesa_noglu
   ];
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 4bb81d30027e0..7a4fd611b1b4a 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -24,6 +24,8 @@ let
       which
       # Needed by gdialog, including in the steam-runtime
       perl
+      # Open URLs
+      xdg_utils
     ] ++ lib.optional withJava jdk
       ++ lib.optional withPrimus (primus.override {
            stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 9e485946a18da..8958b51e873ad 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "A caching proxy specialized for linux distribution files";
     homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/;
     license = licenses.gpl2;
+    platforms = platforms.linux;
     maintainers = [ maintainers.makefu ];
   };
 }
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index 3d34bb8e11f2e..a1502b4d6c44c 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "taskserver-${version}";
@@ -11,6 +11,26 @@ stdenv.mkDerivation rec {
     sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
   };
 
+  patchPhase = ''
+    pkipath=$out/share/taskd/pki
+    mkdir -p $pkipath
+    cp -r pki/* $pkipath
+    echo "patching paths in pki/generate"
+    sed -i "s#^\.#$pkipath#" $pkipath/generate
+    for f in $pkipath/generate* ;do
+      i=$(basename $f)
+      echo patching $i
+      sed -i \
+          -e 's/which/type -p/g' \
+          -e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
+
+      echo wrapping $i
+      makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
+        --prefix PATH : ${gnutls}/bin/
+    done
+  '';
+
+  buildInputs = [ makeWrapper ];
   nativeBuildInputs = [ cmake libuuid gnutls ];
 
   meta = {
@@ -18,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage = http://taskwarrior.org;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
   };
 }
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index ed0cd80863419..8a0a3ef4ccaf8 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="708";
+    version="709";
     name="${baseName}-${version}";
-    hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
-    url="http://mattmahoney.net/dc/zpaq708.zip";
-    sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
+    hash="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
+    url="http://mattmahoney.net/dc/zpaq709.zip";
+    sha256="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 5635e3a69ff7f..66f36a6f63c9b 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     ];
 
   buildInputs =
-    [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
-    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ]
+    [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
+    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender libXaw ]
     ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
 
   CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index 08f99469d255b..767ea0e542540 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "optipng-0.7.5";
+  name = "optipng-0.7.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/optipng/${name}.tar.gz";
-    sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl";
+    sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28";
   };
 
   buildInputs = [ libpng ];
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 89ea0e9444402..bcb7803785b0c 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,72 +1,114 @@
-{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg
+{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg
 , openssl, libX11, libXext, libXrender, overrideDerivation }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.2.4";
+  version = "0.12.3.2";
   name = "wkhtmltopdf-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
-    rev = "refs/tags/${version}";
-    sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm";
-    fetchSubmodules = false;
+  src = fetchFromGitHub {
+    owner  = "wkhtmltopdf";
+    repo   = "wkhtmltopdf";
+    rev    = "${version}";
+    sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s";
   };
 
   wkQt = overrideDerivation qt4 (deriv: {
-    name = "qt-mod-4.8.6";
+    name = "qt-mod-4.8.7";
     enableParallelBuilding = true;
-    src = fetchgit {
-      url = "https://github.com/wkhtmltopdf/qt.git";
-      rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo.
-      sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx";
+    src = fetchFromGitHub {
+      owner  = "wkhtmltopdf";
+      repo   = "qt";
+      rev    = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
+      sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
     };
     configureFlags =
       ''
-        -v -no-separate-debug-info -release -confirm-license -opensource
-        -qdbus -glib -dbus-linked -openssl-linked
+        -dbus-linked
+        -glib
+        -no-separate-debug-info
+        -openssl-linked
+        -qdbus
+        -v
       ''
       + # This is taken from the wkhtml build script that we don't run
       ''
-        -fast
-        -static
+        -confirm-license
         -exceptions
-        -xmlpatterns
-        -webkit
-        -system-zlib
-        -system-libpng
-        -system-libjpeg
+        -fast
+        -graphicssystem raster
+        -iconv
+        -largefile
+        -no-3dnow
+        -no-accessibility
+        -no-audio-backend
+        -no-avx
+        -no-cups
+        -no-dbus
+        -no-declarative
+        -no-glib
+        -no-gstreamer
+        -no-gtkstyle
+        -no-icu
+        -no-javascript-jit
         -no-libmng
         -no-libtiff
-        -no-accessibility
-        -no-stl
-        -no-qt3support
+        -nomake demos
+        -nomake docs
+        -nomake examples
+        -nomake tests
+        -nomake tools
+        -nomake translations
+        -no-mitshm
+        -no-mmx
+        -no-multimedia
+        -no-nas-sound
+        -no-neon
+        -no-nis
+        -no-opengl
+        -no-openvg
+        -no-pch
         -no-phonon
         -no-phonon-backend
-        -no-opengl
-        -no-declarative
+        -no-qt3support
+        -no-rpath
+        -no-scripttools
+        -no-sm
         -no-sql-ibase
         -no-sql-mysql
         -no-sql-odbc
         -no-sql-psql
         -no-sql-sqlite
         -no-sql-sqlite2
-        -no-mmx
-        -no-3dnow
         -no-sse
         -no-sse2
-        -no-multimedia
-        -nomake demos
-        -nomake docs
-        -nomake examples
-        -nomake tools
-        -nomake tests
-        -nomake translations
+        -no-sse3
+        -no-sse4.1
+        -no-sse4.2
+        -no-ssse3
+        -no-stl
+        -no-xcursor
+        -no-xfixes
+        -no-xinerama
+        -no-xinput
+        -no-xkb
+        -no-xrandr
+        -no-xshape
+        -no-xsync
+        -opensource
+        -openssl
+        -release
+        -static
+        -system-libjpeg
+        -system-libpng
+        -system-zlib
+        -webkit
+        -xmlpatterns
       '';
   });
 
   buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
-    libX11 libXext libXrender
-    ];
+                  libX11 libXext libXrender
+                ];
 
   configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
 
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8cb6172d87b60..189be8be9e265 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "1l4gzz3yr0cl6a9xdy7843c5sb7afyq0i80wi2hasfpfdx5k95mz";
+    sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 906ca5f39dd3b..2ccfbb816fba2 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,17 +1,12 @@
-{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
+{ stdenv, fetchurl, nodejs, which, python27, utillinux }:
 
-let
-  version = "16"; # see ${src}/util/version/Version.h
-  date = "20150509";
-in
+let version = "17.3"; in
 stdenv.mkDerivation {
-  name = "cjdns-${version}-${date}";
+  name = "cjdns-"+version;
 
-  src = fetchFromGitHub {
-    owner = "cjdelisle";
-    repo = "cjdns";
-    rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867";
-    sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29";
+  src = fetchurl {
+    url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
+    sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri";
   };
 
   buildInputs = [ which python27 nodejs ] ++
@@ -35,7 +30,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/cjdelisle/cjdns;
     description = "Encrypted networking for regular people";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ viric ehmry ];
+    maintainers = with maintainers; [ ehmry ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 4a8d7518e9c28..4111957476787 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -3,10 +3,10 @@
   
 pythonPackages.buildPythonApplication rec {
   name = "sshuttle-${version}";
-  version = "0.77.2";
+  version = "0.78.0";
 
   src = fetchurl {
-    sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10";
+    sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
     url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix
index fbf4adde2ae72..a2f0bf706c870 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix
@@ -104,6 +104,7 @@ let
   mkUrlName = { pname, tlType, ... }:
     pname + lib.optionalString (tlType != "run") ".${tlType}";
 
+  # command to unpack a single TL package
   unpackPkg =
     { # url ? null, urlPrefix ? null
       md5, pname, tlType, postUnpack ? "", stripPrefix ? 1, ...
@@ -119,6 +120,7 @@ let
             -C "$out" --anchored --exclude=tlpkg --keep-old-files
         '' + postUnpack;
 
+  # create a derivation that contains unpacked upstream TL packages
   mkPkgs = { pname, tlType, version, pkgList }@args:
       /* TODOs:
           - "historic" isn't mirrored; posted a question at #287
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 022c47a90e442..ba80b99b9dfe6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5308,6 +5308,8 @@ in
 
   lxappearance = callPackage ../applications/misc/lxappearance {};
 
+  lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
+
   kona = callPackage ../development/interpreters/kona {};
 
   lolcode = callPackage ../development/interpreters/lolcode { };
@@ -6259,6 +6261,8 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
+  travis = callPackage ../development/tools/misc/travis { };
+
   tweak = callPackage ../applications/editors/tweak { };
 
   uhd = callPackage ../development/tools/misc/uhd { };
@@ -12376,7 +12380,7 @@ in
 
   flashplayer-standalone = pkgsi686Linux.flashplayer.sa;
 
-  flashplayer-standalone-debugger = pkgsi686Linux.flashplayer.saDbg;
+  flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa;
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index b8f0e66dd5329..229461b82f7cb 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -565,8 +565,6 @@
   };
   by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.7";
-  by-spec."adm-zip"."~0.4.7" =
-    self.by-version."adm-zip"."0.4.7";
   by-spec."after"."0.8.1" =
     self.by-version."after"."0.8.1";
   by-version."after"."0.8.1" = self.buildNodePackage {
@@ -2003,15 +2001,15 @@
     cpu = [ ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."2.0.0-rc.2";
-  by-version."async"."2.0.0-rc.2" = self.buildNodePackage {
-    name = "async-2.0.0-rc.2";
-    version = "2.0.0-rc.2";
+    self.by-version."async"."2.0.0-rc.3";
+  by-version."async"."2.0.0-rc.3" = self.buildNodePackage {
+    name = "async-2.0.0-rc.3";
+    version = "2.0.0-rc.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.2.tgz";
-      name = "async-2.0.0-rc.2.tgz";
-      sha1 = "6fc56eec72574ebfe43ad30aefef6206f1ad2494";
+      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.3.tgz";
+      name = "async-2.0.0-rc.3.tgz";
+      sha1 = "1fae1160594dd47dbe5431d4726d66b10f374d89";
     };
     deps = {
       "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
@@ -2022,7 +2020,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "async" = self.by-version."async"."2.0.0-rc.2";
+  "async" = self.by-version."async"."2.0.0-rc.3";
   by-spec."async"."0.1.18" =
     self.by-version."async"."0.1.18";
   by-version."async"."0.1.18" = self.buildNodePackage {
@@ -2310,15 +2308,15 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.3.0";
-  by-version."aws-sdk"."2.3.0" = self.buildNodePackage {
-    name = "aws-sdk-2.3.0";
-    version = "2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
+  by-version."aws-sdk"."2.3.2" = self.buildNodePackage {
+    name = "aws-sdk-2.3.2";
+    version = "2.3.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.0.tgz";
-      name = "aws-sdk-2.3.0.tgz";
-      sha1 = "96c653063863e2b7df34f6ab160f89f9c90b6a7b";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.2.tgz";
+      name = "aws-sdk-2.3.2.tgz";
+      sha1 = "2025fb6cfd40b077befb783b8de57d0c09a92575";
     };
     deps = {
       "sax-1.1.5" = self.by-version."sax"."1.1.5";
@@ -2332,7 +2330,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.3.0";
+  "aws-sdk" = self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
@@ -2356,7 +2354,7 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."2.x" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
@@ -2379,9 +2377,9 @@
     cpu = [ ];
   };
   by-spec."aws-sdk".">=2.0.0 >=2.2.43 <3.0.0" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk"."^2.2.43" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
@@ -2538,15 +2536,15 @@
     cpu = [ ];
   };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.3.2";
-  by-version."backbone"."1.3.2" = self.buildNodePackage {
-    name = "backbone-1.3.2";
-    version = "1.3.2";
+    self.by-version."backbone"."1.3.3";
+  by-version."backbone"."1.3.3" = self.buildNodePackage {
+    name = "backbone-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/backbone/-/backbone-1.3.2.tgz";
-      name = "backbone-1.3.2.tgz";
-      sha1 = "43cdf6b25af3f54a7deb314129e1397ff42d6b83";
+      url = "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz";
+      name = "backbone-1.3.3.tgz";
+      sha1 = "4cc80ea7cb1631ac474889ce40f2f8bc683b2999";
     };
     deps = {
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
@@ -2557,7 +2555,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "backbone" = self.by-version."backbone"."1.3.2";
+  "backbone" = self.by-version."backbone"."1.3.3";
   by-spec."backo2"."1.0.2" =
     self.by-version."backo2"."1.0.2";
   by-version."backo2"."1.0.2" = self.buildNodePackage {
@@ -2654,25 +2652,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base62"."0.1.1" =
-    self.by-version."base62"."0.1.1";
-  by-version."base62"."0.1.1" = self.buildNodePackage {
-    name = "base62-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
-      name = "base62-0.1.1.tgz";
-      sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."base62"."^1.1.0" =
     self.by-version."base62"."1.1.0";
   by-version."base62"."1.1.0" = self.buildNodePackage {
@@ -3169,15 +3148,15 @@
     cpu = [ ];
   };
   by-spec."big-integer"."^1.6.7" =
-    self.by-version."big-integer"."1.6.14";
-  by-version."big-integer"."1.6.14" = self.buildNodePackage {
-    name = "big-integer-1.6.14";
-    version = "1.6.14";
+    self.by-version."big-integer"."1.6.15";
+  by-version."big-integer"."1.6.15" = self.buildNodePackage {
+    name = "big-integer-1.6.15";
+    version = "1.6.15";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.14.tgz";
-      name = "big-integer-1.6.14.tgz";
-      sha1 = "8f6f03d7d6cce2917d8d5d81420f41fbaaeecd06";
+      url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz";
+      name = "big-integer-1.6.15.tgz";
+      sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e";
     };
     deps = {
     };
@@ -3870,7 +3849,7 @@
     };
     deps = {
       "passport-mailchimp-1.0.0" = self.by-version."passport-mailchimp"."1.0.0";
-      "mailchimp-1.1.5" = self.by-version."mailchimp"."1.1.5";
+      "mailchimp-1.1.6" = self.by-version."mailchimp"."1.1.6";
     };
     optionalDependencies = {
     };
@@ -5238,7 +5217,7 @@
       sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
     };
     deps = {
-      "big-integer-1.6.14" = self.by-version."big-integer"."1.6.14";
+      "big-integer-1.6.15" = self.by-version."big-integer"."1.6.15";
     };
     optionalDependencies = {
     };
@@ -5940,15 +5919,15 @@
     cpu = [ ];
   };
   by-spec."bson"."~0.4.18" =
-    self.by-version."bson"."0.4.22";
-  by-version."bson"."0.4.22" = self.buildNodePackage {
-    name = "bson-0.4.22";
-    version = "0.4.22";
+    self.by-version."bson"."0.4.23";
+  by-version."bson"."0.4.23" = self.buildNodePackage {
+    name = "bson-0.4.23";
+    version = "0.4.23";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bson/-/bson-0.4.22.tgz";
-      name = "bson-0.4.22.tgz";
-      sha1 = "3dee54807286363bdf921c22de54e8d920a052d1";
+      url = "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz";
+      name = "bson-0.4.23.tgz";
+      sha1 = "e65a2e3c7507ffade4109bc7575a76e50f8da915";
     };
     deps = {
     };
@@ -5959,11 +5938,11 @@
     cpu = [ ];
   };
   by-spec."bson"."~0.4.19" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."bson"."~0.4.20" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."bson"."~0.4.21" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."buffer"."^3.0.0" =
     self.by-version."buffer"."3.6.0";
   by-version."buffer"."3.6.0" = self.buildNodePackage {
@@ -7190,25 +7169,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."charenc"."~ 0.0.1" =
-    self.by-version."charenc"."0.0.1";
-  by-version."charenc"."0.0.1" = self.buildNodePackage {
-    name = "charenc-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz";
-      name = "charenc-0.0.1.tgz";
-      sha1 = "004cff9feaf102382ed12db58dd6f962796d6e88";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."cheerio"."0.19.0" =
     self.by-version."cheerio"."0.19.0";
   by-version."cheerio"."0.19.0" = self.buildNodePackage {
@@ -9331,7 +9291,7 @@
     };
     deps = {
       "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
-      "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
+      "mongodb-2.1.16" = self.by-version."mongodb"."2.1.16";
     };
     optionalDependencies = {
     };
@@ -10231,15 +10191,15 @@
     cpu = [ ];
   };
   by-spec."core-js"."^2.1.0" =
-    self.by-version."core-js"."2.2.1";
-  by-version."core-js"."2.2.1" = self.buildNodePackage {
-    name = "core-js-2.2.1";
-    version = "2.2.1";
+    self.by-version."core-js"."2.2.2";
+  by-version."core-js"."2.2.2" = self.buildNodePackage {
+    name = "core-js-2.2.2";
+    version = "2.2.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.1.tgz";
-      name = "core-js-2.2.1.tgz";
-      sha1 = "e809840c0650ccae87209b4b2f13ed2d2f9e4005";
+      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.2.tgz";
+      name = "core-js-2.2.2.tgz";
+      sha1 = "79a0f3a9495507641a5bf7ce275fa494649180bf";
     };
     deps = {
     };
@@ -10547,25 +10507,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."crypt"."~ 0.0.1" =
-    self.by-version."crypt"."0.0.1";
-  by-version."crypt"."0.0.1" = self.buildNodePackage {
-    name = "crypt-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz";
-      name = "crypt-0.0.1.tgz";
-      sha1 = "5f11b21a6c05ef1b5e79708366da6374ece1e6a2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."crypt3".">=0.1.5 <1.0.0-0" =
     self.by-version."crypt3"."0.2.0";
   by-version."crypt3"."0.2.0" = self.buildNodePackage {
@@ -11715,7 +11656,7 @@
   };
   by-spec."deep-extend"."~0.4.0" =
     self.by-version."deep-extend"."0.4.1";
-  by-spec."deep-is"."~0.1.2" =
+  by-spec."deep-is"."~0.1.3" =
     self.by-version."deep-is"."0.1.3";
   by-version."deep-is"."0.1.3" = self.buildNodePackage {
     name = "deep-is-0.1.3";
@@ -11734,8 +11675,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-is"."~0.1.3" =
-    self.by-version."deep-is"."0.1.3";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.10";
   by-version."deepmerge"."0.2.10" = self.buildNodePackage {
@@ -12619,7 +12558,7 @@
       "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2";
       "split2-0.2.1" = self.by-version."split2"."0.2.1";
       "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1";
-      "tar-stream-1.4.0" = self.by-version."tar-stream"."1.4.0";
+      "tar-stream-1.5.1" = self.by-version."tar-stream"."1.5.1";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
@@ -12823,15 +12762,15 @@
   by-spec."domhandler"."^2.3.0" =
     self.by-version."domhandler"."2.3.0";
   by-spec."domino"."~1.0.19" =
-    self.by-version."domino"."1.0.23";
-  by-version."domino"."1.0.23" = self.buildNodePackage {
-    name = "domino-1.0.23";
-    version = "1.0.23";
+    self.by-version."domino"."1.0.24";
+  by-version."domino"."1.0.24" = self.buildNodePackage {
+    name = "domino-1.0.24";
+    version = "1.0.24";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/domino/-/domino-1.0.23.tgz";
-      name = "domino-1.0.23.tgz";
-      sha1 = "6f251b0ba3e21a8b4bd1ecbaef01b23f963a512b";
+      url = "https://registry.npmjs.org/domino/-/domino-1.0.24.tgz";
+      name = "domino-1.0.24.tgz";
+      sha1 = "a3fab865851197f22943d3a1ec0f507e1ff008e1";
     };
     deps = {
     };
@@ -13664,6 +13603,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."enhanced-resolve"."^0.9.1" =
+    self.by-version."enhanced-resolve"."0.9.1";
+  by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage {
+    name = "enhanced-resolve-0.9.1";
+    version = "0.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
+      name = "enhanced-resolve-0.9.1.tgz";
+      sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+    };
+    deps = {
+      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
+      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."enhanced-resolve"."^2.2.0" =
     self.by-version."enhanced-resolve"."2.2.2";
   by-version."enhanced-resolve"."2.2.2" = self.buildNodePackage {
@@ -13689,26 +13650,6 @@
   };
   by-spec."enhanced-resolve"."~0.9.0" =
     self.by-version."enhanced-resolve"."0.9.1";
-  by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage {
-    name = "enhanced-resolve-0.9.1";
-    version = "0.9.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
-      name = "enhanced-resolve-0.9.1.tgz";
-      sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
-    };
-    deps = {
-      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
-      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."ent"."~2.2.0" =
     self.by-version."ent"."2.2.0";
   by-version."ent"."2.2.0" = self.buildNodePackage {
@@ -13768,27 +13709,6 @@
   };
   by-spec."entities"."~1.1.1" =
     self.by-version."entities"."1.1.1";
-  by-spec."envify"."^3.0.0" =
-    self.by-version."envify"."3.4.0";
-  by-version."envify"."3.4.0" = self.buildNodePackage {
-    name = "envify-3.4.0";
-    version = "3.4.0";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz";
-      name = "envify-3.4.0.tgz";
-      sha1 = "a0bed52222529076a02fabf6ce00eef42d7b6734";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-      "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."errno"."^0.1.1" =
     self.by-version."errno"."0.1.4";
   by-version."errno"."0.1.4" = self.buildNodePackage {
@@ -14321,31 +14241,7 @@
   };
   by-spec."escape-string-regexp"."^1.0.2" =
     self.by-version."escape-string-regexp"."1.0.5";
-  by-spec."escodegen"."1.7.x" =
-    self.by-version."escodegen"."1.7.1";
-  by-version."escodegen"."1.7.1" = self.buildNodePackage {
-    name = "escodegen-1.7.1";
-    version = "1.7.1";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz";
-      name = "escodegen-1.7.1.tgz";
-      sha1 = "30ecfcf66ca98dc67cd2fd162abeb6eafa8ce6fc";
-    };
-    deps = {
-      "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3";
-      "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
-      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
-      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
-    };
-    optionalDependencies = {
-      "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escodegen"."^1.6.1" =
+  by-spec."escodegen"."1.8.x" =
     self.by-version."escodegen"."1.8.0";
   by-version."escodegen"."1.8.0" = self.buildNodePackage {
     name = "escodegen-1.8.0";
@@ -14369,6 +14265,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."escodegen"."^1.6.1" =
+    self.by-version."escodegen"."1.8.0";
   by-spec."escodegen"."^1.8.0" =
     self.by-version."escodegen"."1.8.0";
   by-spec."escodegen"."~1.3.1" =
@@ -14440,7 +14338,7 @@
       "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
       "file-entry-cache-1.2.4" = self.by-version."file-entry-cache"."1.2.4";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "globals-9.3.0" = self.by-version."globals"."9.3.0";
+      "globals-9.4.0" = self.by-version."globals"."9.4.0";
       "ignore-3.0.14" = self.by-version."ignore"."3.0.14";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
       "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
@@ -14511,25 +14409,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."^1.2.2" =
-    self.by-version."esprima"."1.2.5";
-  by-version."esprima"."1.2.5" = self.buildNodePackage {
-    name = "esprima-1.2.5";
-    version = "1.2.5";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
-      name = "esprima-1.2.5.tgz";
-      sha1 = "0993502feaf668138325756f30f9a51feeec11e9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."esprima"."^2.5.0" =
     self.by-version."esprima"."2.7.2";
   by-spec."esprima"."^2.6.0" =
@@ -14595,25 +14474,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
-  by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-13001.1001.0-dev-harmony-fb";
-    version = "13001.1001.0-dev-harmony-fb";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."esprima-fb"."^15001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."15001.1.0-dev-harmony-fb" = self.buildNodePackage {
@@ -16072,7 +15932,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "time-stamp-1.0.0" = self.by-version."time-stamp"."1.0.0";
+      "time-stamp-1.0.1" = self.by-version."time-stamp"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -16137,25 +15997,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fast-levenshtein"."~1.0.0" =
-    self.by-version."fast-levenshtein"."1.0.7";
-  by-version."fast-levenshtein"."1.0.7" = self.buildNodePackage {
-    name = "fast-levenshtein-1.0.7";
-    version = "1.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
-      name = "fast-levenshtein-1.0.7.tgz";
-      sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."favitest"."^1.0.3" =
     self.by-version."favitest"."1.0.7";
   by-version."favitest"."1.0.7" = self.buildNodePackage {
@@ -16244,7 +16085,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fbjs"."^0.8.0-alpha.2" =
+  by-spec."fbjs"."^0.8.0" =
     self.by-version."fbjs"."0.8.0";
   by-version."fbjs"."0.8.0" = self.buildNodePackage {
     name = "fbjs-0.8.0";
@@ -17781,7 +17622,7 @@
       sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
     };
     deps = {
-      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
+      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
     };
     optionalDependencies = {
     };
@@ -17869,7 +17710,7 @@
     };
     deps = {
       "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
     };
     optionalDependencies = {
     };
@@ -18424,6 +18265,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob"."3" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob"."3 || 4" =
     self.by-version."glob"."4.5.3";
   by-version."glob"."4.5.3" = self.buildNodePackage {
@@ -18471,25 +18333,6 @@
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = self.buildNodePackage {
-    name = "glob-3.2.11";
-    version = "3.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-      name = "glob-3.2.11.tgz";
-      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob"."5.x" =
     self.by-version."glob"."5.0.15";
   by-version."glob"."5.0.15" = self.buildNodePackage {
@@ -18790,15 +18633,15 @@
     cpu = [ ];
   };
   by-spec."globals"."^9.2.0" =
-    self.by-version."globals"."9.3.0";
-  by-version."globals"."9.3.0" = self.buildNodePackage {
-    name = "globals-9.3.0";
-    version = "9.3.0";
+    self.by-version."globals"."9.4.0";
+  by-version."globals"."9.4.0" = self.buildNodePackage {
+    name = "globals-9.4.0";
+    version = "9.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/globals/-/globals-9.3.0.tgz";
-      name = "globals-9.3.0.tgz";
-      sha1 = "55a541cf8519d66055ed3c892dd7c49c1504783e";
+      url = "https://registry.npmjs.org/globals/-/globals-9.4.0.tgz";
+      name = "globals-9.4.0.tgz";
+      sha1 = "e89906bbd58b40305e5691ef934324e93325b35f";
     };
     deps = {
     };
@@ -19227,15 +19070,15 @@
     cpu = [ ];
   };
   by-spec."grunt".">=0.4.0" =
-    self.by-version."grunt"."1.0.0";
-  by-version."grunt"."1.0.0" = self.buildNodePackage {
-    name = "grunt-1.0.0";
-    version = "1.0.0";
+    self.by-version."grunt"."1.0.1";
+  by-version."grunt"."1.0.1" = self.buildNodePackage {
+    name = "grunt-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/grunt/-/grunt-1.0.0.tgz";
-      name = "grunt-1.0.0.tgz";
-      sha1 = "5fea0f9f40afe65ca1ca61e40031891d325d4b43";
+      url = "https://registry.npmjs.org/grunt/-/grunt-1.0.1.tgz";
+      name = "grunt-1.0.1.tgz";
+      sha1 = "e8778764e944b18f32bb0f10b9078475c9dfb56b";
     };
     deps = {
       "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
@@ -19262,7 +19105,7 @@
     cpu = [ ];
   };
   by-spec."grunt".">=0.4.x" =
-    self.by-version."grunt"."1.0.0";
+    self.by-version."grunt"."1.0.1";
   by-spec."grunt"."~0.4" =
     self.by-version."grunt"."0.4.5";
   by-version."grunt"."0.4.5" = self.buildNodePackage {
@@ -19326,7 +19169,7 @@
     cpu = [ ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."1.2.0";
-  by-spec."grunt-cli"."1.2.0" =
+  by-spec."grunt-cli"."~1.2.0" =
     self.by-version."grunt-cli"."1.2.0";
   by-spec."grunt-contrib-cssmin"."*" =
     self.by-version."grunt-contrib-cssmin"."1.0.1";
@@ -19368,7 +19211,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"];
+      self.by-version."grunt"."1.0.1"];
     os = [ ];
     cpu = [ ];
   };
@@ -19392,7 +19235,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"];
+      self.by-version."grunt"."1.0.1"];
     os = [ ];
     cpu = [ ];
   };
@@ -19484,7 +19327,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"
+      self.by-version."grunt"."1.0.1"
       self.by-version."karma"."0.13.22"];
     os = [ ];
     cpu = [ ];
@@ -19973,15 +19816,15 @@
   by-spec."har-validator"."~2.0.6" =
     self.by-version."har-validator"."2.0.6";
   by-spec."harmony-reflect"."^1.4.2" =
-    self.by-version."harmony-reflect"."1.4.4";
-  by-version."harmony-reflect"."1.4.4" = self.buildNodePackage {
-    name = "harmony-reflect-1.4.4";
-    version = "1.4.4";
+    self.by-version."harmony-reflect"."1.4.5";
+  by-version."harmony-reflect"."1.4.5" = self.buildNodePackage {
+    name = "harmony-reflect-1.4.5";
+    version = "1.4.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.4.tgz";
-      name = "harmony-reflect-1.4.4.tgz";
-      sha1 = "7abb109183ba577f4b14f8574e98c8b38f97f9ad";
+      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.5.tgz";
+      name = "harmony-reflect-1.4.5.tgz";
+      sha1 = "a762be580997f2958e8dc61169a056b269e53bdc";
     };
     deps = {
     };
@@ -22185,8 +22028,6 @@
   };
   by-spec."ip"."^0.3.0" =
     self.by-version."ip"."0.3.3";
-  by-spec."ip"."^0.3.2" =
-    self.by-version."ip"."0.3.3";
   by-spec."ip"."^1.0.1" =
     self.by-version."ip"."1.1.2";
   by-version."ip"."1.1.2" = self.buildNodePackage {
@@ -22206,6 +22047,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ip"."^1.1.2" =
+    self.by-version."ip"."1.1.2";
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
@@ -22343,7 +22186,7 @@
       "winston-2.2.0" = self.by-version."winston"."2.2.0";
       "nconf-0.8.4" = self.by-version."nconf"."0.8.4";
       "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
-      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
+      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
       "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
       "jade-1.11.0" = self.by-version."jade"."1.11.0";
       "passport-0.3.2" = self.by-version."passport"."0.3.2";
@@ -22443,25 +22286,6 @@
   };
   by-spec."is-buffer"."^1.1.0" =
     self.by-version."is-buffer"."1.1.3";
-  by-spec."is-buffer"."~ 1.0.2" =
-    self.by-version."is-buffer"."1.0.2";
-  by-version."is-buffer"."1.0.2" = self.buildNodePackage {
-    name = "is-buffer-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz";
-      name = "is-buffer-1.0.2.tgz";
-      sha1 = "f5c6c051d73f86f11b4ee14267cc1029fce261d0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."is-builtin-module"."^1.0.0" =
     self.by-version."is-builtin-module"."1.0.0";
   by-version."is-builtin-module"."1.0.0" = self.buildNodePackage {
@@ -23151,7 +22975,7 @@
       sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
     };
     deps = {
-      "node-fetch-1.4.1" = self.by-version."node-fetch"."1.4.1";
+      "node-fetch-1.5.0" = self.by-version."node-fetch"."1.5.0";
       "whatwg-fetch-0.11.0" = self.by-version."whatwg-fetch"."0.11.0";
     };
     optionalDependencies = {
@@ -23212,20 +23036,20 @@
   };
   "istanbul" = self.by-version."istanbul"."1.0.0-alpha.2";
   by-spec."istanbul"."^0.4.0" =
-    self.by-version."istanbul"."0.4.2";
-  by-version."istanbul"."0.4.2" = self.buildNodePackage {
-    name = "istanbul-0.4.2";
-    version = "0.4.2";
+    self.by-version."istanbul"."0.4.3";
+  by-version."istanbul"."0.4.3" = self.buildNodePackage {
+    name = "istanbul-0.4.3";
+    version = "0.4.3";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.2.tgz";
-      name = "istanbul-0.4.2.tgz";
-      sha1 = "765e728b9455beddb6daa7b9cec4b9c3c3ede487";
+      url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz";
+      name = "istanbul-0.4.3.tgz";
+      sha1 = "5b714ee0ae493ac5ef204b99f3872bceef73d53a";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
       "async-1.5.2" = self.by-version."async"."1.5.2";
-      "escodegen-1.7.1" = self.by-version."escodegen"."1.7.1";
+      "escodegen-1.8.0" = self.by-version."escodegen"."1.8.0";
       "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
       "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
       "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5";
@@ -24350,28 +24174,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jstransform"."^10.0.1" =
-    self.by-version."jstransform"."10.1.0";
-  by-version."jstransform"."10.1.0" = self.buildNodePackage {
-    name = "jstransform-10.1.0";
-    version = "10.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
-      name = "jstransform-10.1.0.tgz";
-      sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
-    };
-    deps = {
-      "base62-0.1.1" = self.by-version."base62"."0.1.1";
-      "esprima-fb-13001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
-      "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."jstransform"."^11.0.0" =
     self.by-version."jstransform"."11.0.3";
   by-version."jstransform"."11.0.3" = self.buildNodePackage {
@@ -24642,7 +24444,7 @@
       "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
       "colors-1.1.2" = self.by-version."colors"."1.1.2";
       "connect-3.4.1" = self.by-version."connect"."3.4.1";
-      "core-js-2.2.1" = self.by-version."core-js"."2.2.1";
+      "core-js-2.2.2" = self.by-version."core-js"."2.2.2";
       "di-0.0.1" = self.by-version."di"."0.0.1";
       "dom-serialize-2.2.1" = self.by-version."dom-serialize"."2.2.1";
       "expand-braces-0.1.2" = self.by-version."expand-braces"."0.1.2";
@@ -24705,7 +24507,7 @@
       sha1 = "b0d58b1025d59d5c6620263186f1d58f5d5348c5";
     };
     deps = {
-      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
@@ -25542,27 +25344,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."levn"."~0.2.5" =
-    self.by-version."levn"."0.2.5";
-  by-version."levn"."0.2.5" = self.buildNodePackage {
-    name = "levn-0.2.5";
-    version = "0.2.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
-      name = "levn-0.2.5.tgz";
-      sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
-    };
-    deps = {
-      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
-      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."levn"."~0.3.0" =
     self.by-version."levn"."0.3.0";
   by-version."levn"."0.3.0" = self.buildNodePackage {
@@ -26751,7 +26532,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.keys"."~4.0.5" =
+  by-spec."lodash.keys"."~4.0.6" =
     self.by-version."lodash.keys"."4.0.6";
   by-spec."lodash.memoize"."~3.0.3" =
     self.by-version."lodash.memoize"."3.0.4";
@@ -27159,6 +26940,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."loose-envify"."^1.1.0" =
+    self.by-version."loose-envify"."1.1.0";
   by-spec."loud-rejection"."^1.0.0" =
     self.by-version."loud-rejection"."1.3.0";
   by-version."loud-rejection"."1.3.0" = self.buildNodePackage {
@@ -27550,15 +27333,15 @@
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
   by-spec."mailchimp".">=1.1.0" =
-    self.by-version."mailchimp"."1.1.5";
-  by-version."mailchimp"."1.1.5" = self.buildNodePackage {
-    name = "mailchimp-1.1.5";
-    version = "1.1.5";
+    self.by-version."mailchimp"."1.1.6";
+  by-version."mailchimp"."1.1.6" = self.buildNodePackage {
+    name = "mailchimp-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.5.tgz";
-      name = "mailchimp-1.1.5.tgz";
-      sha1 = "63d560056179301c41bb6f7cadc584944312909c";
+      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.6.tgz";
+      name = "mailchimp-1.1.6.tgz";
+      sha1 = "5aa72867e3043f173de6d1ff6965e6ed3ea55b61";
     };
     deps = {
       "request-2.70.0" = self.by-version."request"."2.70.0";
@@ -27772,28 +27555,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."md5"."~2.0.0" =
-    self.by-version."md5"."2.0.0";
-  by-version."md5"."2.0.0" = self.buildNodePackage {
-    name = "md5-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz";
-      name = "md5-2.0.0.tgz";
-      sha1 = "75e392e0ebd5a9b88dc7cb7a93875137b87c8a33";
-    };
-    deps = {
-      "charenc-0.0.1" = self.by-version."charenc"."0.0.1";
-      "crypt-0.0.1" = self.by-version."crypt"."0.0.1";
-      "is-buffer-1.0.2" = self.by-version."is-buffer"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."mdns-js"."*" =
     self.by-version."mdns-js"."0.5.0";
   by-version."mdns-js"."0.5.0" = self.buildNodePackage {
@@ -28645,6 +28406,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimatch"."0.2" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
+    name = "minimatch-0.2.14";
+    version = "0.2.14";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      name = "minimatch-0.2.14.tgz";
+      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."minimatch"."0.3" =
     self.by-version."minimatch"."0.3.0";
   by-version."minimatch"."0.3.0" = self.buildNodePackage {
@@ -28741,25 +28523,6 @@
     self.by-version."minimatch"."3.0.0";
   by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = self.buildNodePackage {
-    name = "minimatch-0.2.14";
-    version = "0.2.14";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-      name = "minimatch-0.2.14.tgz";
-      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-    };
-    deps = {
-      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
-      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimatch"."~0.2.12" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.9" =
@@ -29461,7 +29224,27 @@
     cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.2.0" =
-    self.by-version."mongodb"."2.1.14";
+    self.by-version."mongodb"."2.1.16";
+  by-version."mongodb"."2.1.16" = self.buildNodePackage {
+    name = "mongodb-2.1.16";
+    version = "2.1.16";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.16.tgz";
+      name = "mongodb-2.1.16.tgz";
+      sha1 = "8501a7465574ef4b605c46c98cd6bd57fc4968fa";
+    };
+    deps = {
+      "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2";
+      "mongodb-core-1.3.16" = self.by-version."mongodb-core"."1.3.16";
+      "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mongodb"."~2.0" =
     self.by-version."mongodb"."2.0.55";
   by-spec."mongodb-core"."1.2.19" =
@@ -29476,7 +29259,7 @@
       sha1 = "fcb35f6b6abc5c3de1f1a4a5db526b9e306f3eb7";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
     };
     optionalDependencies = {
       "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
@@ -29497,7 +29280,7 @@
       sha1 = "f1e6405f03d40846fdb838a702507affa3cb2c39";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
     };
     optionalDependencies = {
     };
@@ -29518,7 +29301,28 @@
       sha1 = "0a8e8719461ed98f36ed981ae00fa65d8b97781d";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
+      "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mongodb-core"."1.3.16" =
+    self.by-version."mongodb-core"."1.3.16";
+  by-version."mongodb-core"."1.3.16" = self.buildNodePackage {
+    name = "mongodb-core-1.3.16";
+    version = "1.3.16";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.16.tgz";
+      name = "mongodb-core-1.3.16.tgz";
+      sha1 = "6f9905bc7be0c890333a011d0313e5f0e2769a3b";
+    };
+    deps = {
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0";
     };
     optionalDependencies = {
@@ -29540,7 +29344,7 @@
     };
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
       "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
       "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
@@ -29625,7 +29429,7 @@
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
       "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
       "mongodb-2.0.46" = self.by-version."mongodb"."2.0.46";
@@ -29674,7 +29478,7 @@
       sha1 = "f63dd313c422a3871f5569e36b0d28ca1a224631";
     };
     deps = {
-      "harmony-reflect-1.4.4" = self.by-version."harmony-reflect"."1.4.4";
+      "harmony-reflect-1.4.5" = self.by-version."harmony-reflect"."1.4.5";
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
     optionalDependencies = {
@@ -31150,15 +30954,15 @@
   by-spec."node-expat"."~2.3.8" =
     self.by-version."node-expat"."2.3.13";
   by-spec."node-fetch"."^1.0.1" =
-    self.by-version."node-fetch"."1.4.1";
-  by-version."node-fetch"."1.4.1" = self.buildNodePackage {
-    name = "node-fetch-1.4.1";
-    version = "1.4.1";
+    self.by-version."node-fetch"."1.5.0";
+  by-version."node-fetch"."1.5.0" = self.buildNodePackage {
+    name = "node-fetch-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.4.1.tgz";
-      name = "node-fetch-1.4.1.tgz";
-      sha1 = "f50a3a98a586c434e9a63984c97127eb33c09145";
+      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.5.0.tgz";
+      name = "node-fetch-1.5.0.tgz";
+      sha1 = "c1b82cda9579aa57ee05b838278183c6e997f642";
     };
     deps = {
       "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
@@ -31402,26 +31206,26 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."0.6.x" =
-    self.by-version."node-pre-gyp"."0.6.25";
-  by-version."node-pre-gyp"."0.6.25" = self.buildNodePackage {
-    name = "node-pre-gyp-0.6.25";
-    version = "0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
+  by-version."node-pre-gyp"."0.6.26" = self.buildNodePackage {
+    name = "node-pre-gyp-0.6.26";
+    version = "0.6.26";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.25.tgz";
-      name = "node-pre-gyp-0.6.25.tgz";
-      sha1 = "2c6818775e6f1df5e353ba8024f1c0118726545b";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.26.tgz";
+      name = "node-pre-gyp-0.6.26.tgz";
+      sha1 = "d4fae0d69030d60e394169cdae5a4fbcad788630";
     };
     deps = {
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
       "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
       "request-2.70.0" = self.by-version."request"."2.70.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
       "tar-pack-3.1.3" = self.by-version."tar-pack"."3.1.3";
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "rc-1.1.6" = self.by-version."rc"."1.1.6";
-      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -31430,9 +31234,9 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."^0.6.25" =
-    self.by-version."node-pre-gyp"."0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
   by-spec."node-pre-gyp"."^0.6.5" =
-    self.by-version."node-pre-gyp"."0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
   by-spec."node-pre-gyp-github"."^1.1.0" =
     self.by-version."node-pre-gyp-github"."1.1.2";
   by-version."node-pre-gyp-github"."1.1.2" = self.buildNodePackage {
@@ -31457,15 +31261,15 @@
     cpu = [ ];
   };
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.2.13";
-  by-version."node-protobuf"."1.2.13" = self.buildNodePackage {
-    name = "node-protobuf-1.2.13";
-    version = "1.2.13";
+    self.by-version."node-protobuf"."1.2.14";
+  by-version."node-protobuf"."1.2.14" = self.buildNodePackage {
+    name = "node-protobuf-1.2.14";
+    version = "1.2.14";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.13.tgz";
-      name = "node-protobuf-1.2.13.tgz";
-      sha1 = "744601255c78384fbb1f2523bb3239e91df4f620";
+      url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.14.tgz";
+      name = "node-protobuf-1.2.14.tgz";
+      sha1 = "99fced0cd2e6daeba48c664f99b13d1df930d0a0";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
@@ -31477,7 +31281,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.2.13";
+  "node-protobuf" = self.by-version."node-protobuf"."1.2.14";
   by-spec."node-red"."*" =
     self.by-version."node-red"."0.13.4";
   by-version."node-red"."0.13.4" = self.buildNodePackage {
@@ -31901,7 +31705,7 @@
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
-      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
       "request-2.70.0" = self.by-version."request"."2.70.0";
@@ -32594,15 +32398,15 @@
     cpu = [ ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."3.8.6";
-  by-version."npm"."3.8.6" = self.buildNodePackage {
-    name = "npm-3.8.6";
-    version = "3.8.6";
+    self.by-version."npm"."3.8.7";
+  by-version."npm"."3.8.7" = self.buildNodePackage {
+    name = "npm-3.8.7";
+    version = "3.8.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.8.6.tgz";
-      name = "npm-3.8.6.tgz";
-      sha1 = "f9cb7b736e72c3b854895f6c054f830931ab14c6";
+      url = "https://registry.npmjs.org/npm/-/npm-3.8.7.tgz";
+      name = "npm-3.8.7.tgz";
+      sha1 = "dabc1c63f6eef1cb30e3e560966fdd9affe5a1ee";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
@@ -32659,7 +32463,7 @@
       "read-package-tree-5.1.2" = self.by-version."read-package-tree"."5.1.2";
       "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
       "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
-      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "retry-0.9.0" = self.by-version."retry"."0.9.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
@@ -32695,7 +32499,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm" = self.by-version."npm"."3.8.6";
+  "npm" = self.by-version."npm"."3.8.7";
   by-spec."npm"."^2.1.12" =
     self.by-version."npm"."2.15.3";
   by-version."npm"."2.15.3" = self.buildNodePackage {
@@ -32766,7 +32570,7 @@
       "sha-2.0.1" = self.by-version."sha"."2.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
       "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
       "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
@@ -32789,7 +32593,7 @@
   by-spec."npm"."^2.10.x" =
     self.by-version."npm"."2.15.3";
   by-spec."npm"."^3.5.1" =
-    self.by-version."npm"."3.8.6";
+    self.by-version."npm"."3.8.7";
   by-spec."npm-cache-filename"."~1.0.2" =
     self.by-version."npm-cache-filename"."1.0.2";
   by-version."npm-cache-filename"."1.0.2" = self.buildNodePackage {
@@ -32832,7 +32636,7 @@
       "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "node-alias-1.0.4" = self.by-version."node-alias"."1.0.4";
-      "npm-3.8.6" = self.by-version."npm"."3.8.6";
+      "npm-3.8.7" = self.by-version."npm"."3.8.7";
       "npmi-1.0.1" = self.by-version."npmi"."1.0.1";
       "require-dir-0.3.0" = self.by-version."require-dir"."0.3.0";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
@@ -34088,31 +33892,6 @@
     self.by-version."optimist"."0.6.1";
   by-spec."optimist"."~0.6.1" =
     self.by-version."optimist"."0.6.1";
-  by-spec."optionator"."^0.5.0" =
-    self.by-version."optionator"."0.5.0";
-  by-version."optionator"."0.5.0" = self.buildNodePackage {
-    name = "optionator-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
-      name = "optionator-0.5.0.tgz";
-      sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368";
-    };
-    deps = {
-      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
-      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
-      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
-      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
-      "levn-0.2.5" = self.by-version."levn"."0.2.5";
-      "fast-levenshtein-1.0.7" = self.by-version."fast-levenshtein"."1.0.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."optionator"."^0.8.1" =
     self.by-version."optionator"."0.8.1";
   by-version."optionator"."0.8.1" = self.buildNodePackage {
@@ -34892,7 +34671,7 @@
       "connect-busboy-0.0.2" = self.by-version."connect-busboy"."0.0.2";
       "core-js-0.8.4" = self.by-version."core-js"."0.8.4";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "domino-1.0.23" = self.by-version."domino"."1.0.23";
+      "domino-1.0.24" = self.by-version."domino"."1.0.24";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
       "express-4.13.4" = self.by-version."express"."4.13.4";
       "express-handlebars-2.0.1" = self.by-version."express-handlebars"."2.0.1";
@@ -36060,21 +35839,21 @@
     cpu = [ ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."2.1.3";
-  by-version."phantomjs"."2.1.3" = self.buildNodePackage {
-    name = "phantomjs-2.1.3";
-    version = "2.1.3";
+    self.by-version."phantomjs"."2.1.7";
+  by-version."phantomjs"."2.1.7" = self.buildNodePackage {
+    name = "phantomjs-2.1.7";
+    version = "2.1.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.3.tgz";
-      name = "phantomjs-2.1.3.tgz";
-      sha1 = "330c254837c474ec022b70fa1e9b6202309e7556";
+      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz";
+      name = "phantomjs-2.1.7.tgz";
+      sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134";
     };
     deps = {
-      "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
+      "extract-zip-1.5.0" = self.by-version."extract-zip"."1.5.0";
       "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7";
+      "hasha-2.2.0" = self.by-version."hasha"."2.2.0";
       "kew-0.7.0" = self.by-version."kew"."0.7.0";
-      "md5-2.0.0" = self.by-version."md5"."2.0.0";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
       "request-2.67.0" = self.by-version."request"."2.67.0";
       "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
@@ -36086,7 +35865,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "phantomjs" = self.by-version."phantomjs"."2.1.3";
+  "phantomjs" = self.by-version."phantomjs"."2.1.7";
   by-spec."phantomjs"."1.9.7-15" =
     self.by-version."phantomjs"."1.9.7-15";
   by-version."phantomjs"."1.9.7-15" = self.buildNodePackage {
@@ -36214,7 +35993,7 @@
     };
     deps = {
       "async-0.9.2" = self.by-version."async"."0.9.2";
-      "aws-sdk-2.3.0" = self.by-version."aws-sdk"."2.3.0";
+      "aws-sdk-2.3.2" = self.by-version."aws-sdk"."2.3.2";
       "errs-0.3.2" = self.by-version."errs"."0.3.2";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
       "fast-json-patch-0.5.6" = self.by-version."fast-json-patch"."0.5.6";
@@ -36526,7 +36305,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prelude-ls"."~1.1.0" =
+  by-spec."prelude-ls"."~1.1.2" =
     self.by-version."prelude-ls"."1.1.2";
   by-version."prelude-ls"."1.1.2" = self.buildNodePackage {
     name = "prelude-ls-1.1.2";
@@ -36545,10 +36324,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prelude-ls"."~1.1.1" =
-    self.by-version."prelude-ls"."1.1.2";
-  by-spec."prelude-ls"."~1.1.2" =
-    self.by-version."prelude-ls"."1.1.2";
   by-spec."prepend-http"."^1.0.0" =
     self.by-version."prepend-http"."1.0.3";
   by-version."prepend-http"."1.0.3" = self.buildNodePackage {
@@ -38321,19 +38096,20 @@
     cpu = [ ];
   };
   by-spec."react"."*" =
-    self.by-version."react"."15.0.0-rc.2";
-  by-version."react"."15.0.0-rc.2" = self.buildNodePackage {
-    name = "react-15.0.0-rc.2";
-    version = "15.0.0-rc.2";
+    self.by-version."react"."15.0.0";
+  by-version."react"."15.0.0" = self.buildNodePackage {
+    name = "react-15.0.0";
+    version = "15.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/react/-/react-15.0.0-rc.2.tgz";
-      name = "react-15.0.0-rc.2.tgz";
-      sha1 = "acfb768af86deb06b5bbb676778d5ec90661faa3";
+      url = "https://registry.npmjs.org/react/-/react-15.0.0.tgz";
+      name = "react-15.0.0.tgz";
+      sha1 = "3c7e16531d630e15c1a50a947f14ba61746af8a7";
     };
     deps = {
-      "envify-3.4.0" = self.by-version."envify"."3.4.0";
       "fbjs-0.8.0" = self.by-version."fbjs"."0.8.0";
+      "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -38341,7 +38117,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "react" = self.by-version."react"."15.0.0-rc.2";
+  "react" = self.by-version."react"."15.0.0";
   by-spec."react-tools"."*" =
     self.by-version."react-tools"."0.14.0-alpha3";
   by-version."react-tools"."0.14.0-alpha3" = self.buildNodePackage {
@@ -40192,6 +39968,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."request"."~2.70.0" =
+    self.by-version."request"."2.70.0";
   by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
@@ -40538,15 +40316,15 @@
     cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."2.2.3";
-  by-version."rethinkdb"."2.2.3" = self.buildNodePackage {
-    name = "rethinkdb-2.2.3";
-    version = "2.2.3";
+    self.by-version."rethinkdb"."2.3.0";
+  by-version."rethinkdb"."2.3.0" = self.buildNodePackage {
+    name = "rethinkdb-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.2.3.tgz";
-      name = "rethinkdb-2.2.3.tgz";
-      sha1 = "26036a6b1055a8dcac803828ee869e1fa84233ba";
+      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.0.tgz";
+      name = "rethinkdb-2.3.0.tgz";
+      sha1 = "101942b27954af48e93c031d040dc76b5d3475cc";
     };
     deps = {
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
@@ -40557,7 +40335,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."2.2.3";
+  "rethinkdb" = self.by-version."rethinkdb"."2.3.0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
@@ -41138,7 +40916,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."aws-sdk"."2.3.0"];
+      self.by-version."aws-sdk"."2.3.2"];
     os = [ ];
     cpu = [ ];
   };
@@ -42047,7 +41825,7 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "nan-2.0.9" = self.by-version."nan"."2.0.9";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
       "node-pre-gyp-github-1.1.2" = self.by-version."node-pre-gyp-github"."1.1.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "sf-0.1.7" = self.by-version."sf"."0.1.7";
@@ -43121,16 +42899,16 @@
     cpu = [ ];
   };
   "sloc" = self.by-version."sloc"."0.1.10";
-  by-spec."smart-buffer"."^1.0.1" =
-    self.by-version."smart-buffer"."1.0.3";
-  by-version."smart-buffer"."1.0.3" = self.buildNodePackage {
-    name = "smart-buffer-1.0.3";
-    version = "1.0.3";
+  by-spec."smart-buffer"."^1.0.4" =
+    self.by-version."smart-buffer"."1.0.4";
+  by-version."smart-buffer"."1.0.4" = self.buildNodePackage {
+    name = "smart-buffer-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.3.tgz";
-      name = "smart-buffer-1.0.3.tgz";
-      sha1 = "0968621e5e8b849da26a3ed707f044ae39edd8f5";
+      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.4.tgz";
+      name = "smart-buffer-1.0.4.tgz";
+      sha1 = "2cc20003c8be2f08082768a84cf2c684cca8a309";
     };
     deps = {
     };
@@ -43661,19 +43439,19 @@
   };
   "sockjs" = self.by-version."sockjs"."0.3.16";
   by-spec."socks"."~1.1.5" =
-    self.by-version."socks"."1.1.8";
-  by-version."socks"."1.1.8" = self.buildNodePackage {
-    name = "socks-1.1.8";
-    version = "1.1.8";
+    self.by-version."socks"."1.1.9";
+  by-version."socks"."1.1.9" = self.buildNodePackage {
+    name = "socks-1.1.9";
+    version = "1.1.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/socks/-/socks-1.1.8.tgz";
-      name = "socks-1.1.8.tgz";
-      sha1 = "dd731a23ea237680293b09a07b085a271b558d4b";
+      url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz";
+      name = "socks-1.1.9.tgz";
+      sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691";
     };
     deps = {
-      "ip-0.3.3" = self.by-version."ip"."0.3.3";
-      "smart-buffer-1.0.3" = self.by-version."smart-buffer"."1.0.3";
+      "ip-1.1.2" = self.by-version."ip"."1.1.2";
+      "smart-buffer-1.0.4" = self.by-version."smart-buffer"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -43695,7 +43473,7 @@
     deps = {
       "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "socks-1.1.8" = self.by-version."socks"."1.1.8";
+      "socks-1.1.9" = self.by-version."socks"."1.1.9";
     };
     optionalDependencies = {
     };
@@ -43840,26 +43618,6 @@
     cpu = [ ];
   };
   "source-map" = self.by-version."source-map"."0.5.3";
-  by-spec."source-map"."0.1.31" =
-    self.by-version."source-map"."0.1.31";
-  by-version."source-map"."0.1.31" = self.buildNodePackage {
-    name = "source-map-0.1.31";
-    version = "0.1.31";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-      name = "source-map-0.1.31.tgz";
-      sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
-    };
-    deps = {
-      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."source-map"."0.1.32" =
     self.by-version."source-map"."0.1.32";
   by-version."source-map"."0.1.32" = self.buildNodePackage {
@@ -44098,7 +43856,7 @@
       sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
     };
     deps = {
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44138,7 +43896,7 @@
     };
     deps = {
       "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4";
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44147,15 +43905,15 @@
     cpu = [ ];
   };
   by-spec."spdx-license-ids"."^1.0.0" =
-    self.by-version."spdx-license-ids"."1.2.0";
-  by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage {
-    name = "spdx-license-ids-1.2.0";
-    version = "1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
+  by-version."spdx-license-ids"."1.2.1" = self.buildNodePackage {
+    name = "spdx-license-ids-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz";
-      name = "spdx-license-ids-1.2.0.tgz";
-      sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2";
+      url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.1.tgz";
+      name = "spdx-license-ids-1.2.1.tgz";
+      sha1 = "d07ea17a4d2fd9351f9d94e2ff9cec74180fe8f3";
     };
     deps = {
     };
@@ -44166,9 +43924,9 @@
     cpu = [ ];
   };
   by-spec."spdx-license-ids"."^1.0.2" =
-    self.by-version."spdx-license-ids"."1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
   by-spec."spdx-license-ids"."~1.2.0" =
-    self.by-version."spdx-license-ids"."1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
   by-spec."spdy"."^1.26.5" =
     self.by-version."spdy"."1.32.5";
   by-version."spdy"."1.32.5" = self.buildNodePackage {
@@ -45847,15 +45605,15 @@
     cpu = [ ];
   };
   by-spec."tar-stream"."^1.0.0" =
-    self.by-version."tar-stream"."1.4.0";
-  by-version."tar-stream"."1.4.0" = self.buildNodePackage {
-    name = "tar-stream-1.4.0";
-    version = "1.4.0";
+    self.by-version."tar-stream"."1.5.1";
+  by-version."tar-stream"."1.5.1" = self.buildNodePackage {
+    name = "tar-stream-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.4.0.tgz";
-      name = "tar-stream-1.4.0.tgz";
-      sha1 = "19f7fbc0868b3ec283fa87df4ca906d4b16854f2";
+      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.1.tgz";
+      name = "tar-stream-1.5.1.tgz";
+      sha1 = "516c74d1bea3e131cc0b9348929c9a83f0a2ad11";
     };
     deps = {
       "bl-1.1.2" = self.by-version."bl"."1.1.2";
@@ -45943,6 +45701,31 @@
     self.by-version."temp"."0.8.3";
   by-spec."temp"."~0.8.3" =
     self.by-version."temp"."0.8.3";
+  by-spec."tern"."*" =
+    self.by-version."tern"."0.18.0";
+  by-version."tern"."0.18.0" = self.buildNodePackage {
+    name = "tern-0.18.0";
+    version = "0.18.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tern/-/tern-0.18.0.tgz";
+      name = "tern-0.18.0.tgz";
+      sha1 = "c6177fe395c8ffc9c512f0ec7452a7d9c6220fa6";
+    };
+    deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+      "enhanced-resolve-0.9.1" = self.by-version."enhanced-resolve"."0.9.1";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "typescript-1.0.1" = self.by-version."typescript"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "tern" = self.by-version."tern"."0.18.0";
   by-spec."text-encoding"."0.5.2" =
     self.by-version."text-encoding"."0.5.2";
   by-version."text-encoding"."0.5.2" = self.buildNodePackage {
@@ -46309,15 +46092,15 @@
     cpu = [ ];
   };
   by-spec."time-stamp"."^1.0.0" =
-    self.by-version."time-stamp"."1.0.0";
-  by-version."time-stamp"."1.0.0" = self.buildNodePackage {
-    name = "time-stamp-1.0.0";
-    version = "1.0.0";
+    self.by-version."time-stamp"."1.0.1";
+  by-version."time-stamp"."1.0.1" = self.buildNodePackage {
+    name = "time-stamp-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz";
-      name = "time-stamp-1.0.0.tgz";
-      sha1 = "56b152e07ec2442c23d9ea690944076f38c535a1";
+      url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz";
+      name = "time-stamp-1.0.1.tgz";
+      sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151";
     };
     deps = {
     };
@@ -47136,7 +46919,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-check"."~0.3.1" =
+  by-spec."type-check"."~0.3.2" =
     self.by-version."type-check"."0.3.2";
   by-version."type-check"."0.3.2" = self.buildNodePackage {
     name = "type-check-0.3.2";
@@ -47156,8 +46939,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-check"."~0.3.2" =
-    self.by-version."type-check"."0.3.2";
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = self.buildNodePackage {
@@ -47323,15 +47104,35 @@
     cpu = [ ];
   };
   by-spec."typescript"."*" =
-    self.by-version."typescript"."1.9.0-dev.20160405";
-  by-version."typescript"."1.9.0-dev.20160405" = self.buildNodePackage {
-    name = "typescript-1.9.0-dev.20160405";
-    version = "1.9.0-dev.20160405";
+    self.by-version."typescript"."1.9.0-dev.20160408";
+  by-version."typescript"."1.9.0-dev.20160408" = self.buildNodePackage {
+    name = "typescript-1.9.0-dev.20160408";
+    version = "1.9.0-dev.20160408";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160408.tgz";
+      name = "typescript-1.9.0-dev.20160408.tgz";
+      sha1 = "0fab58c2fa44bd7562c9b410a495b29acfce4689";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "typescript" = self.by-version."typescript"."1.9.0-dev.20160408";
+  by-spec."typescript"."=1.0.1" =
+    self.by-version."typescript"."1.0.1";
+  by-version."typescript"."1.0.1" = self.buildNodePackage {
+    name = "typescript-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160405.tgz";
-      name = "typescript-1.9.0-dev.20160405.tgz";
-      sha1 = "72db1600a5b884c528cc389ecb15b6d3cbfd35c5";
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz";
+      name = "typescript-1.0.1.tgz";
+      sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a";
     };
     deps = {
     };
@@ -47341,7 +47142,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "typescript" = self.by-version."typescript"."1.9.0-dev.20160405";
   by-spec."typewise"."^1.0.3" =
     self.by-version."typewise"."1.0.3";
   by-version."typewise"."1.0.3" = self.buildNodePackage {
@@ -48744,7 +48544,7 @@
     };
     deps = {
       "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
     };
     optionalDependencies = {
     };
@@ -48764,7 +48564,7 @@
       sha1 = "e85bbcd71a94a827ca42a33f63f7d01f54f1c24d";
     };
     deps = {
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
       "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
@@ -50719,7 +50519,7 @@
     };
     deps = {
       "sax-1.2.1" = self.by-version."sax"."1.2.1";
-      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
+      "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2";
     };
     optionalDependencies = {
     };
@@ -50761,7 +50561,7 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
+      "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2";
     };
     optionalDependencies = {
     };
@@ -50899,15 +50699,15 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=1.0.0" =
-    self.by-version."xmlbuilder"."8.2.0";
-  by-version."xmlbuilder"."8.2.0" = self.buildNodePackage {
-    name = "xmlbuilder-8.2.0";
-    version = "8.2.0";
+    self.by-version."xmlbuilder"."8.2.2";
+  by-version."xmlbuilder"."8.2.2" = self.buildNodePackage {
+    name = "xmlbuilder-8.2.2";
+    version = "8.2.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.0.tgz";
-      name = "xmlbuilder-8.2.0.tgz";
-      sha1 = "abf6e49feedd3296676b69c2de37c364dde1e263";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz";
+      name = "xmlbuilder-8.2.2.tgz";
+      sha1 = "69248673410b4ba42e1a6136551d2922335aa773";
     };
     deps = {
     };
@@ -50918,7 +50718,7 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=2.4.6" =
-    self.by-version."xmlbuilder"."8.2.0";
+    self.by-version."xmlbuilder"."8.2.2";
   by-spec."xmlbuilder"."^4.1.0" =
     self.by-version."xmlbuilder"."4.2.1";
   by-version."xmlbuilder"."4.2.1" = self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 1b05c05c56331..ceb41e2e1ef20 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -124,9 +124,9 @@
 , "node-red"
 , "node-stringprep"
 , "node-uuid"
-, "node-xmpp"
 , "node-xmpp-client"
 , "node-xmpp-component"
+, "node-xmpp-core"
 , "node-xmpp-joap"
 , "node-xmpp-server"
 , "node-xmpp-serviceadmin"
@@ -166,6 +166,7 @@
 , "stylus"
 , "tar"
 , "temp"
+, "tern"
 , "timezone"
 , "titanium"
 , "typescript"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 655592315dc2b..5a02c0246e6c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3109,11 +3109,11 @@ in modules // {
   };
 
   click = buildPythonPackage rec {
-    name = "click-6.3";
+    name = "click-6.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "076cr1xbhfyfrzkvflz1i0950jgjn2161hp3f5xji4z1mgxdj85p";
+      sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
     };
 
     buildInputs = with self; [ pytest ];