Merge branch 'master' into staging

author: Vladimír Čunát <vcunat@gmail.com> 2017-03-07 21:59:32 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2017-03-07 21:59:32 +0100
commit: b86b7c04a30856e15391df1f5e7c901ae350fe78 (patch)
tree: 953fe308c0e11eed87d383c83b10e3c9cfd03989 /pkgs
parent: 9eb2f4cb9ea7afb8f5c623bf0d4d0e22b8e8afec (diff)
parent: ac0021ce53d2f9d8b26aa5374ccac1cc3e4b270d (diff)
249 files changed, 6216 insertions, 3452 deletions
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index 10bf5860834eb..fc70302ab3c10 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -1,4 +1,4 @@
-{ stdenv , fetchurl
+{ stdenv , fetchFromGitHub
 , pkgconfig, autoreconfHook
 , db5, openssl, boost, zlib, miniupnpc
 , glib, protobuf, utillinux, qt4, qrencode
@@ -6,28 +6,21 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-
   name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.8.2";
+  version = "1.10.0";
 
-  src = fetchurl {
-    url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
-    sha256 = "17jxsxsrsz3qy2hxdpw78vcbnnd0nq614iy42ypzhw4pdpz0s1l7";
+  src = fetchFromGitHub {
+    owner = "dogecoin";
+    repo = "dogecoin";
+    rev = "v${version}";
+    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvyt chec";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig openssl
-                  db5 openssl utillinux protobuf boost zlib miniupnpc ]
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db5 openssl utillinux 
+                  protobuf boost zlib miniupnpc ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  # BSD DB5 location
-  patchPhase = ''
-    sed -i \
-      -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db5}/include",g' \
-      -e 's,BDB_LIBS=$,BDB_LIBS="-L${db5}/lib",g' \
-      -e 's,bdbdirlist=$,bdbdirlist="${db5}/include",g' \
-      src/m4/dogecoin_find_bdb51.m4
-  '';
-
   configureFlags = [ "--with-incompatible-bdb"
                      "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui" ];
@@ -43,6 +36,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.dogecoin.com/;
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo offline AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 900d6759e4a6d..7f62d53af9efc 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     description = "A music composition and modular synthesis application";
     homepage = http://beast.gtk.org;
     license = with licenses; [ gpl2 lgpl21 ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 862f526369515..0241e38281b77 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "bs1770gain-${version}";
-  version = "0.4.7";
+  version = "0.4.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
-    sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz";
+    sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a";
   };
 
   buildInputs = [ ffmpeg sox ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A audio/video loudness scanner implementing ITU-R BS.1770";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = "http://bs1770gain.sourceforge.net/";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index 04cc8008ea896..fd7f0c2b07c20 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.5.1";
+  version = "1.3.5.2";
   name = "chuck-${version}";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
-    sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi";
+    sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079";
   };
 
   buildInputs = [ bison flex libsndfile which ]
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
     install -Dm755 ./src/chuck $out/bin/chuck
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language for real-time sound synthesis and music creation";
     homepage = http://chuck.cs.princeton.edu;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ ftrvxmtrx ];
   };
 }
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index a6ba9eab48c18..e9186cd3242cc 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "easytag-${version}";
   majorVersion = "2.4";
-  version = "${majorVersion}.1";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz";
-    sha256 = "1mbpwp3lh6yz5xkaq3a329x4r3chmjsr83r349crhi1gax3mzvxr";
+    sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
   };
 
   preFixup = ''
@@ -21,17 +21,17 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lid3tag -lz";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
   buildInputs = [
-    pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
+    gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
     itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "View and edit tags for various audio files";
     homepage = "http://projects.gnome.org/easytag/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch
new file mode 100644
index 0000000000000..8873aa77b0e69
--- /dev/null
+++ b/pkgs/applications/audio/eflite/buf-overflow.patch
@@ -0,0 +1,22 @@
+Fix buffer overflow
+
+--- eflite-0.4.1.orig/es.c
++++ eflite-0.4.1/es.c
+@@ -329,7 +329,7 @@
+   char *p;
+ 
+   p = getenv("HOME");
+-  sprintf(buf, "%s/.es.conf", p);
++  snprintf(buf, sizeof(buf), "%s/.es.conf", p);
+   fp = fopen(buf, "r");
+   if (!fp) fp = fopen("/etc/es.conf", "r");
+   if (!fp) return 1;
+@@ -438,7 +438,7 @@
+   char logname[200];
+ 
+   if ((flags & 0xffff) > DEBUG) return;
+-  sprintf(logname, "%s/es.log", getenv("HOME"));
++  snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME"));
+   va_start(arg, text);
+   vsnprintf(buf, 200, text, arg);
+   va_end(arg);
diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch
new file mode 100644
index 0000000000000..1ceace83aa5dc
--- /dev/null
+++ b/pkgs/applications/audio/eflite/cvs-update.patch
@@ -0,0 +1,98 @@
+--- eflite-0.4.1.orig/fs.c
++++ eflite-0.4.1/fs.c
+@@ -9,7 +9,7 @@
+  * GNU General Public License, as published by the Free Software
+  * Foundation.  Please see the file COPYING for details.
+  *
+- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $
++ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $
+  *
+  * Notes:
+  *
+@@ -505,19 +505,6 @@
+   }
+ }
+ 
+-
+-
+-static void play_audio_close(void *cancel)
+-{
+-  if (audiodev)
+-  {
+-	audio_drain(audiodev);
+-	close_audiodev();
+-	//	usleep(5000);
+-  }
+-}
+-
+-
+ static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s)
+ {
+   int playlen, skip;
+@@ -573,12 +560,12 @@
+ 	type = ac[ac_head].type;
+ 	WAVE_UNLOCK;
+ 	pthread_testcancel();
+-	pthread_cleanup_push(play_audio_close, NULL);
+-
++	
+ 	es_log(2, "Opening audio device.");
+ 	/* We abuse the wave mutex here to avoid being canceled
+ 	 * while the audio device is being openned */
+ 	WAVE_LOCK;
++	assert(audiodev == NULL);
+ 	audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16);
+ 	WAVE_UNLOCK;
+ 	if (audiodev == NULL)
+@@ -606,8 +593,8 @@
+ #ifdef DEBUG
+ 	  start_time = get_ticks_count();
+ #endif
+-	  pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+       audio_write(audiodev, wptr->samples + skip, playlen * 2);
++      pthread_testcancel();
+ 	  es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time);
+ 	}
+     es_log(2, "play: syncing.");
+@@ -617,16 +604,16 @@
+     audio_flush(audiodev);
+ 	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+ 	es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time);
+-    es_log(2, "play: Closing audio device");
+-	close_audiodev();
+-	pthread_cleanup_pop(0);
+-	  pthread_testcancel();
+-	  TEXT_LOCK;
++    	pthread_testcancel();
++
++	TEXT_LOCK;
+     time_left -= ((float)playlen) / wptr->sample_rate;
+ 	pthread_cond_signal(&text_condition);
+ 	TEXT_UNLOCK;
+ 
+ 	WAVE_LOCK;
++	es_log(2, "play: Closing audio device");
++	close_audiodev();
+     ac_destroy(&ac[ac_head]);
+ 	ac_head++;
+ 	if (ac_head == ac_tail)
+@@ -894,6 +881,7 @@
+ 	WAVE_LOCK_NI;
+ 	pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting
+ 	pthread_cancel(wave_thread);
++	if (audiodev != NULL) audio_drain(audiodev);
+ 	WAVE_UNLOCK_NI;
+   }
+ 
+@@ -917,7 +905,10 @@
+   }
+ 	
+   /* At this point, no thread is running */
+-  
++
++  // Make sure audio device is closed
++  close_audiodev();
++
+   /* Free any wave data */
+   es_log(2, "s_clear: freeing wave data: %d", ac_tail);
+   for (i = 0; i < ac_tail; i++)
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
new file mode 100644
index 0000000000000..36fbdbc2cc9e1
--- /dev/null
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -0,0 +1,32 @@
+{stdenv,fetchurl,flite,alsaLib,debug ? false}:
+
+stdenv.mkDerivation rec {
+  name = "eflite-${version}";
+  version = "0.4.1";
+  src = fetchurl {
+    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+    sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
+  };
+  buildInputs = [ flite alsaLib ];
+  configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16";
+  patches = [
+    ./buf-overflow.patch
+    ./cvs-update.patch
+    ./link.patch
+    ./format.patch
+  ]; # Patches are taken from debian.
+  CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2";
+  meta = {
+    homepage = http://eflite.sourceforge.net;
+    description = "EFlite is a speech server for screen readers";
+    longDescription = ''
+      EFlite is a speech server for Emacspeak and other screen
+      readers that allows them to interface with Festival Lite,
+      a free text-to-speech engine developed at the CMU Speech
+      Center as an off-shoot of Festival.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/applications/audio/eflite/format.patch
new file mode 100644
index 0000000000000..d1a81aac48012
--- /dev/null
+++ b/pkgs/applications/audio/eflite/format.patch
@@ -0,0 +1,11 @@
+--- eflite-0.4.1.orig/es.c	2017-03-02 14:38:36.009731423 +0100
++++ eflite-0.4.1/es.c	2017-03-02 14:39:06.285894934 +0100
+@@ -449,7 +449,7 @@
+   fclose(fp);
+   if (flags & LOG_STDERR)
+   {
+-    fprintf(stderr, buf);
++    fprintf(stderr, "%s", buf);
+     fprintf(stderr, "\n");
+   }
+ #endif
diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch
new file mode 100644
index 0000000000000..73c69da965c30
--- /dev/null
+++ b/pkgs/applications/audio/eflite/link.patch
@@ -0,0 +1,11 @@
+--- eflite-0.4.1/Makefile.in	2007-01-19 01:01:09.000000000 +0100
++++ eflite-0.4.1-new/Makefile.in	2017-03-01 23:25:34.223615492 +0100
+@@ -34,7 +34,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
+ 
+ fs.o: fs.c
+-	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
++	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
+ 
+ tone.o: tone.c
+ 	$(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 0f81fb451660c..ab28c43f66cf9 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -1,30 +1,34 @@
 { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
 , shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
+, gtk3
 }:
 
 stdenv.mkDerivation rec {
   name = "flacon-${version}";
-  version = "2.0.1";
+  version = "2.1.1";
+
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
     rev = "v${version}";
-    sha256 = "0hip411k3arb96rnd22ifs9shlv0xmy96hhx1jcwdk48kw8aa9rw";
+    sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz";
   };
 
-  buildInputs = [ cmake qt5.qtbase qt5.qttools libuchardet pkgconfig makeWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  buildInputs = [ qt5.qtbase qt5.qttools libuchardet ];
 
   postInstall = ''
     wrapProgram $out/bin/flacon \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
       --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
-      mp3gain lame wavpack vorbisgain ]}"
+     mp3gain lame wavpack vorbisgain ]}"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Extracts audio tracks from an audio CD image to separate tracks.";
     homepage = https://flacon.github.io/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ndowens nico202 ];
   };
 }
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 9df6abf169797..bb4df5ea1db50 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,16 +11,17 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.1.8";
+  version = "1.1.11";
 
   src = fetchFromGitHub {
-    sha256 = "14vx4p1h3c6frvv8dam4ymz588zpycmg17pxfkmx4m7pszhlin6b";
+    sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw qtbase qtmultimedia qmakeHook ]
+  nativeBuildInputs = [ qmakeHook ];
+  buildInputs = [ fftw qtbase qtmultimedia ]
     ++ optionals alsaSupport [ alsaLib ]
     ++ optionals jackSupport [ libjack2 ]
     ++ optionals portaudioSupport [ portaudio ];
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index a5e29a5e1747e..642cbbd23f626 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python2
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
-, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
+, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
+, wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
-    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
-    libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
+    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf
+    libsndfile lilv lv2 serd sord sratom zita-convolver
     zita-resampler
   ];
 
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
     "--no-desktop-update"
     "--enable-nls"
     "--no-faust" # todo: find out why --faust doesn't work
+    "--install-roboto-font"
+    "--includeresampler"
+    "--convolver-ffmpeg"
   ] ++ optional optimizationSupport "--optimization";
 
   configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 21767e3079f25..686a6b67e6aad 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, glib, libjack2, libarchive
+{ stdenv, fetchurl, alsaLib, boost, cmake, glib, lash, libjack2, libarchive
 , liblrdf, libsndfile, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.6.1";
+  version = "0.9.7";
   name = "hydrogen-${version}";
 
   src = fetchurl {
     url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
-    sha256 = "0vxnaqfmcv7hhk0cj67imdcqngspnck7f0wfmvhfgfqa7x1xznll";
+    sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
   };
 
-  buildInputs = [ 
-    alsaLib boost cmake glib libjack2 libarchive liblrdf libsndfile pkgconfig qt4
+  buildInputs = [
+    alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 12d9679f97cdb..d7cc88905c535 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper
-    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper
+    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker
   '';
 
   buildPhase = ''
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0f6bd45df276d..ef10bfed9b66d 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "133sx42wb66g803pcrgdwph40wh94knvab3yfqkgm0001jv4v14y";
+    sha256 = "10s1i18xlmvqfrnr0zn2mj2b28i7p62dlqzzzkmpaapqj1gsgpz5";
   };
 
   buildInputs = [
@@ -20,9 +20,13 @@ stdenv.mkDerivation  rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  patchPhase = ''
+    sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp
+  '';
+
   preConfigure = "cd src";
 
-  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ];
+  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
 
   meta = with stdenv.lib; {
     description = "High quality software synthesizer based on ZynAddSubFX";
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d9d731f3835f3..9271579346aa0 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, libXtst, jdk
+, glib, gtk2, libXtst, jdk
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
@@ -10,7 +10,10 @@ assert stdenv ? glibc;
 
 rec {
 
-  buildEclipse = callPackage ./build-eclipse.nix { };
+  buildEclipse = import ./build-eclipse.nix {
+    inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
+            jdk glib gtk2 libXtst webkitgtk2 makeWrapper;
+  };
 
   ### Eclipse CPP
 
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 5e736392fd298..834d3056e7424 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1956,10 +1956,10 @@
     validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
     elpaBuild {
         pname = "validate";
-        version = "1.0.2";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/validate-1.0.2.el";
-          sha256 = "19xhd9mxkdcisspz5q3bnvf6jjsvmhjjrpw3pq5lgyqbcz8k8dsr";
+          url = "https://elpa.gnu.org/packages/validate-1.0.4.el";
+          sha256 = "0vksssk98hcnz804g62k8kika13argf6p7bx8rf9hwidvzdsv6mi";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index daaf1f618916a..92159833e9c48 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170209.2128";
+        version = "20170304.704";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1299,12 +1299,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20161201.1001";
+        version = "20170215.348";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "8324b88d54970059b0f8dd4695e38db6223d39f7";
-          sha256 = "18jw8y2d9xjcacgv9k32579khjlg9mha23sia7m12paamjpjbm9p";
+          rev = "5959b48e94493738ead6fc91f18e70155962ffba";
+          sha256 = "06kk8j7yq60cir4llgqdsyj4d94261danyw36idqx9papa4da3id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -2273,8 +2273,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "4e7e13bedb3900ff8f8843bd3111c17a9381ce7b";
-          sha256 = "0brk9218racdkbmqdqslmpwiynch89c9j0lk0w5xix9s03gqsg6q";
+          rev = "6f062a3bd00f7af651a21532d43900c22523e596";
+          sha256 = "1vhf8qnknxvxkk44yyhp04kfmf0vrf41ycpgrj7p7la3k1anyvg6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2407,6 +2407,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apiwrap";
+        version = "20170302.1825";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "apiwrap.el";
+          rev = "2a14eab0c66b7c8ae4c8767ebcca1a82e325773c";
+          sha256 = "1rxkzcl1clp794c017d19dpm085njmz7hlvn3sqgsw06wkczd0pl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
+          sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
+          name = "apiwrap";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/apiwrap";
+          license = lib.licenses.free;
+        };
+      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -3593,12 +3614,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20160930.1113";
+        version = "20170303.1213";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "067c29cd6088c019578df8530356c126eef9ea2c";
-          sha256 = "0iqcl1y1lnfma95lhdyy1zkkn8xlp2hin2wb0gbmkcrlfy0cw364";
+          rev = "62a1bbf904d075e7786fe1de2df86c5088a4be2d";
+          sha256 = "156wbir32fvkwfvamp5yfw9gkz8j0cs2shgx406mhv7prcr6cnhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -4260,22 +4281,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    basic-c-compile = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "basic-c-compile";
-        version = "20161114.2134";
+        version = "20170302.312";
         src = fetchFromGitHub {
           owner = "nick96";
           repo = "basic-c-compile";
-          rev = "ccdbb2fcb605e285ca39c1781ab1e583e90f7558";
-          sha256 = "03hsg0n2hvsqiziblpjal9saiyhcizldn9bkpk3cqh2bipg1fjys";
+          rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23";
+          sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile";
           sha256 = "07p35wg426ap0awgk4vg5n36s5jbfs3fi5djl8jq93jr6xs9imbc";
           name = "basic-c-compile";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib f ];
         meta = {
           homepage = "https://melpa.org/#/basic-c-compile";
           license = lib.licenses.free;
@@ -5236,6 +5257,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, s, simple-httpd }:
+    melpaBuild {
+        pname = "blog-minimal";
+        version = "20170304.1548";
+        src = fetchFromGitHub {
+          owner = "thiefuniverse";
+          repo = "blog-minimal";
+          rev = "a3454f1358a8add2969f221c4e56d3bc17ee4baa";
+          sha256 = "0g7n9g4hnaar5basv26c1p00kdkn3vsbsxzby2bi1590grkgjycq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal";
+          sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff";
+          name = "blog-minimal";
+        };
+        packageRequires = [ ht mustache s simple-httpd ];
+        meta = {
+          homepage = "https://melpa.org/#/blog-minimal";
+          license = lib.licenses.free;
+        };
+      }) {};
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
@@ -5593,12 +5635,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20161207.2252";
+        version = "20170302.2236";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "396f6ca23e3a6d12cd3af4651d8130a5baf10e2b";
-          sha256 = "0d4lhaqwralv790ry6g84q0nk243dkaybf1nynr8kp0njhdif6k1";
+          rev = "6de3e242e7b11ee2cb942547ac01823fada52605";
+          sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -6741,8 +6783,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6783,8 +6825,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6970,8 +7012,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "4a880501207d066a865f929b605bf113753ffd62";
-          sha256 = "1h4db9g4ph6v6fz02hmby823rfr57rxafxynlhlwf4cfmimmdfcj";
+          rev = "5d48e64b00bd6d9ceef9f80ce27be6b8df76415d";
+          sha256 = "0zzk009qjdc92svann593l7w3qajna29nv92qwsp4hav9zjgq07w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7010,7 +7052,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12019";
+          rev = "12036";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7591,12 +7633,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170228.2202";
+        version = "20170306.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "5d32b960739162b75c044be0175b9564e7b8293e";
-          sha256 = "0mih9dqk6ydqksa5jgjjcqiz6gnrwzp024mda0csibdf9snxb4a8";
+          rev = "52e69c102f2e6438196e223483a388115809bbc1";
+          sha256 = "0cr9clqni9yy5kxspy9nn9llzpqaa3x1d5q4fnlg7qncv6jyfyqb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7780,12 +7822,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170225.344";
+        version = "20170304.419";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "9d68903018f255838b51c734015be74bbdbf539c";
+          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7867,7 +7909,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "296613";
+          rev = "297038";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8253,12 +8295,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170225.2308";
+        version = "20170303.2310";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
-          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
+          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
+          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8274,12 +8316,12 @@
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "20160307.414";
+        version = "20170303.2310";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
-          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
+          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
+          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8509,8 +8551,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "e9cfe63dfca48688064b56777508ab20c5f2aed4";
-          sha256 = "180npd4nb2qc2bp1xk0qqpvqm4glskf3xczlmhh8wb03dpn5fzsi";
+          rev = "add3b1ee4f798fe667b53a521eb18a623e64f0e0";
+          sha256 = "0k0przix6iyfqc9flphsgbzbz09r2lbmw45667zbimpd91k4a29f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8632,8 +8674,8 @@
         src = fetchFromGitHub {
           owner = "CoatiSoftware";
           repo = "emacs-coati";
-          rev = "c5943d556ab44949b8d4cf295e7c4e8a665bb18a";
-          sha256 = "15vks08bnrz3q2z5f7h69l8fka7k5p3r03ciah9nh3c11d3ldw36";
+          rev = "f06eee92cb43b0dfd6dcf758ae05ac021a184f1c";
+          sha256 = "1l36pjapcsgc6sph6scgpc4zl5qfwf17ppyjznchkh4ykj13ghj3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati";
@@ -9449,12 +9491,12 @@
     company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }:
     melpaBuild {
         pname = "company-dcd";
-        version = "20161020.430";
+        version = "20161114.2306";
         src = fetchFromGitHub {
           owner = "tsukimizake";
           repo = "company-dcd";
-          rev = "24c5c56efee1e850ae851a87e8345313a2388ef4";
-          sha256 = "1mcr6rbmkk5yh1icgfhq1qfcvpmrwimqcp7f8k8dmyk99lpkmx6f";
+          rev = "4161374fd0da40bbebb6f6e01f1589625708d8ef";
+          sha256 = "0pi0363s8ww6xz7drgxi195jcanvmx1g4wv4zrpdl9dx8cf166bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd";
@@ -9544,8 +9586,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9687,12 +9729,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20161006.1616";
+        version = "20170303.909";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
-          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
+          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
+          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9897,12 +9939,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170214.45";
+        version = "20170306.659";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10218,12 +10260,12 @@
     composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
     melpaBuild {
         pname = "composer";
-        version = "20170127.1745";
+        version = "20170304.1647";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "00b00cc48dec28ef4f993ad7044cd79f44b4cbd6";
-          sha256 = "16vv7s3g4in3zl5yl2iqgcmfmay64gk6z8mc7pb199alk7m0dlyq";
+          rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
+          sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -10427,12 +10469,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20170208.1921";
+        version = "20170303.1916";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "22239b22b63393222143857825098b03c53a1044";
-          sha256 = "1r4f04ca4w60qqrc5s7ic69ah3z63ygc1xagxqbp85wavq7vk8rc";
+          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
+          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10536,8 +10578,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10595,12 +10637,12 @@
     counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-gtags";
-        version = "20170223.509";
+        version = "20170305.600";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "2e9dd1ab3127819c6950a0bfd90c7c9894e37512";
-          sha256 = "0896m45nmjw4nkibj3cz1clwq5pr7f5f2fsi84g5xhv5f97pgajp";
+          rev = "9d9061ece327a315ad9161e4fcc20c83638ccd10";
+          sha256 = "04h3hn1rs9i7cgdg393v12vqrm862bgiw64hyck7978d1w6n3a1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -11572,8 +11614,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "25cf792f735e8e7e06e2e4821d1ad21679c27f59";
-          sha256 = "0v7mk33nr64d4a705d8ljfccj47wkih5qfizbk53r5dr7f3wzbqc";
+          rev = "56a44bf2944107cfdb178a90c14a6e8092471359";
+          sha256 = "1jg3bhm2ksa4ask2n8q80afpa027430gz5w7vq4iwqw5ij8cx4v8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12177,12 +12219,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170227.412";
+        version = "20170304.120";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12343,12 +12385,12 @@
     dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dedukti-mode";
-        version = "20170206.514";
+        version = "20170225.722";
         src = fetchFromGitHub {
           owner = "rafoo";
           repo = "dedukti-mode";
-          rev = "6f5513a1dd7ff5d76da2402287a58f55f8891efa";
-          sha256 = "1vxbringd99w6mraq4d3b2k4rh5ldc4wvxjvg1z95xawhznv3v0r";
+          rev = "49d7a83d3e966e0913e3969000701d4159dfab2f";
+          sha256 = "0ryibbpq4qpj35lnczy1q4ldja782dzza5b48b7vy8a3x77yv07p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode";
@@ -14601,12 +14643,12 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20170210.830";
+        version = "20170303.1415";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "0b865af179768c24a1f7135c2866eca0f65b9295";
-          sha256 = "114kxmki4hmrckxflkzgrl8i6n9qc1jdvma5assbvmhnfqmy4hvm";
+          rev = "5db3f961644ea611682eab843a960eb3177ace48";
+          sha256 = "0rrxvvspz2l8byhnl052x59yd0yx7aajnc9b41846ng83kyb8dlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14810,7 +14852,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1784923";
+          rev = "1785720";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15474,12 +15516,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170116.1335";
+        version = "20170305.1130";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15709,8 +15751,8 @@
         src = fetchFromGitHub {
           owner = "xendk";
           repo = "ede-php-autoload-drupal";
-          rev = "b32b0f309e24969022d194035b9afc7675c22aca";
-          sha256 = "1yydbrcydh712w6v5qg7pzpfqlgchsniq0fw6psmlichn8cfmsjv";
+          rev = "2989b39067d5b556abb2977e52f1f0775fff3bbc";
+          sha256 = "0j9nz2w3mg895nvfqnmxhl41xr6ijfrpqrf044mrz5h97hgk3g7w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
@@ -16054,8 +16096,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "5bf34ba5f71e993ea9ae0971240d5e0e975f1377";
-          sha256 = "0wk5p4qr0a9mkwrayfcc6rshzjsg7dnwvlp5aj4rpfmlliy4qmfb";
+          rev = "8b9bfc404818038b8dd93dd4d39f3b820f8fcd52";
+          sha256 = "0y6k54vz9r6b81aif9ags130wgk2v00yq6rv2l4nzswsifxy2r07";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16241,8 +16283,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "6b707565b7328d8bcb8898db1a5b9dffaa06cdf8";
-          sha256 = "02qvxpg3pnw6crr13isimbhxyk6lf0x216418bhilgvgzmp1jwmj";
+          rev = "e2b412ef6b6a6b6443314575609f730fce766e9b";
+          sha256 = "0hzx6g62sa7lqkgsq1bavq8b73ji4994n31lr8afzgdx885xw6kw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16300,12 +16342,12 @@
     el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-mock";
-        version = "20170114.2257";
+        version = "20170305.2325";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "el-mock.el";
-          rev = "5fb2867d2e0350dda047a903ce60d264f78ef424";
-          sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn";
+          rev = "9e4d0921791cd04917613d8e3d06342ead129777";
+          sha256 = "1wkbhgyisj4kix0s4dkg72jylghqckmnyzk2brlrkvhz12zmhva3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
@@ -16588,12 +16630,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20170102.307";
+        version = "20170304.453";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "1670a0d8e4a09b48da312afc57d35e0cf7033b5f";
-          sha256 = "0cm1zg2hgwzwwkri0wsb6x9jhgma6vm9jga81jjiasih33nd0zy4";
+          rev = "57c00c08257794562e8b328adb7707c4aefe37a0";
+          sha256 = "1gymbxdw8z2sfh3k2apg197r7k0l37pxzj761lc5jps3wy4d6w1g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16672,12 +16714,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170125.1905";
+        version = "20170305.1633";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
-          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
+          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
+          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16746,8 +16788,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
-          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
+          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
+          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16994,12 +17036,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "20161004.5";
+        version = "20170304.705";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "d9703c73ca37fa07f6cea003efcb0974db1f7776";
-          sha256 = "0rc97dpdb2y418msw1z1nry6swffqdi4q806f4klfv1qr6rn2vwd";
+          rev = "fad4cee572cb4dbe670be8eb19f10646d02be854";
+          sha256 = "0zmg56gvq1hhhzzcx0d08r8ii56bn96ifaby6r6bgr6b094c2i59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -17183,12 +17225,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170224.702";
+        version = "20170303.621";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "72f06e3e7f5010ff794e0db73950b33bcdfb2e72";
-          sha256 = "0xbd5gq0pp6zn1rjkn3p44cvrg0xkyd8y8a41nnvgy5h1pjaqk0s";
+          rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e";
+          sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17208,6 +17250,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elquery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elquery";
+        version = "20170226.1238";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "elquery";
+          rev = "bfda1499d11b5705bea60886a3d25ca6d3808111";
+          sha256 = "1q0ifhq7wflzayg9mqy0wfc1fhgh4fmy17psz977k01yc7nc5s42";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
+          sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr";
+          name = "elquery";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/elquery";
+          license = lib.licenses.free;
+        };
+      }) {};
     elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen";
@@ -17756,11 +17819,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170226.1429";
+        version = "20170301.1406";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "0b0bdd12eb97797d3c481de70871d64f42672a58";
-          sha256 = "1lvq4kc0sj5wrdjfyiarmz644ws36r7vp06jk4b11g5csk07lrc2";
+          rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a";
+          sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
@@ -18363,12 +18426,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170205.616";
+        version = "20170301.856";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "521026f777543b73bee6107aab089f44fb809c91";
-          sha256 = "0k2vxhr9rjkya95wca4v2qihbs72yx9zv1z7snm0wgfy39y385fh";
+          rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
+          sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18887,12 +18950,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170209.52";
+        version = "20170303.248";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a76345ae86f97c6c07569499a8f49c199a386444";
-          sha256 = "1d8f3g5d6rjrlyzi77vx1c69lm8wx0h894zrw9y8nkp9mvydf1v3";
+          rev = "3300b3059d13cd204f553f0c7d46d784adc5a8ab";
+          sha256 = "1717hpj71kq9bgfwp30z8k2pns6n23vh3mybfsn6iz8wz424428x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19370,8 +19433,8 @@
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "37f14a715d1909c9db271c435a3c0b234f131175";
-          sha256 = "1kp9f3l2fnjw6sffxc5n439326kg00gfdhlvach9jpiy9dhkarpj";
+          rev = "9c1f697c95b16f623c24bbb9c63257068d834977";
+          sha256 = "0ddpr9brxigc22mzq4nc5x499bpkqq3xx28ygjcmc0z7kb03d0rk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -19843,12 +19906,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170219.629";
+        version = "20170306.334";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "5d040cdf9769f484448385715103d0e48efb1425";
-          sha256 = "0d8cfnch23s80nymbjls4xsqj8ib89mrpi6ln185xh9jzscjfra1";
+          rev = "56e92f7cb4e04e665670460093b41f58446b7a2b";
+          sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20305,12 +20368,12 @@
     evil-lispy = callPackage ({ evil, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "evil-lispy";
-        version = "20160522.1106";
+        version = "20170304.259";
         src = fetchFromGitHub {
           owner = "sp3ctum";
           repo = "evil-lispy";
-          rev = "af670bf37068d94e4f9c0bcb5019d4c11dbf4143";
-          sha256 = "1ylj4mblill964ffbkg8mqy8gxhr8krjgnl9gzp8icr0izb9hj14";
+          rev = "040a7ee130c2403a1d6dac591b94b202bb48e186";
+          sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy";
@@ -20473,12 +20536,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170222.259";
+        version = "20170305.1847";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "8b5830a003ea4b1262621d822b9a45a0948bee22";
-          sha256 = "11djm4qjj7h4iv661f55zpvlc3010ngj43rw5jgaii9mlrsfa6d2";
+          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
+          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21082,12 +21145,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20170212.2116";
+        version = "20170304.1309";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "9def990ba4c30409a316d5cbf7b02296a394dece";
-          sha256 = "1ghivxwslvsbcimhhacbl07kxc1kfv7gn95fwsdx687p9qyffyfb";
+          rev = "c6eedaf916f763a68cbb7fdaf9c7af568546d4b9";
+          sha256 = "1r8053w782054dygpjpahjns5v0qf4drjisg5131qjkd9nvwyc0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
@@ -21100,6 +21163,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exiftool";
+        version = "20170301.232";
+        src = fetchgit {
+          url = "https://git.systemreboot.net/exiftool.el/";
+          rev = "ff6f30a005444269b985bbc28963c85ebcdaa835";
+          sha256 = "078xpnjqndlcaidzgdcvryqsrd5vpi2ckvlb6ihcym68611zqy7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
+          sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
+          name = "exiftool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/exiftool";
+          license = lib.licenses.free;
+        };
+      }) {};
     expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-line";
@@ -21311,12 +21394,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170228.815";
+        version = "20170306.534";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "4872561241cf67b679290fe91e5783dd9cba8d72";
-          sha256 = "0ca36s17bhpzmsgl65q7c8fhadca0zpw6dh58vychrv4k7757gav";
+          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
+          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22605,6 +22688,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    melpaBuild {
+        pname = "flow-mode";
+        version = "20170303.1146";
+        src = fetchFromGitHub {
+          owner = "an-sh";
+          repo = "flow-mode";
+          rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
+          sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
+          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
+          name = "flow-mode";
+        };
+        packageRequires = [ emacs web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flow-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "fluxus-mode";
@@ -24978,12 +25082,12 @@
     fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fontawesome";
-        version = "20170226.2039";
+        version = "20170305.556";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-fontawesome";
-          rev = "c0ec46b7d7d9d194a09b572c55980f32a08c29a1";
-          sha256 = "10dszqwb8sxhka4dv0xkd1pkd566z006xhq9d75qz29v3b7krbnp";
+          rev = "a743f80bfd53767ca9ee32da34c5ca032172a480";
+          sha256 = "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
@@ -25485,8 +25589,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "890be490748f1b8cdd79919e169600f5e8c0e8d7";
-          sha256 = "0ygn4kvv8ypr55db0jgpqx0z2gynsn53wqgca4pjb1cbxqbkwi0g";
+          rev = "d60970c0a5de8cb16eba55fe71441e9de35d6299";
+          sha256 = "0bhw69yh1jxlyny5w5dxpvd3r6s0rnp54il2q32dark22s75w72x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25565,12 +25669,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "function-args";
-        version = "20160731.320";
+        version = "20170303.515";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "12930e157f70b89f344f3314cca8f9f5c6820bad";
-          sha256 = "1hz40k4pwgjdhddx0cvh8c04gmhgihx9lmynp353m00h58x37gm9";
+          rev = "a559041e5fed851c889bcfed7553a4dcd855ffae";
+          sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -25611,8 +25715,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "2da9d1fc29dd9aaf2381ada1d5eeda4bed0a26cd";
-          sha256 = "16c00vikjdq3hd8wv54y8nf7yj84311n9m06v4iwn8smh94ydzg3";
+          rev = "430317e5b2ea5005851ce7f03564aa8f8dba61c6";
+          sha256 = "0zsg5q1370fqswq5cysfc4lg74hyjxn5yjpqzyl9mwlips90y42l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26128,8 +26232,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "53df9d228fb0bd1e89b74c9e86f773abd697540d";
-          sha256 = "0rcw0wjql50qs5mi0m1516nsmhh0pj9xy0clr23fx2dxlflbhwr0";
+          rev = "fdd8ffb39098e38c0179dd647f05b846012f10a2";
+          sha256 = "1niq9vwdgyw0bwwcfbmkzs9z59adx0ly1ana8rjb7r39ii1am6ah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26422,8 +26526,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26586,12 +26690,12 @@
     git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170228.1957";
+        version = "20170301.1618";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "891cfbcb4ea3a7d05b49495b4b01ce9ce417b9bb";
-          sha256 = "18fxg5vr5m782np8957mk3c8d00z793k1qzpays5lv1v8ijkhzj2";
+          rev = "8d43732a753bcea8a7777b03755c17a0f45094d2";
+          sha256 = "1p439cwrxkcf36qfv93j8h2xyynynysr9ch9w662mhm7k7fgwc65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -27258,12 +27362,12 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20170208.546";
+        version = "20170305.1215";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "8fd980c4a4ba18085ec87a2f0c71875c5d01087f";
-          sha256 = "00zh5v24pxkfg240z6c5y9ngsn6rnvmxphiilf84bxxpwn030brk";
+          rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0";
+          sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -27385,8 +27489,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
-          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
+          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
+          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -27465,12 +27569,12 @@
     go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20170211.721";
+        version = "20170305.627";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "f9c6e25419c2d13f3841050ba66610a7ac728f49";
-          sha256 = "033md85r3y5gxvw458l125d0jxc3k8yfn5im22zi64rrbwlwkifx";
+          rev = "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd";
+          sha256 = "1029qg6ida3cw4ynxll6ykpnqkpbrbrx12nnzcplhc25vqpz7hik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
@@ -27633,12 +27737,12 @@
     go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "go-projectile";
-        version = "20170104.1730";
+        version = "20170302.1705";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "go-projectile";
-          rev = "46e937a88cbfd9715706fbc319672bb3297cc579";
-          sha256 = "17q23d29q0kw2vqcf8psjvhiqnk4ynpbbflcy35kihilwvrsx2l5";
+          rev = "4c449eae696d4e3a15078c336c98ea779da227ab";
+          sha256 = "1cyvd2va0vgbh7im5rhapyd66ql469cl2hswg946qj961kdxc7s9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile";
@@ -27931,8 +28035,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "594d91bfbb8dfcbcac0f148af8175f2b7ec9857b";
-          sha256 = "14g48ml7qfj2kyw5id0gmfigkw5k3xbr7fm55wrh2m3v1hq3cnfi";
+          rev = "15f2836d9fea3835d541d4d327ccf053d4052822";
+          sha256 = "1yrd7v75pcpb658m53ysgai3ak5nvrm7bf7hzhga3rgm20hhsc16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28074,12 +28178,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20161017.204";
+        version = "20170303.13";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
-          sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
+          rev = "a057deb08b41e37d767805ffeb024eee30f9faca";
+          sha256 = "07s75y01mrs7m2xmvg764yhivczycynaa31paz8h2pz65sb0qdhd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -28095,12 +28199,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170219.2338";
+        version = "20170305.942";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
-          sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
+          rev = "aca1bdd18997759bd4d3618c9591cc38774ac16a";
+          sha256 = "1g59mwb1l8bvc66gsq8lprbrfbs238lp280k3xqda6z7dbrh9vq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28176,12 +28280,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170227.1257";
+        version = "20170302.1450";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "f4a3ffe52df6113f08a3c68e473ab6ff7dad28cf";
-          sha256 = "001fh4z65f75s22rchdkffv71jwwfcfsc3sclcf3h77cj66h9ma0";
+          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
+          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28306,8 +28410,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
-          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
+          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
+          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28482,11 +28586,11 @@
     grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grass-mode";
-        version = "20161130.732";
+        version = "20170303.854";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "c7e2817461c3";
-          sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -28686,12 +28790,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20161015.114";
+        version = "20170305.813";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
-          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
+          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
+          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29626,12 +29730,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170228.412";
+        version = "20170304.206";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
-          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
+          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
+          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30193,12 +30297,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170301.12";
+        version = "20170301.2122";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
-          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
+          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
+          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30484,6 +30588,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ext";
+        version = "20170304.910";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "helm-ext";
+          rev = "1546dbbfaac7729435226b4a7426c9e67032482a";
+          sha256 = "1a7kjibc2r26wxc2c12bymjxdx965blm39qfgcvmqy6if0bp6w7h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
+          sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
+          name = "helm-ext";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-filesets";
@@ -32170,8 +32295,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "adfd03eeee3d8c3393695646cb8f37d729dd87c4";
-          sha256 = "1ram4fqzmrqs04vxjapl4hddazb9489c9jal1xa6m8644hg5jpqa";
+          rev = "65e1f3ab12caa206402fad381cc75c7e844f9452";
+          sha256 = "0j07hrdws0n9s51a5z7b0q1lzivvmrpn0crsg5rwnm9jwa1a6vws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -32492,10 +32617,10 @@
       }) {};
     hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hexrgb";
-        version = "20170223.738";
+        version = "20170304.1213";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
-          sha256 = "0aijifwk7z9sl7wyl3qw649y2k8nk9qsv7dfaca0k42idh6ihswl";
+          sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
@@ -33118,8 +33243,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "cd3d3241c7dbd88a0505fb005d4072965c1bfe1f";
-          sha256 = "144arwryhp464v8k1w12v87mf70bq372dc4pxvl2giqssmaq7jms";
+          rev = "c2ac3e3ce57c834525dc8ec5ca87d5e8d728b69b";
+          sha256 = "1zhggfmhk57v2yj6w9z8mrq8yjsdjg7nzljz1jwbk03jkf7zvwr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33441,12 +33566,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170227.1018";
+        version = "20170302.711";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "c9d602b8d4947db2b759ecfe0a8b7bf81acec3bb";
-          sha256 = "14c1alab62y2d5qwzhp48dhcilwklph7597rgkpqniccd41b8wav";
+          rev = "0e65583a7821e60882b8ce7934b1f1c34d4d1874";
+          sha256 = "12r0jxcipfbs77yr2svs60x1b52l6lyjgjax3kxaizjdjaxxwsdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -33982,12 +34107,12 @@
     hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hyai";
-        version = "20160319.1835";
+        version = "20170301.647";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "85df4feb527ee65f0b0228832ecfcc452fe572fd";
-          sha256 = "05fhbs4ifa40s8fp6bhccm0kdd5laq1g8r8rvyjbq9f7mj0s9g87";
+          rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80";
+          sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
@@ -34231,10 +34356,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170217.1048";
+        version = "20170303.1455";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
-          sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
+          sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -34249,10 +34374,10 @@
       }) {};
     icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icomplete-plus";
-        version = "20170101.1028";
+        version = "20170303.1456";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
-          sha256 = "0r2s3vwqs31pj7jfya8l46ij1jc894bar4pk4i9zk2l69d7pwllr";
+          sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
@@ -35123,10 +35248,10 @@
       }) {};
     imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "imenu-plus";
-        version = "20170101.1029";
+        version = "20170303.1457";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/imenu+.el";
-          sha256 = "039s81faqg5y3vhl9hlwn5qffdghshn6867pp8nf93f6zhj9mxr0";
+          sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
@@ -35414,12 +35539,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20161121.314";
+        version = "20170305.900";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "117d8cb2564bca1248bd71eaec8b97ff1d94668d";
-          sha256 = "0wdajff7p1d1ziac6immc11jx9c4ivkj6npnjx80cyjnacj7byn4";
+          rev = "2e1dd6c1e1540223f8cc4e3493c1e555144d5431";
+          sha256 = "0flfp8313xxw8c3wip0fqqz33n7gfn3fhppsrpz7wlxiqymsb20d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -35560,10 +35685,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170227.1101";
+        version = "20170303.1500";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "1nh8l0ah2gqg3p8lg9z7zf2fzbzalrbrjkqgn30l48rkk58bmf4b";
+          sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35914,12 +36039,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170228.441";
+        version = "20170302.2354";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "e1c2c47e4ca6219c76b0ab3ee41dda27d3126d4a";
-          sha256 = "026i5wrg7gs9h9nw79fzmi0q9w9hrjbrl1h26569la15fqjvfs22";
+          rev = "693e13fd3f19c05e906c234c692d77ac48d69fdc";
+          sha256 = "18xj5m6qglh4w903vcdxmw1sms51ansrai43sndcp6z4sbi02xpb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36246,10 +36371,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170207.2149";
+        version = "20170303.1503";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "1h2pn8qvxpnn2y0h54fijgqb47l047hq5g2n42x0nmiky2hjqras";
+          sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -36264,10 +36389,10 @@
       }) {};
     isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-prop";
-        version = "20170101.1034";
+        version = "20170303.1504";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
-          sha256 = "0n83qikh3mlnd3f9qwcsflg5x10sxvs9fkidyyv79jr673x4ljpv";
+          sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
@@ -36476,8 +36601,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36556,12 +36681,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20161213.439";
+        version = "20170302.1033";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37142,12 +37267,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20170227.1420";
+        version = "20170303.1035";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "3c5959de68117f5ebc622ba0a79caf7116c5b863";
-          sha256 = "09bmk1dw6h4cidrmfn6nmzj6lrfk39phngc11v7h0cwvxcbq6kpl";
+          rev = "6eb6132f44bf87e52d5ed74c4bb3869c0d5f66a8";
+          sha256 = "023yhdp4pdfm1fi4y09v925l8f1d8206z41kk1hv90zy034b94hk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -37184,12 +37309,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170217.22";
+        version = "20170303.1253";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "41c15d11fa0ed3f84c8a18aecf391c4a87e3ac56";
-          sha256 = "1c51sy5951hz3zyhs1w9r365qsw2amppf87141gsyl688vjrbn2s";
+          rev = "481b040c227e60c645094d0ec193a53adac7b09a";
+          sha256 = "0qbiqjr2nkmvf1m874mdfwsszzcv32rfdvrp7bs62fw9q95wcrhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38248,12 +38373,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170226.839";
+        version = "20170304.2103";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "697d437510ff38c22913f232a051a3620be68db5";
-          sha256 = "0c9l7pdklk8l7qfi6xvmmbj2cjaj2dwzfgzvblh0dc4hv32g4r9v";
+          rev = "5995aa56c9ccbb3eb78c49daba1e77a6aed354b0";
+          sha256 = "0aqmd5hkqphwv74n6y5yidhn21hl2hlnmfdm7m8wkwhcylylq6xi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38753,8 +38878,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b449bae54e4508f42f28cf1cba20e3ad849b1210";
-          sha256 = "1vr65dcyjisq61nq90qpxww0spz558ny7l2yis3hk9qg4zic58ky";
+          rev = "ca9eb0bbb8e9a4b5b6e2b177b2b36ab024495587";
+          sha256 = "0kzh5q1dj7mqdjcp1di0lm8imxjlp1ak8licidfy0lz4h4fcqsch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38893,6 +39018,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    korean-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "korean-holidays";
+        version = "20170228.2045";
+        src = fetchFromGitHub {
+          owner = "tttuuu888";
+          repo = "korean-holidays";
+          rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4";
+          sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays";
+          sha256 = "1w8mhhc05i1b6s9vvpk73zkk5x2kxxh3aax61p54mbkhn0a5zb8r";
+          name = "korean-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/korean-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
     kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kosmos-theme";
@@ -40004,12 +40150,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170214.123";
+        version = "20170302.1031";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "cb94346e9cd1fdf70cb872acc7e10f8bf6f3e1ed";
-          sha256 = "08sakrwaz0dcwl8zhqkkanajhnc94vy9qagcdmax52w708kyrspr";
+          rev = "8794864744151b808c0f966b29c33c547be96d89";
+          sha256 = "0ii8092148a5mi59ssnl9hxzjx861vpb6ajma4anpzfjlv9wjjq7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40404,8 +40550,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "8d23745f59b90c6229cb58fb65ef8cf2725826ea";
-          sha256 = "184ir75pald2g3fkyhnrgff58n617fxj7q5qwjqcn759r59qhxma";
+          rev = "c7849f87280d549f3829a2c2fe4cd911c421a0db";
+          sha256 = "1anp1avlzl7xf2zhj9b8ixhwxmvprbiis7nmdnh9nq1xkpfjlmxm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40630,12 +40776,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170226.1206";
+        version = "20170303.1225";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
-          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
+          rev = "6409991053350ab2d3def61749b92780dd1ed095";
+          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -40774,12 +40920,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170222.747";
+        version = "20170302.1127";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "81e58d62c5f480a876a06f67427150233c5c9d14";
-          sha256 = "0m0ly7ysp1wvy50jv4cykjgskd1wjm1sfqjpf75rhij6fq6cb87r";
+          rev = "03f1bd56317557c398851757893522f25908cc7f";
+          sha256 = "1xmmh4a23naa7ipd673q52hv31wmi1j20sh5kcgw14r3pqymd8dh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -40813,6 +40959,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "luarocks";
+        version = "20170226.1430";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "luarocks.el";
+          rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce";
+          sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks";
+          sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x";
+          name = "luarocks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/luarocks";
+          license = lib.licenses.free;
+        };
+      }) {};
     lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lush-theme";
@@ -41065,12 +41232,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170228.1717";
+        version = "20170306.44";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41244,8 +41411,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41492,12 +41659,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170225.1000";
+        version = "20170304.348";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "2df57246b6cf32b3af2d44ddd16b4a711eb49abd";
-          sha256 = "091lh50gf7xd2l737qb9mypbfabrjy7f0ry4d3rcb8ar2sqj58gd";
+          rev = "af83a1be2bb800ebee4ab378f167075537eeb7ec";
+          sha256 = "1zbjaixbrhs39fmf58mxqmwlby531gfxzn2s8s10rm0m6sswbzii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -41678,15 +41845,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mandm-theme";
+        version = "20170304.1401";
+        src = fetchFromGitHub {
+          owner = "choppsv1";
+          repo = "emacs-mandm-theme";
+          rev = "cd1505c8bcff0a3de821f0b419f897f4b0378b01";
+          sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/216a33a3acecb226c6b638a9e30ec4c741779a29/recipes/mandm-theme";
+          sha256 = "1qhxzhv63hk81dff6w06cghir856ck6wn1zba6736qn4phbka7ja";
+          name = "mandm-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mandm-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170210.2253";
+        version = "20170301.1511";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "578d87183d2a759811a5d1eab4dc9c74513e557c";
-          sha256 = "02zgc56s1wl7a27vrgycfgsy0fd6xbsbhgnpy6rrq5iyrb6a6wnc";
+          rev = "b360948acf5a31b6cf6f0113ab5f30bc47f6b098";
+          sha256 = "016h6mq0650fw8ix1zh1j15i782g0bpmlsnsznzi5aspy8b391kn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -42313,12 +42501,12 @@
     mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mbsync";
-        version = "20170213.357";
+        version = "20170303.206";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "mbsync-el";
-          rev = "a1fbd1a350e7da5cf4da09ded0443bfee826a45a";
-          sha256 = "0a52s9pvh83hdj05rg04na6pnr4dra256h64bgdvf65703yfbs8k";
+          rev = "8e34a059445b70a18ee5546921385d1636aeda09";
+          sha256 = "1w1kjpi2gnhmvkay71q2rkc92bcibdrdjx8r7p979sds5pgaq332";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -42397,12 +42585,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170226.2008";
+        version = "20170228.1746";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
-          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
+          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
+          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -45400,8 +45588,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "07683fa4850bba450d7853aacd181c44a9b57ea8";
-          sha256 = "1571sp3abdwzny3zph1alyam0a0vvi4h97g017r8bm2rj16r01fi";
+          rev = "883bca8693d0d289c19ea62d55e5fbaa93e721ce";
+          sha256 = "0mr9x0fkza7l1427ib4cwab77vva2aghr7279rzh2hq0wlkzc5zj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -45666,6 +45854,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nikola";
+        version = "20170301.1148";
+        src = fetchgit {
+          url = "https://git.daemons.cf/drymer/nikola.el/";
+          rev = "6752cc70b08889ff5184ac111616863f1881d357";
+          sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
+          sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
+          name = "nikola";
+        };
+        packageRequires = [ async emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nikola";
+          license = lib.licenses.free;
+        };
+      }) {};
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
@@ -45711,12 +45919,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170301.951";
+        version = "20170305.1601";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
-          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -45736,8 +45944,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "07808052461e9534dc42f7f98e83a7b58565fd13";
-          sha256 = "0ss34q1xmwbg5sswf3yfhi6h3pxpfbr3yvvcsz7w24brfd0zllkh";
+          rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
+          sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46023,11 +46231,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170226.355";
+        version = "20170304.1716";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "508b5c20fa38b17fa527af075857061f4ed81e2a";
-          sha256 = "0bjb539mqmjq9s2ks8pvq0ync9b19af48kx60vwgg4k0c7n03sab";
+          rev = "91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b";
+          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46585,12 +46793,12 @@
     ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
-        version = "20160711.1606";
+        version = "20170302.849";
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "8240e61e859323e097694af22bada2983a5f2727";
-          sha256 = "10yngyyrv1q1arwdlj7wvjl2487vsx5hpqsji8wjs72yl0qd86rr";
+          rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e";
+          sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -46606,12 +46814,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20170218.503";
+        version = "20170304.2215";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "f5c12bc3447baed9bfb03a627dadace975969b7f";
-          sha256 = "1qzb2h4acmbljixnky3sksd1sjfnpcknf4z6zjm89lz8nrjldx5a";
+          rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
+          sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -48670,8 +48878,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
-          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
+          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
+          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48690,8 +48898,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
-          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
+          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
+          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48812,12 +49020,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170206.1845";
+        version = "20170305.1948";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "c2f54f310e0f50b5ca291a45356717e932505bb5";
-          sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi";
+          rev = "493e9ac843eb44efd8a6f486a7cfa727d575f3af";
+          sha256 = "1amviznfqjb3z09bzv11yy2ickka43z7ffzjlbgk9wy066944p8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -48842,11 +49050,11 @@
     org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170129.1041";
+        version = "20170302.2113";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "02aab579be3f";
-          sha256 = "0yb8zkq6iizpkp331wg6l9ksvy1z88pq3g12ya7ral992yn5yb8z";
+          rev = "690b6d4e1b83";
+          sha256 = "0smla8pxnqdzgfhxhs6hsqv8par5xcvfcww857i691gya6scslnb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -49077,12 +49285,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170228.1517";
+        version = "20170306.638";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "4977d1d519cfb9cfcdb1f72010097188de5766c8";
-          sha256 = "17nxsa5yzkawnff1ibfn21qwd3w5awvky0ywjdwh3mm2jg3r7sfz";
+          rev = "1cf25da328ecfeac402aaa38dc3f50af8f462264";
+          sha256 = "17bw03c22khqxf8b5hmf4f0l2s7qbmjkkw6m3xvs30k5snq1wk8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50204,8 +50412,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "6a642cdc7e98cc8f0e80474ac7172cea4f8889f3";
-          sha256 = "11304vs5wvi0p5v3yvqn463ablm4cc5zk6xli37m08yd8ifgh2q9";
+          rev = "af3d973d90b779d93153f751c746f9ede85972dd";
+          sha256 = "0468if164skl0rwnk36ld3kjcmiqmj59jijgfw5w9mpd8j4mvwf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50221,12 +50429,12 @@
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
-        version = "20170104.249";
+        version = "20170304.1504";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "cd01aa0970e8836718731cb096a2c4c030423bd6";
-          sha256 = "1n825l86738qkqgmnhg84z52vp4csvr1ql2i1n1nc1pvyykb9kva";
+          rev = "47c466b660ec184af70589df1c3a26d90241cd1c";
+          sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -50704,12 +50912,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170219.2318";
+        version = "20170305.2112";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "9f8f808244f00666d335810757b2f366309a4d53";
-          sha256 = "1af8izvx5fqk0w71yyg9hqxmj7cxqnrrnsc7h4zdjakimdss6rhw";
+          rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb";
+          sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51062,8 +51270,8 @@
         src = fetchFromGitHub {
           owner = "atgreen";
           repo = "paperless";
-          rev = "abf43ed368c909dfeeab1faa5b91763976945b81";
-          sha256 = "0qlwbwym4575kxxssi9y2g60ai9k5pccbjp963rkwsnabczg0lxg";
+          rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb";
+          sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
@@ -51395,8 +51603,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "20081b546f371dcaee9ea2769f46e513bb39c275";
-          sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs";
+          rev = "6c7425b16895c6925c4f1ec875dac4576574b34c";
+          sha256 = "1i4g5qhsp426jkxn4z1kps4cnb97lsrbfd2yk7x456v7dkrd6fn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -52124,12 +52332,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170209.658";
+        version = "20170302.712";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "cd1ecbddf42542a3f5e161c954439c6dba70f53c";
-          sha256 = "0q3lhppwr0515qq6l08ypxffpp4jf3y2v1giyxwpmfcnbiwxicnc";
+          rev = "5e440fb287897b97a0d13fc150df60b6860e4481";
+          sha256 = "1ff1h80hmkm3b1qj4y3hjzmmzcwp14qr8ankmi0qxymsz5z2jar8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -52754,12 +52962,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170219.420";
+        version = "20170305.259";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "e483b1a5661871bcd9dfffbf24fe388db82e839d";
-          sha256 = "1l9wxhs459ygmm40g8w2wpy6yyv4kkbmc20saf0gl7fkf14vgmf5";
+          rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e";
+          sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -53584,12 +53792,12 @@
     poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "poporg";
-        version = "20150603.1847";
+        version = "20170303.526";
         src = fetchFromGitHub {
           owner = "QBobWatson";
           repo = "poporg";
-          rev = "d4d8b3e6206b0af4044d1dcecfc0bd2193704e07";
-          sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
+          rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed";
+          sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg";
@@ -54209,8 +54417,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "e53e1ba0d8c5081b4671f4292b164e919d0fdb2b";
-          sha256 = "18xbql40myis77lyjiqq3kdsp0961iwf4rcg3c9i5w49chw3ql85";
+          rev = "50a5d4e0c720e73ef0919cf8019a32d934e86616";
+          sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy";
@@ -54496,12 +54704,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170115.731";
+        version = "20170301.1407";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
-          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
+          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
+          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -54794,8 +55002,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "5274d6ee314a237f6626b5b4633c9f87574ad46d";
-          sha256 = "0rjxp15xnj8hd39z6nzjdxypj7fgi6rpmfcbjmx5xqah4gbcbpnc";
+          rev = "0c0a8879c3dd7ee6925746d2206f3262689b5833";
+          sha256 = "1np5vkyzp5fjjzj8x3b55pj7mvanqsff726maj77mnixcs11vj7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55491,12 +55699,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "pyimport";
-        version = "20170120.307";
+        version = "20170303.732";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "60725d1632562789374808f6c1496e76ae751fcd";
-          sha256 = "1ldj79sg8ps1n7wzymyhsdh3gfrrm48dhpb08ihi3ng126qdikxs";
+          rev = "2482c8efee8edab9f26ea278848d786323fcff9d";
+          sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -55537,8 +55745,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "56daa5c3a0d2d6592c673c2932c354b68679997f";
-          sha256 = "0h1d069hd6kk0z05x8454km3sx4bwab3gv860v5a7cf79ahx2k5q";
+          rev = "7df8caaa3e1995018417ac2fd87afd89be6945ba";
+          sha256 = "0fj97k1h4yplz87pfcmbxcg7sam447k1rn6ggb227jlyvqbw30sm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -56604,12 +56812,12 @@
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "20161221.1216";
+        version = "20170304.508";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c";
-          sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g";
+          rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
+          sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -57418,6 +57626,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "remember-last-theme";
+        version = "20170304.29";
+        src = fetchFromGitHub {
+          owner = "anler";
+          repo = "remember-last-theme";
+          rev = "14b4b5a03bb59b4e7040da96d7c261ee8f7884e9";
+          sha256 = "069bzswwaq1disnq0j49c3xq69xrz7rn6z3zc0cv2cspn2hk1x5p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
+          sha256 = "0pw36f9mchkl1qhaii39zd0vwrydjlijzanv706ai2bl8r7l0ppy";
+          name = "remember-last-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/remember-last-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "repeatable-motion";
@@ -58336,12 +58565,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170228.842";
+        version = "20170303.1422";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3adf4a22eb4eeede241dd5a7389254f9c8a755fa";
-          sha256 = "1g9h9d5x8pcm2m66dljwr4l6gqm013ll1fwy4yjhmy5mkmavn5hi";
+          rev = "ec6d0dcd9215fe9f29c7cf49685a60c3ebeeaf8d";
+          sha256 = "01br0l60ng8jx0wyvikjy96g6safdmr3vdr463jz61shif3xpirx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -58402,7 +58631,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57752";
+          rev = "57789";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58482,7 +58711,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57752";
+          rev = "57789";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59084,6 +59313,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sayid";
+        version = "20170301.256";
+        src = fetchFromGitHub {
+          owner = "bpiel";
+          repo = "sayid";
+          rev = "5a85d5e98b7a23a1009dc089d604de9a32facedf";
+          sha256 = "1sxsf3f9rzlpm3pib39cdy4sbn2fg1l5k0iwcr3vpkrfiyzivbpd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
+          sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
+          name = "sayid";
+        };
+        packageRequires = [ cider ];
+        meta = {
+          homepage = "https://melpa.org/#/sayid";
+          license = lib.licenses.free;
+        };
+      }) {};
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
@@ -59112,8 +59362,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "7d205e730d3f1d00058203111b0f016a2371879d";
-          sha256 = "04l27yz2n88hmqifxpjl181wc13d39ybx31zb9xci0s7mvhkfkak";
+          rev = "14322d78b2be5148c2756d69e7a6c1e53b745569";
+          sha256 = "0ih1kahzr3n6rvmsv2jg9v1f5n119vn1qa6jjs27wpd39n3az3hj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60308,12 +60558,12 @@
     shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20170223.222";
+        version = "20170304.616";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "9429e538121c2613177848dc97b73d08f6fb4a42";
-          sha256 = "0zfbsg0vgkc9bpzm3mlkqz4gpjlai81c49g0m55zwkmvqshlsrch";
+          rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
+          sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
@@ -60455,12 +60705,12 @@
     shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shift-number";
-        version = "20160419.1257";
+        version = "20170301.659";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "shift-number.el";
-          rev = "4ea4c2a2ece26e208980e6d2f0939271bca751aa";
-          sha256 = "1fqrsr4j2axmxnvznz9zyy8giywnia23i6a8xi1f8lx924xg3cr6";
+          rev = "cd099a5582fc996b800ac7607f6c38a004ce9740";
+          sha256 = "131by7z6303m81kjhy8rnfvwyzfbxglc19xb90jdks4vgczqkcah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
@@ -61201,12 +61451,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170228.602";
+        version = "20170306.718";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "3bd88ab8cb9d8deae4ad965156de87245538f29e";
-          sha256 = "15d0g3d3nj7q7qadm0blfnhaagxzd20a6lhsy6wv788qvq4fcq4j";
+          rev = "e64753db3c989ba12f6b52796e9dbcf8c285fbea";
+          sha256 = "0bxn7nngc851h5z8bwmc61cl3yps6w6zwf26af6fpcj7d4i8435r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61453,12 +61703,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20170205.1642";
+        version = "20170305.1423";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "8b676ee14a3bdfef503472e31d1a5e89fcee63ff";
-          sha256 = "1kyryixfmqzjyh6f2bcsrsqvklcvmf9saqm6f0cnxa86rvcdkln0";
+          rev = "f419ab5294015368ef30e658f94894ff2084f5b9";
+          sha256 = "0llax80z1d5kn03ip6d4jclnd2x8ydx8q3y8kyx8ypzyvx1ya43n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -61932,12 +62182,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170227.318";
+        version = "20170303.346";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "67b1a1dbdfd2285f8a04a50a0fb006978e21727c";
-          sha256 = "121wa1capjhrssqp2vaaf359jjsm23si3m4shmsi7n1hdvdjirrw";
+          rev = "0c81107de550931466b11132b8c6286851615b5f";
+          sha256 = "1xmaxl7s8lh288vrqg6diakzldp615z41innkl13yjawnad4mxfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62460,8 +62710,8 @@
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "64fa78256efdc11bbc63ec311a976aeddb4808e4";
-          sha256 = "0pg7v1lrf12vigakzcjz3i9yqirqp5m0n7ryp430hyv92mk01l40";
+          rev = "dc80b1fe7c613d26b6357dbf447b593af6000ca6";
+          sha256 = "0w0lxihnzkav8mab050s600p06f8cmvvdv84fnfzj8zmd2raifki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -62498,12 +62748,12 @@
     sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "sonic-pi";
-        version = "20161024.313";
+        version = "20170305.327";
         src = fetchFromGitHub {
           owner = "repl-electric";
           repo = "sonic-pi.el";
-          rev = "0a14120e004565ec294c31c601131be7cc010c19";
-          sha256 = "0sfrgqvyw9z6rw8pjbfn1yvxxg3aznyc2kwp024g0w7ybb1a38li";
+          rev = "d2f6facaf012fc556498c90a4d1343fcb59a4628";
+          sha256 = "0hnjws9b4k0f6clcpcmvvlqnjkq09zrppkdylw334nhdbpkdhkxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
@@ -62820,12 +63070,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170226.405";
+        version = "20170305.506";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "c45aa258dcc7427082f1bb253964d82967c24072";
-          sha256 = "1blpg7d8bkpgagxbqkb9sm0jcdrba7l1dmm0z2h1nlrx4n66p4vm";
+          rev = "80f40d21ff3350f6dbd3e572e49e177f734391fe";
+          sha256 = "0yavgzricvgrvqgnjwxhw4vlphkglh9bb91j78wsmqr11l1sl66n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -63152,12 +63402,12 @@
     spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spotify";
-        version = "20160816.15";
+        version = "20170302.2229";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "spotify-el";
-          rev = "472f6e61d732a7e700f5505e2a445fc0b030916a";
-          sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi";
+          rev = "2825b5cac8406969405096660aeab6e5fef765eb";
+          sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify";
@@ -64727,8 +64977,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65453,12 +65703,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170209.950";
+        version = "20170301.557";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "a3bcc27b53b08f2114261795d4b4422bd75c94a8";
-          sha256 = "1l439z9wa9jwb1ascfvjzm8699cjr8hxip20536ph8dql8hk7rsz";
+          rev = "df36a5b37928855f013d40bd47c87e2ed281727c";
+          sha256 = "0qn1z4cxc3v4s6fl0j7k95zdnfs5r860nd0ah0w9yn7ic71jl9ib";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -65478,8 +65728,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "1cb37c49e97aff263ecb5f20746256126b048628";
-          sha256 = "1310pw200l6jdlpdyscnhf9cwll5wc1vyayi55x7jyvm02nngbq1";
+          rev = "f7013f7e70da5d2fff2fcaf88c5edc2d807a022b";
+          sha256 = "08l8c1kixx32zm7vvs4xy7zp53aqwlgx567hg7byqy8mqn3x0q8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -66083,12 +66333,12 @@
     textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "textile-mode";
-        version = "20151203.53";
+        version = "20170304.916";
         src = fetchFromGitHub {
           owner = "juba";
           repo = "textile-mode";
-          rev = "db33dc5f994c008ef9f1556801bf8ac62d451f31";
-          sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
+          rev = "c37aaab809503df008209390e31e19abf4e23630";
+          sha256 = "16543im5iymc5hfcix1lglbvpq4v0441vb7sk58nbnffqba83yzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ebe5e52bc9bb8875ca390b34ac32eb47f4e1252/recipes/textile-mode";
@@ -66391,8 +66641,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "c89e172289129a0a700a20f11f4a157b7da789d2";
-          sha256 = "1dmvi4919b5x3j22vxbpp4pyfmx7iz34xra0ai003dv2crb2qb2z";
+          rev = "431732d39e89f1661dc7dddffedb2c5c1e019cc7";
+          sha256 = "1mz2g5flz7yrsjzjfa9p6f5sinhd3xxf6nn3sjma7a9jcm626l7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66448,12 +66698,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170301.418";
+        version = "20170303.1211";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "624406228042ded6cf427a179eccbdb8ce1392d6";
-          sha256 = "0xb7nxy8pkvc4p2wcps26hs04pv35qdizfc1bqv59527gqpixd57";
+          rev = "616a93710a3bf882f75f61bd8f3438de698938c4";
+          sha256 = "19n1pc3igwbd1yz1cylnk46jvv723aab7505i8r7mw05zd5cnwpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67149,12 +67399,12 @@
     traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
-        version = "20161010.152";
+        version = "20170302.613";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "d96da54c87cba247306b4519295cc4d4df7cc33c";
-          sha256 = "1hx6d4r20irs8zdimsfw17kwpwrdcjhkvf1zf7k4cr9bmkj4bvz5";
+          rev = "de76278e77d26ab8c400c03cef7bc3326be1e257";
+          sha256 = "1l092pxpm02wr0wp5j1027s8wdd0qjaj5rl2gfl9b2qskw4qh8f2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -67180,8 +67430,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "9d68903018f255838b51c734015be74bbdbf539c";
+          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -67281,12 +67531,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170216.457";
+        version = "20170305.1155";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "133a3b8b6bc61927183b775b8a8209b9abc794ef";
-          sha256 = "1wgydsqy4p1y6kfs53a06ardabd4fxrdzqxwqimyslv7sqz0y3kc";
+          rev = "3c1b891f350a5c0b87d15d174203b9ba2bf3db2d";
+          sha256 = "0l2qqrxpfn4f0x9zdz0rsf5vw8238ycjmxnbjx7mcp3awm90pp46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -68023,12 +68273,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170227.23";
+        version = "20170306.214";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "c066af10ac41d2c459e113c5932ef6844193e7e5";
-          sha256 = "0jlcyrmmrg5nchcr91lc6x0hl7wlip0nfyy9qbda4nalkv5xgphy";
+          rev = "69bbb941a6835137564b919109884d056429f2f0";
+          sha256 = "1dg642b8s9s0f97mqm7facqsg6lmaxi9nv0kpj33p58bqsjrq6hc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68741,12 +68991,12 @@
     vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant";
-        version = "20160505.130";
+        version = "20170301.1406";
         src = fetchFromGitHub {
           owner = "ottbot";
           repo = "vagrant.el";
-          rev = "46c0c5129f6330497c518de442d517a0794b70fa";
-          sha256 = "11bh92a40x778875q1m2kmq9nanp96d9v9hzra0jk8954g0bavlr";
+          rev = "636ce2f9af32ea199170335a9cf1201b64873440";
+          sha256 = "06zws69z327p00jw3zaf67niji2d4j339xmhbsrwbcr4w65dmz94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant";
@@ -70138,12 +70388,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20161010.1100";
+        version = "20170306.946";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "6e34759f77b94318f079e178f7551fb16317b661";
-          sha256 = "1lw4jf4jnch5c57vv5dyiwgkmqmxisbm1wx269p6nkkvb9y49qm7";
+          rev = "92a586752b7fbc4089a6d92750c70274448aa496";
+          sha256 = "00b6sbcp827n5d8ql87503m3k1wnlx6rbr3xgrr41aq0b0xj6z7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -71595,12 +71845,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20161218.2145";
+        version = "20170303.1530";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "14bf7ad0d8366b3b8754c252ca45660181ba5a1d";
-          sha256 = "0025g3ikdfpmcaa6pkdyh1vp7wxbbdd5slxxdzyvshmi7lm2p2nc";
+          rev = "1eef698b7be06fa49347798089ca1e2ed8484da5";
+          sha256 = "0cysykwnwpy43mnx9fjiqk1r004ac6c7h92zhki8858bcgjnwzzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -72162,12 +72412,12 @@
     yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yafolding";
-        version = "20160814.1230";
+        version = "20170304.1917";
         src = fetchFromGitHub {
           owner = "zenozeng";
           repo = "yafolding.el";
-          rev = "a89146d35b8f66be68c1e8d1d03c4abdde39ebee";
-          sha256 = "1pq2b6bhl93b023gin7j1warvg8bz8zvf6kdgkmhmqaaaqqha5kr";
+          rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
+          sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
@@ -72474,12 +72724,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170216.1928";
+        version = "20170226.1638";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "cddb8260a0d89cc05577742f0f06938f2317de26";
-          sha256 = "1yrlzknbspkwysqalcbhfi0gfdk7mjknvzz60ijsyx14f26y8lds";
+          rev = "6e9b7f9432a87122cf9bb80a505be2fd9811a9cf";
+          sha256 = "0k5yv90530946zjs7xdq3017vcq688mz44r542l39hyd9skxq8ba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -72515,11 +72765,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170225.1836";
+        version = "20170306.55";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "bf2497be3ec5";
-          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -72650,12 +72900,12 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20161115.1258";
+        version = "20170305.2158";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "278dba2c6846c6898ced9948505775ef71812586";
-          sha256 = "03fibd99wihg811c72cn6q8w89pdivjn3305lyhzlbs69ylafz0f";
+          rev = "c76b1659a8e5cfccbdfcfe971ef6fcb3b7cd0263";
+          sha256 = "0k86b7lkkdlwd2570hc93ywbg60bxpx1axvzbvyvqiara7vq6njy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -72775,12 +73025,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20170219.1611";
+        version = "20170306.429";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "310c270d164fdb740c6af41120d5841a54c895b4";
-          sha256 = "1b6q7aaafxn5vllgx4ihyylgns8ykr5j9p45xphpx62n70m3c6qr";
+          rev = "96f953cee3358fbc299662a3b3cbc087cb395b70";
+          sha256 = "0cp2n0a4g1x4py1ixf273k6nrymhxc4hy1ccvg0cv43jpka85xkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -73084,12 +73334,12 @@
     zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom-window";
-        version = "20170115.120";
+        version = "20170302.27";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-zoom-window";
-          rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6";
-          sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx";
+          rev = "cd6ecc103fc30b171bda7daf1f44a550854d0dbf";
+          sha256 = "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
@@ -73210,11 +73460,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170223.2227";
+        version = "20170305.2023";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "772da5ae125e";
-          sha256 = "0zqa0jplra23hq6iv5538x7f24yfx8j8fzq5d4csr7hbndya4nqh";
+          rev = "d33bf30fd45c";
+          sha256 = "0wa2nw8q1pbmif1n7vxyzxf7zziwxdv60pa4rx1kxjnrd8aizzi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
@@ -73311,4 +73561,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index b43f8822910b8..18759a91f5b7c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -527,12 +527,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -548,12 +548,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "1.7.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -4164,12 +4164,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0pre1";
+        version = "3.8.0pre2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "84df4a49500e51ac6e2a19a77e385e66234386f7";
-          sha256 = "1kkycphqbz8j3jp70n9vh3lgpb2fxy2461q6x365h8mg5ab4w7x3";
+          rev = "e1adec32b8325fb731da084e99acd6070f5e39bf";
+          sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4794,12 +4794,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5115,12 +5115,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "edc6d2313b321988fdf780fac229d395e4752702";
-          sha256 = "1gnm9r42nkp349d5ry2bv9in83ikmh5pnrfcw96yigxrzkbajb2s";
+          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
+          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -8920,12 +8920,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
-          sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
+          rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
+          sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -9947,12 +9947,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "2.3.3";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "01a98a20c536a575ee5bc897f38116155154d5fe";
-          sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl";
+          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
+          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -10343,6 +10343,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exiftool";
+        version = "0.2";
+        src = fetchgit {
+          url = "https://git.systemreboot.net/exiftool.el/";
+          rev = "799076ae62d96e9d502f1189217b04ffdda2dc1a";
+          sha256 = "0yfa6w0518179v8hzzwrs6swrc1ak1nkyy0a7lkryrw310107j5n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
+          sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
+          name = "exiftool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/exiftool";
+          license = lib.licenses.free;
+        };
+      }) {};
     expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-region";
@@ -10430,12 +10450,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277";
-          sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620";
+          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
+          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -10980,6 +11000,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    melpaBuild {
+        pname = "flow-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "an-sh";
+          repo = "flow-mode";
+          rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
+          sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
+          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
+          name = "flow-mode";
+        };
+        packageRequires = [ emacs web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flow-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flx";
@@ -13992,12 +14033,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.12.1";
+        version = "0.13.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "6103db21b38cbdfda3100fed08b988fc2d83aa1a";
-          sha256 = "0hlqrqi1s94cr828qyfbr95np5xwr3bn98l4gv59rnqa1vmx49gy";
+          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
+          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -14259,8 +14300,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "c7e2817461c3";
-          sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -14924,12 +14965,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.2";
+        version = "2.5.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
-          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
+          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
+          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15218,12 +15259,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.2";
+        version = "2.5.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
-          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
+          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
+          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -19926,12 +19967,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.7";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
-          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
+          rev = "6409991053350ab2d3def61749b92780dd1ed095";
+          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -20843,12 +20884,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.6.5";
+        version = "0.6.6";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
-          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
+          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
+          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22207,12 +22248,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.1.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
-          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -22351,11 +22392,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.23.7";
+        version = "0.24pre0";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "770d00a8955b2ad8be9daf2923e31221c4847043";
-          sha256 = "1919kj6k8avkgji6r9ngd2a2qj8xpnjiwjx4brcvwrgkbryffq21";
+          rev = "990f8cd03203c7a19cef4e3edbec823cc99fa701";
+          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -26266,12 +26307,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.13.0";
+        version = "0.13.1";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
-          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
+          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
+          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -27253,12 +27294,12 @@
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4";
-          sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv";
+          rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
+          sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -28447,6 +28488,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sayid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sayid";
+        version = "0.0.13";
+        src = fetchFromGitHub {
+          owner = "bpiel";
+          repo = "sayid";
+          rev = "01bf777cb15a4f236bc44842712e9ca82fed7f55";
+          sha256 = "0lh4mmdm5vizr08lyz2jc131991dqmyx29n8njgpxa1vjzqd08az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
+          sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
+          name = "sayid";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sayid";
+          license = lib.licenses.free;
+        };
+      }) {};
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
@@ -28823,22 +28885,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "0.63";
+        version = "0.64";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "4531d234ca471ed80458252cba0ed005a0720b27";
-          sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
+          rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
+          sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/shell-pop";
           license = lib.licenses.free;
@@ -33950,12 +34012,12 @@
     yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yafolding";
-        version = "0.3.1";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "zenozeng";
           repo = "yafolding.el";
-          rev = "f0cc030ddd7ab53fbdf3cdb8b157d8cbcd6a08bd";
-          sha256 = "0xwa490bl59bk0lpga6kag8gif9ln0g4hp42hryhjv5spvgzlsb8";
+          rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
+          sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
@@ -34120,8 +34182,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "bf2497be3ec5";
-          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -34480,4 +34542,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index c0370229580b4..5a27a8efeb0ec 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
 
 let
-  version = "1.29";
+  version = "1.30";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f";
+    sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 861bf88f7dd27..17bb9739b9b71 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "hexcurse-${version}";
-  version = "1.58";
+  version = "1.60.0";
+
   src = fetchFromGitHub {
     owner = "LonnyGomes";
     repo = "hexcurse";
-    rev = "hexcurse-${version}";
-    sha256 = "0hm9mms2ija3wqba0mkk9i8fhb8q1pam6d6pjlingkzz6ygxnnp7";
+    rev = "v${version}";
+    sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
   };
-  buildInputs = [
-    ncurses
-  ];
+  buildInputs = [ ncurses ];
+  
   meta = with lib; {
     description = "ncurses-based console hexeditor written in C";
     homepage = "https://github.com/LonnyGomes/hexcurse";
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 9c0becc472955..3f588fdde585d 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -139,7 +139,7 @@ composableDerivation {
     multibyteSupport = config.vim.multibyte or false;
     cscopeSupport    = config.vim.cscope or true;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
-    ximSupport       = config.vim.xim or false;
+    ximSupport       = config.vim.xim or true; # less than 15KB, needed for deadkeys
 
     # by default, compile with darwin support if we're compiling on darwin, but
     # allow this to be disabled by setting config.vim.darwin to false
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index d84363df899e6..69bc36dea61c0 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16,
+{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
   lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
   };
 
+  patches = [
+    # Patch fixing build with lensfun >= 0.3, taken from
+    # https://www.linuxquestions.org/questions/slackware-14/photivo-4175530230/#post5296578
+    (fetchpatch {
+      url = "https://www.linuxquestions.org/questions/attachment.php?attachmentid=17287&d=1420577220";
+      name = "lensfun-0.3.patch";
+      sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
+    })
+  ];
+
   postPatch = '' # kinda icky
     sed -e '/("@INSTALL@")/d' \
         -e s,@INSTALL@,$out/share/photivo, \
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 814127abe7d25..8cd1a04e977de 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,19 +1,19 @@
 { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
 , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
-, gnome_doc_utils, hicolor_icon_theme, itstool }:
+, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.25";
-  minor = "5";
+  minor = "90";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29";
+    sha256 = "1xlywhwr27n2q7xid19zzgf6rmmiyf4jq62rxn2af2as8rpkf1pm";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
                   which udev libgudev gnome3.gexiv2 hicolor_icon_theme
                   libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
                   wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr
-                  gnome3.defaultIconTheme itstool ];
+                  gnome3.defaultIconTheme itstool libgdata ];
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 071ec21bbd01b..3c18772f03925 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -27,7 +27,7 @@
 , libv4l
 , kfilemetadata
 , ffmpeg
-, phonon-backend-vlc
+, phonon-backend-gstreamer
 , qtquickcontrols
 }:
 
@@ -65,7 +65,7 @@ unwrapped = kdeApp {
     kwindowsystem
     kfilemetadata
     plasma-framework
-    phonon-backend-vlc
+    phonon-backend-gstreamer
     qtquickcontrols
   ];
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 8e79c09c2ad19..734ebb9cd8629 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner  = "manuelschneid3r";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "026vcnx893wrggx0v07x66vc179mpil2p90lzb16n070qn3jb58n";
+    sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 77549ce4df40b..cc4e289b7d1ac 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.29";
+  version = "0.2.31";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1282m4qwdn6phg5x71l470vs1kld8lfhv5k8yvhp9i7frm29b6w7";
+    sha256 = "11kciq73y76c78rpd87bmlnvv4llrf81g3d28y02llnngrbczp7v";
   };
 
   buildInputs = [ ];
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index fb60babebe20d..6dd0f532f183b 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "11526";
+  version = "11639";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1164vfqbbys0032amk85219y0paihvi8jkx0kwc5lramwsk57pld";
+    sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb";
   };
 
   phases = [ "installPhase" ];
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index a3c140b6e6c29..3961138658f7b 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
-, zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
+{ stdenv, fetchurl, makeWrapper, pkgconfig
+, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
-, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
+, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
+, xapian, ctpp2, zimlib
 }:
 
+with stdenv.lib;
+
 let
   xulrunner64_tar = fetchurl {
     url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2;
@@ -22,18 +25,38 @@ let
     sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi";
   };
 
-  xulrunner_tar = if stdenv.system == "x86_64-linux" then xulrunner64_tar else xulrunner32_tar;
-  xulrunnersdk_tar = if stdenv.system == "x86_64-linux" then xulrunnersdk64_tar else xulrunnersdk32_tar;
-  pugixml_tar = fetchurl {
-    url = http://download.kiwix.org/dev/pugixml-1.2.tar.gz;
-    sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
-  };
+  xulrunner = if stdenv.system == "x86_64-linux"
+              then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
+              else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
+
+  ctpp2_ = ctpp2.override { inherit stdenv; };
+  xapian_ = xapian.override { inherit stdenv; };
+  zimlib_ = zimlib.override { inherit stdenv; };
+
+  pugixml = stdenv.mkDerivation rec {
+    version = "1.2";
+    name = "pugixml-${version}";
 
-  xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; };
-  zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; };
+    src = fetchurl {
+      url = "http://download.kiwix.org/dev/${name}.tar.gz";
+      sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
+    };
+
+    buildInputs = [ cmake ];
+
+    unpackPhase = ''
+      # not a nice src archive: all the files are in the root :(
+      mkdir ${name}
+      cd ${name}
+      tar -xf ${src}
+
+      # and the build scripts are in there :'(
+      cd scripts
+    '';
+  };
 
 in
-with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "kiwix-${version}";
   version = "0.9";
@@ -44,57 +67,32 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    zip
-    pkgconfig
-    python
-    zlib
-    xapian
-    which
-    icu
-    libmicrohttpd
-    lzma
-    zimlib
-    ctpp2
-    aria2
-    wget
-    bc
-    libuuid
-    makeWrapper
+    zip pkgconfig python zlib xapian_ which icu libmicrohttpd
+    lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
   ];
 
   postUnpack = ''
-    cd kiwix-*
+    cd kiwix*
     mkdir static
     cp Makefile.in static/
 
     cd src/dependencies
-    cp ${pugixml_tar} pugixml-1.2.tar.gz
 
-    tar -xf ${xulrunner_tar}
-    tar -xf ${xulrunnersdk_tar}
+    tar -xf ${xulrunner.tar}
+    tar -xf ${xulrunner.sdk}
 
     cd ../../..
   '';
 
-  configurePhase = ''
-    bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF
-  '';
-
-  buildPhase = ''
-    cd src/dependencies
-    make pugixml-1.2/libpugixml.a
-
-    cd ../..
-    bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF
-
-    make
-  '';
+  configureFlags = [
+    "--disable-static"
+    "--disable-staticbins"
+  ];
 
-  installPhase = ''
-    make install
+  postInstall = ''
     cp -r src/dependencies/xulrunner $out/lib/kiwix
 
-    patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 2fe07d8c5dd0d..2fa4ba9ae6447 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -1,17 +1,39 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchFromGitHub
 , pkgconfig
 , autoconf, automake, intltool, gettext
-, gtk, vte }:
+, gtk, vte
 
-stdenv.mkDerivation rec {
+# "stable" or "git"
+, flavour ? "stable"
+}:
+
+assert flavour == "stable" || flavour == "git";
+
+let
+  stuff =
+    if flavour == "stable"
+    then rec {
+        version = "0.9.9.4";
+        src = fetchurl {
+          url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz";
+          sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
+        };
+      }
+    else {
+        version = "2017-01-06";
+        src = fetchFromGitHub {
+          owner = "Tetralet";
+          repo = "lilyterm";
+          rev = "20cce75d34fd24901c9828469d4881968183c389";
+          sha256 = "0am0y65674rfqy69q4qz8izb8cq0isylr4w5ychi40jxyp68rkv2";
+        };
+      };
 
+in
+stdenv.mkDerivation rec {
   name = "lilyterm-${version}";
-  version = "0.9.9.4";
 
-  src = fetchurl {
-    url = "http://lilyterm.luna.com.tw/file/${name}.tar.gz";
-    sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
-  };
+  inherit (stuff) src version;
 
   buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ];
 
@@ -29,7 +51,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://lilyterm.luna.com.tw/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres profpatsch ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index a8bde39a27834..8b3e0a7cb4e87 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }:
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
 
 let
-  version = "0.10.1";
+  version = "0.10.2.1";
 in
 stdenv.mkDerivation {
   name = "monero-${version}";
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw";
+    sha256 = "0jr57lih3smdg4abglfyfhxp69akiyqy889gcpdplwl05vfnhand";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ boost miniupnpc unbound ];
+  buildInputs = [ boost miniupnpc openssl unbound ];
 
   # these tests take a long time and don't
   # always complete in the build environment
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb4719639ab9f..5a9ffc13007f9 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -1,30 +1,46 @@
 { stdenv, fetchurl, zlib } :
 
-stdenv.mkDerivation rec {
-  name = "osmctools-${version}";
-  version = "0.8.5";
+let
 
-  src = fetchurl {
+  convert_src = fetchurl {
     url = http://m.m.i24.cc/osmconvert.c;
-    sha256 = "9da0940912d1bc62223b962483fd796f92c959c48749806aee5806164e5875d7";
+    sha256 = "1mvmb171c1jqxrm80jc7qicwk4kgg7yq694n7ci65g6i284r984x";
+    # version = 0.8.5
+  };
+
+  filter_src = fetchurl {
+    url = http://m.m.i24.cc/osmfilter.c;
+    sha256 = "0vm3bls9jb2cb5b11dn82sxnc22qzkf4ghmnkivycigrwa74i6xl";
+    # version = 1.4.0
   };
 
+in
+
+stdenv.mkDerivation rec {
+  name = "osmctools-${version}";
+  version = "0.8.5plus1.4.0";
+
   buildInputs = [ zlib ];
 
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''
-    cc $src -lz -O3 -o osmconvert
+    cc ${convert_src} -lz -O3 -o osmconvert
+    cc ${filter_src} -O3 -o osmfilter
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     mv osmconvert $out/bin
+    mv osmfilter $out/bin
   '';
 
   meta = with stdenv.lib; {
-    description = "Converter between various Open Street Map file formats";
-    homepage = http://wiki.openstreetmap.org/wiki/Osmconvert;
+    description = "Command line tools for transforming Open Street Map files";
+    homepage = ''
+      http://wiki.openstreetmap.org/wiki/Osmconvert
+      https://wiki.openstreetmap.org/wiki/Osmfilter
+    '';
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index 495f37de2f40a..14680619e0c2d 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,9 +1,16 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sbagen-1.4.4";
 
-  buildPhases = "buildPhase installPhase";
+  src = fetchurl {
+    url = "http://uazu.net/sbagen/${name}.tgz";
+    sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
+  };
+
+  postPatch = ''
+    patchShebangs ./mk
+  '';
 
   buildPhase = "./mk";
 
@@ -14,14 +21,10 @@ stdenv.mkDerivation {
     cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
   '';
 
-  src = fetchurl {
-    url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
-    sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
-  };
-
-  meta = { 
+  meta = {
     description = "Binaural sound generator";
     homepage = http://uazu.net/sbagen;
     license = "GPL";
+    platforms = [ "i686-linux" ];
   };
 }
diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix
new file mode 100644
index 0000000000000..180b66fda8ce4
--- /dev/null
+++ b/pkgs/applications/misc/speedread/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+stdenv.mkDerivation rec {
+  name = "speedread-unstable-2016-09-21";
+
+  src = fetchFromGitHub {
+    owner  = "pasky";
+    repo   = "speedread";
+    rev    = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd";
+    sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd";
+  };
+
+  buildInputs = [ perl ];
+
+  installPhase = ''
+    install -m755 -D speedread $out/bin/speedread
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple terminal-based open source Spritz-alike";
+    longDescription = ''
+      Speedread is a command line filter that shows input text as a
+      per-word rapid serial visual presentation aligned on optimal
+      reading points. This allows reading text at a much more rapid
+      pace than usual as the eye can stay fixed on a single place.
+    '';
+    homepage = src.meta.homepage;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.oxij ];
+  };
+}
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 713a36f10296b..e12b95754edf9 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchFromGitHub, python3Packages, hackrf, rtl-sdr }:
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "1.3.3";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "137dsxs4i0lmxwp31g8fzwpwv1i8rsiir9gxvs5cmnwsrbcrdvxh";
+    sha256 = "1f7hz2zs2dx3v6hpdyz7wyyq1xf641jhpljyhvmjr4zg5m035isa";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython ];
+  buildInputs = [ hackrf rtl-sdr ];
+  propagatedBuildInputs = with python3Packages; [
+    pyqt5 numpy psutil cython pyzmq
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 8515efc56bce8..30d38183c8f20 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
 
+  configureFlags = [ "CXXFLAGS=-std=c++11" ];
+
   preBuild = ''
     substituteInPlace Local.mak \
       --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 587e807b1686d..5e8891385d5ec 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,925 @@
 {
-  version = "51.0.1";
+  version = "52.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ach/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ach/firefox-52.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "264a80d657603925d3ac0e848e60e3593a94e20eaaad4aba1767fc35c8bdd826d7fffbf7aa7be9fc8e380bbc174d53937eb24f887db18fa69ee375f72e8ef092";
+      sha512 = "2fc16b1e570004de7dc43b52f6b0123fc650a7717bfcdd1bab161149f8ad7fab7558df6ce48b7a66cf06d773e5edc25087c2642e3a37d34c6c775660730ae7af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/af/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/af/firefox-52.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "ca4498387c7786f96e3e7220b6a072cb5df0daaf00dade13a149e61ba725229e47f84622f196034caa608c9c2ef49a14450a9816fd3accb62c29063344d354ca";
+      sha512 = "0f74ac773789bc2089b9280af5e995f46f92f34c4c90ef4d6d972bb6c67e8cf77857909b88f0419894edaf6057bd0affa4b4551d89e3e3b938b2ae84911a80b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/an/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/an/firefox-52.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7abba14523671201798f8abb53233472f56fd961d679aee52b4ae9be1c9b5afe547cb1c10a5f6aa80cd5b41eeb0a3d04edc60a62ed00b1bc21ad8cb9dc86906e";
+      sha512 = "fee74bac85e8b35ca16cbe81aca1d5e180ee6794ebee146d483315ee861f5c4f80797885a2a1a4d6d759fb787fa5e4a252ab66ad6cd5102a1dbaa346ed89d5ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ar/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ar/firefox-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "429aa2cf388d1efd0e6d9658b9464d06bf6aa42cce1b9b0d4bf2d85a350fbf307d45a205d9303ff386fbbba56a637c19d6c7695a78b9947d29ccaec285053864";
+      sha512 = "2d2f2daf74f829683959411f712c26ae232db3c3e079ef54ee4b12cea20b58a270df580f9256eda9bfb0cbf90bad3890c8d58a5576cea9f5a25e6c17dd581b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/as/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/as/firefox-52.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "670102d9e6b50aa44d9d035af068dfd55d5b009a8e189e0e0d1e6d3404918c0e009e3e573b3de2601801e7c792746885d32aeb48235921c4cbf7874b82f06a73";
+      sha512 = "4da8d96beadc799c27d72c56f1294dca5c8e76b5a8bbb2a9637bbbb16ecb47aa563abdc0bae5078eec040c019052e233608feac180596f8dd0787a42c8500222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ast/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ast/firefox-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e6e6236bc496bab83bb64c7fcd2444d4f81fa49c9b6914d2d9abd2cced829f22b75705b3755525277d0d5a1193d0766cdaf936423889c77a2773ab28d953c738";
+      sha512 = "7184213214f8687a8de9bf1dd8326c98777e613a47c8e6b3bc283e94c09c5fd11d2360a4df334ca1447bd773614f6b8673ffb67a5323a2d0887efbfd3aad6f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/az/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/az/firefox-52.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "16b6fed737a5d2fdeb18945cd71f8e844abfcc1402ade665260d2644612579e76111a53548dd5c645c5816fec7c8162df91d687eb6b9dc84ad520af2a9580dde";
+      sha512 = "d9a791b2a679438686896ebcb995600138fb1cd88310f720afa33e302cb161550dbc628a8f3b2699217ec9275a54920197c2a2e8a9ff8671c0b6d29fe372c60e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bg/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bg/firefox-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "dd311d55e182408ba16853dec80d13fabc957e9ff9e6098f040698b35fea28b4579827ca35b21188f1e6287b749fd1ac94b3bb9979b75caf5b10b90686f425ac";
+      sha512 = "1a1f7d34375273786cd2efe5c138aecf55839cc223520a6d31eab84446860f480521e380fa76003fff7a9fb5b41668bb20995c9f8ae50e11dc453e0ea6de3b4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-BD/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-BD/firefox-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "857a13768160d71dfe5dd806933c85006e63508b6dce63545a0618c20531204b672dac7b2634dbba3a453277cfc53a9395215287ea51b18642d8e8c97258c704";
+      sha512 = "283255c0527e44e43b9de32940886f038735537f04a83d6ed17dcee7c157ec3cedf1f6e043c7365782417040c9494560623d22552e9b9aebd5ef0a18c6dd38b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-IN/firefox-52.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "602c352dd5de9a90128318c72496b2439531a5f4c4d16b28060686396db0b84c1300255eb8cb5dc6e6560971e6283d3c4bbe4376939177e4fbc0192898922a7f";
+      sha512 = "973d32d9e8106964bd6fe15064e0bfa851e935f7fecd353e199f88a0dbe5287a2e65740f079a43dcdf35a76a8d0c98d2f24c45e8b92738e38b0a71766d980cd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/br/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/br/firefox-52.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "fa8ba39abf6691c4127b5d4f6002405eff04fee2522ac274ce57c349ae042f5f47ee7cdb3519608d6415629aadf6a5894f575dab79ae3055fba383cf2680cc54";
+      sha512 = "2b7180ecc0bdd038faabd837e6ce09442e8254d997f50d709fc1e4779f502ebe8d4bf0e3a90657601a9f67a09d88361da0cf354929a043116e613eb9c709f704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bs/firefox-52.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "c8960b8cf4055c7a9032a3d5c10bbc59bf1b828909bfcb57f45a8d05dff07111d18da1644a18cdccb653630d77ebc17d435109d289f1d378335db043ae2c142f";
+      sha512 = "9033d98af42e5affe3f5b80dfc16ea6b08660c5a06326a50540b41463ba7356a51e9a1107fa1a698ebd0fb828100050a504a380811c8f1047aa580be28b7d9c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ca/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ca/firefox-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3b8cbbb0b8a14640f2b919fcfb67d4274e6ac9c6f612bb4baf5c368752d76fcdbea7c795cdf23b00f3bd64ddb2ae4af950cdb7a0637f621ab0ef382c1f6933cc";
+      sha512 = "d0ab3be67b331f3a6c18cb1a4036820ecb7e67187ba0fd6fda59b9b6a707482c065dd21d3623796007e5b5cb492f16b95a0a759f950b830c45909910fef8ff74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cak/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cak/firefox-52.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e7a325d7ffed7db337c5fa4c3bfd31bf8b7703041de16f8024821f1d89487f36131616d460db8518d71d20af4285d43a040331d304c5b828fabdce181f736965";
+      sha512 = "6fe7403947b46fcd7535ff86259c4fd1beb36c22b4461f9ed676e38c01feaae6ae80a7711e15340e7a22605ce05b32ebd1786806c96a1e4a30b322d040acd868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cs/firefox-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "32a4b758b2cfac67f19a7fe7ad7d04b49122921e2b3c1c8236d8be3452b665aa54c13dcd9e2d2b298dc017b864f56aa9b6f06d174be46ca41a722226a15eaf01";
+      sha512 = "31c326df9d697dc5ddba65eb5d3c998c8ecbcda7a14712fda4909fc2ebaaa257247472d315e9d58e17cfa7feb75225cb1d8d20632381e35c3b65f47d21fa0885";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cy/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cy/firefox-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "908bc9d3d9ada201a2fa81a83f6773c635c3dbec0e08b464c6dab5a311d667291fe7f5ee403ff13e5cd923d01cbfc0d9e2a0de3a2a7469af4bbf4afc8368ef4d";
+      sha512 = "7c56c2780de97448f796763aef6df581639b27feced5c06e8184da2c242d0cc6500f0e1692e7e2c70f324bd9fba1f1b780146c6e969d89d2053c935cb120ef19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/da/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/da/firefox-52.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e10fd9c7ee4496a674cb18414f0bfbd1671d21aad4bf41a63432540555a6f4059faf50e488bb76241a1e15884fdf7c43ec289e2641d9ee13f63985062526cd07";
+      sha512 = "e3033e0cf9100454e8fe93476a4b9935f1783f2f5489fabe9c2b495efa1af935546f8350178bb89ed71917f7fb11baedbbf90bc95922bb4c8d8214972bb61938";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/de/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/de/firefox-52.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "07221eea748fbad6ffca0b7f77e4995039e28e506a790d5e858d4d88cd80737f1a366735a4a826358a9aa76ee1b454d99f8fc8732f4082e91c9a9e5ce40a9b81";
+      sha512 = "9aa9a36751e14d30e7ac34680e216785d657952254e67b1cf3de33288907019790bd4f865a142551118dbbe12ddbfd28129fc74bc83d3fd96f1c250874f680da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/dsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/dsb/firefox-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9e2f1eee45e5dc1b8f7ab5c72c734c85bdd21544500c45ba1b85580cc110c02499cc69b596d979633e64b3aee7b1408e27862c761d4451b749399815199d3694";
+      sha512 = "ac543d1f58c287979bc392618051c1d525d72cfd8d51a2eafb611954be12889f40b842ef30b37001686529f8d436d259a56ec37d50e14c096781a0c44de3ed2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/el/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/el/firefox-52.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "270b1fd5fcf6958929e81c38a5ae2d8b5ee3de62e64eb6e7e7b80a8520759f1bddf03eec408165853ae624918194c57c2b7b496b4146a78ef42bc4b5b77a1d55";
+      sha512 = "190d0f6eb4b9b34e8535b90444e90983fedc89aec81ae0fa3c22860bee552a1b165e3e3e0531698cbbcb0d24c175479b96a772891d099d39ea3654029dc5e36b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-GB/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-GB/firefox-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "79bc0e031f3ad065e5309dc20ff509d9d6fa85c2669548b24be9e2b8fd9347ce354b51faea65943b421941ba20d8d0fb22c79b89ad380a37ff52ccf330343f33";
+      sha512 = "6dbbd4b3a0033fa0fa0eeeca1e141154f90cb1217371a4c5be89f468e8a3529dfac0d9cd624b9cd4d1f93ba52028de8cef3678605f68597e587f644215212bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-US/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-US/firefox-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "724a778bf54c6778838378c07481c5eed2cc7984c1a9809e352b6bcbd2562c060f6f39b6308caec2e62c05f8631753796a7b2714afda0606bab70b3ef3acc15c";
+      sha512 = "55e553adbb74b246a3638f8fb2db5ed4dfe9342d3f2b8fa8924290a45697b68b8cf56ff8b1722326511d6da700f181d686b9e9234a0becded70298b85d41e305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-ZA/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-ZA/firefox-52.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ffb4d4554ffdab057507fe29c0fb56a74e683b3bfbf19b26a52f23336918c788a476b549df3b4f57dc79c555bc36af620f46bcbb7c6467855952a024c75f7213";
+      sha512 = "fef8c97af1e77e077206527f6ec0e06c1176039caad06e9880958c3fc34f4cb121d0a234f1bb1c1beca12877e403b1995ff46ffafcd7ab7849966e961b13c913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eo/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eo/firefox-52.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "42768a6de7144ccd63c6a58c6fa2913004cdc3d7f35bfbb3d47ecc8a705672d2b95e8e8389fdc6715bcaff48b2c1a335c23f39a2c07d03b4cb660146fa811a7d";
+      sha512 = "44d5497fd194c5743f2da30ebb19cfd5705c94469bba39803cc94e76b87a7a41c1e5f500b44fb28a7a36b1d4f3cd23c582fdf1c6769c226b4aff3808f31aa23e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-AR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-AR/firefox-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "36da6cd0f8aea2419ba618b11f47764510c109c18bfbac380234b10c864a991a211742be3c058b4a8a59944324c7b32f65b4b3b8a9bc25460e6b4ef99e5d12e5";
+      sha512 = "56a43da6b90755174727734c7d5e2c73cb27c3d81d563b0e50a30e5c7314a6e7af0bec1f51087079caac92fb826c36001c2ca31d526ab4f1051be77a3140551e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-CL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-CL/firefox-52.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e3dbcdad48741a73aeebc46ab4771b4ea2324e6b0a9e6af020e0c5929528458cc3d66931dc67de4bf93b90afbb7f79078436c3da1ddc35779fbf40b8aad0ef1f";
+      sha512 = "85a8bc7d4496703350e7c8652d8517ea719b4ff7600b2070f41d815eeaf184dc0110d1a75a8e7d85905d44eab7db1e5f98f6ae2f19efc51123fca79e8ac78b44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-ES/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-ES/firefox-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1353c9d7fbe55d579486488d94d34b5acc0a87f6155ec2aa106ad6b2df53ee6813e19346bbfd920d5d0582bdb9c16dee667ebc384d48e06026fcf79590dc30fd";
+      sha512 = "7ccf29e7fb6c4259e146601b6d3bce643b2b5424a5940804d6e8c1baa58c0c4b3ee3c1eeb58caef42e4c799c7b3ede6fcff8db117f3de042fb7a52638b658826";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-MX/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-MX/firefox-52.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "fc93aaa68159c75d5c53d253e71aa87d099f499ff54a10606f0b87912837a1b85d897719d69753f6f84d389cbdf64a4a9306a9d19b809892032431d1a142b03c";
+      sha512 = "dcf32d58b6fd5bb7b631305e7be42182a13b0abf0be1f5fc22c969449b152c536ca65892d20d85f5799bf14627449e0b61de3a67cc9f33e23f8494070f7ffa27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/et/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/et/firefox-52.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e665a3e923bcd1ed070c1c4852d385f61ef43b5e6b39ad1eb0f547666d9c1cf82022638b9b60ef25f1621499ec930fec09367634ac972f7ce4c95f9bfb21cd15";
+      sha512 = "d67c35211d0220d4f9961ae6fd2664b4e4d5e8341f97f1505c6acdd9bbc57ded445dd167d31efe938b00e2f64240e48bae06d7ae295032e5eef382412fc8ea60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eu/firefox-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "aaad849c7de92f4dcda618b882b82f9c1ccf1de45454162f90f7beebe060d2f2c53e21dbc7a50ccfe24c505608f45aebd1744900647d7131234a55e79e4e8a6d";
+      sha512 = "2ae3709537afaaf0bfce3d40ecbd38946258de2a246013c64ed6ba6fbd2ef2898c3c0ba2cb6ec512060353a0e1864b75c3358a709ee940713f45fcdff94e952a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fa/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fa/firefox-52.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ac4f9518cf658c2438bc6037cccbdfc5f3af40b4c2ec89c6ef82f43b171f3d781ff067ad096322cf316c4b46dd27f7e0da68291289d6f03e81d1b90f3c436d2c";
+      sha512 = "ab880a914c5bb3ccfc99814c6c3ff53bb4b5fe151bd4db081cd7f84cbbfe5b85f14550fa83abedef140583d0084562dbf9fd46643716022e7155d19333f979b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ff/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ff/firefox-52.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "0a788a34a6f8ac67da73ff0531ceda803a911f30b77957d31b47e5acab221a55501daa94643ebd2d824b475591edb147ae66a06fe2641915c8a18adaaedeecd6";
+      sha512 = "b3859fd606829d519fbd66c15cde7f22b21129e503e785666e2e76ed8ba9ddb4f2fdac99d0fd45a295f2384e6cb0a92b9b49641a9ec00842590d236a4b49bf43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fi/firefox-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "c163e07e2097469be8dfaa57b6b722e9787c617cd8833e043b742a4d1424e7835e2c661412aae353fe0373bd163548102fd0b30dc37fbffe53444f0791c1777b";
+      sha512 = "b0bd095d475c786d2e5af898cbbde4e06cca3995363af180b7d56a03830aa30ddabaaae64ba685724778b613262074f5eb3ab17784b547f502ac9170919956cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fr/firefox-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "481a00f96cd79c04fde00ea39e560193575c1244d6e13c38ff4a81299cf944909a24bc8c8e0ff2a280bd9d4d7e8ca77b66e0532dc0643967ab52f27148dcab5a";
+      sha512 = "70cfef5874adcbfbedd07a7e6a838d3a7cc0bba3a14d009abb84ec6307b89c5568e5dee13ab435a69a5d8d16083f051da6d7fd01583001dfb4aa514d6820c082";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fy-NL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fy-NL/firefox-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "37d8b6df59f8433efbd55de434b2639e83b6306065017b62c8f2d1730dc84842081abd9669eb48ea862b36c0c62f84a0ec03eaac7be17463129b46a03426d8da";
+      sha512 = "e21d8d72c62f504cb46d13a4d386834f4c3fba4e13a7b7851f0a991d52ef68cd8a51283e3c2ab9d1edf18c6955126b0ac397de9f5fc2fbef2e31ffb1ae953964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ga-IE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ga-IE/firefox-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a6516adb884d070f4e6265e89e9a20b99f06f4093eb01df612f19748a1dc5fa07ed949a5d90030b8c512203717f0c9cdfdb307e1dfc2fbcd9def2bb7caf92dd3";
+      sha512 = "b341e6dd7e0506c9ebde9b21bf3a265b476bfbeb6b74f32eb6f062769ee8e70f58e64157165dd8d099fa444a6beff97092e4eb960a98f56938fa387a602cd794";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gd/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gd/firefox-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1d8710d83abf7e185aa73da047efd15d7e0b9667b80737528900a15b9a6aacd20588c963366f2aa08c7772444843b642e53bb2d3ababbb8b9812926d7c5a858e";
+      sha512 = "fa799e7d9fea0e4ce8f9de26e0adbf113dc95a42174dc70386a1407dede25108d8d27dc41be2929947fec362bd6bb10cda3da0e506cb4c15b77c94cba896885d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gl/firefox-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "08fee9be09fa365e188cfbe00dfb50c9b82a5228ec9d9feac7b4f01de43097f20dae4cd4f05da9983cff7d9504a5443854e8c13e8114a0977e65875406942007";
+      sha512 = "f9ffa106084fb083173e07131cfdbde5a45513e14adb5e87d60710ddd43e7be909b212e11eb2c0f3062d973c509d14d89784deb6f68f9fbe83a5bb54efd0f706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gn/firefox-52.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "4a21dc3c3355c08bf98d6366acfceb84841f50f5686dac61e87def3995c0e0df399834640722ce1c278e461096996320d7eac9af400bb08d1bbfb95cbfafb694";
+      sha512 = "0e2656122941ab02a9fbd4c4614058851b1dbc9f3bc65935fdf357ae29a23bbacbaefcf24d610ae991058debaadd2d17ed308a2fb9c44d3b9430bf31702fed7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gu-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gu-IN/firefox-52.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "0d565d1e41f9b57cd71d30034f576877650941c4e2250b49668232aa7cfc9a3e8c37dbda3e1e8eafc594fab09ac90e4b3f6b52c90613a9b236d9dc4092c65e50";
+      sha512 = "1c440a46044ab52b547bb949ff10da02dcf156f6195b2ccde058ce9f43ea866cef96365132302609547969afb9c5ca267eb51c917f6794e23d98dd3f98df5cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/he/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/he/firefox-52.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c0c87223d0c51b2d4df51ccf1d48938cbc2860f90b32a8d32fa69c7a4768c550deb9e9ee3f720404d51fb1461e0f25b56dc927449acc6a5d5dd23ac64fb4bf61";
+      sha512 = "22a01a470d56d22707987b84a0bf0a89b5f21c8b77c4255c0a5caa85b9549ac6a9af7f210ea7537d51f48c3ed84096de4df2474d8b2cd59e89b26f3f561d0d4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hi-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hi-IN/firefox-52.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6c0de623688af6a3eefa1a5a230979d2342d2414d27acca2e64646a9c82356cad47898d9fa791202bbe97464fad6e0903a12d73b15088d36062e89132c8e6d79";
+      sha512 = "89d11d581bfee9ef435226c367097270482da889df318e837230aeb28aa4d112bb357ecbe4a1a2c71d43286d10a0a9a1255ed0123f46793f3a121558d70a086c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hr/firefox-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "637ab29f7bc717b33007970bc23abbf75bcdc39df3be75c71830ec27874269a948aefdec854bf051d702f4201525a279f3f250734a35b773bbcc44e47888cb10";
+      sha512 = "b0b5a0263803b01ed338bd37350ca85184b7fdffc7296e5cbde6d4dc5e3ea1a25035602e8d00090643804f82d9006b6b300d7aebdfd7b58af1a588aa22419b0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hsb/firefox-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "92b7c0e1ecdeb485ea616ed025589add7305be63d401c37ea0372b2bf75d90c41fb8fbdb99de1c21c61da6f8f59ab1c403d512cc0c19828c10336a9f1a315903";
+      sha512 = "0fedac52dab1961c98a90ccd981c9362aa7f5697c0a2654c0529f33cd8c2e7d7efb0a36589478431cd34b876388bbabb8eb1aafd455afa76d85945ee975a2c61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hu/firefox-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "04e1aa441756e4452d1f8d762a5ba16af0121a3dae2a1fd1f33c223531a5f17f5cd1713b9fe81ee2c3746117df8942c26ed8e27e39e82644684babb060e32eb3";
+      sha512 = "729c194c24228e008e7464d75b7572fc6287841e24c3cb83c94e0799f70428b405c9effb16cbe0e354c001756eff2c780987a909a2984e3a33a78d09b096164d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hy-AM/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hy-AM/firefox-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "a962703c41aa3a9712b9ec98b5c00b621b844de5e277f98db65f9b682222ef580e2bfb259cdd6fc4a165ff319ba62daba3e0445b4cff0c47e4582249e6dd1add";
+      sha512 = "9fb96724588559e800cc39adba0619b6d1efeb0fb13f6e0b93e8a59cb1042bc73297bf97c46d838add2cadcd0ad3dcf97fe329c6447f11165770d573a24e7585";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/id/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/id/firefox-52.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "fb8a70915b978d61510f843de20e3f6549331fa5e625fd831b1ad7745e33c55cbfdf0afc8fad51e82b92ff60cf88a8a9bfdf4471036aebb75380b713401d03fc";
+      sha512 = "8958cfb1abbf21148c82dece6cf656b543df31bc9125e87f4de01b4c749cc5ef4e4190587b2a14c91ecb27c97f198f1de151c5c32683f61c0855120ad738ec9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/is/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/is/firefox-52.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "28af7725b79fbb2ea49514413e886c7e8572d55d943c99c2a08887ba8371526e3879735ca29989465a5fc7a35b09d781740b97988c3667d212c5d3eed5467e00";
+      sha512 = "14b989d96abd7a21aa5fdc222e803e73744c232d861b392da266e10b2f2be3e72eaa84f57665491c0c7b590ce3724805024c54262f1523c8debe48cb8b318027";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/it/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/it/firefox-52.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c470694846df0b78cf0a9b43215d3e187720953508109e04b6d11c2803dd981bf4c0c2116e804246f95643ea8a8c47c4c4cebe7cf45a867ae50e98b34cd68681";
+      sha512 = "1d9b164ae2b4c2265bc2101b409de63fd10f1181a660a61348ea1fd01171fca2f38e716f1a35c5f680fd246532debd18274919bc3dc2f421be0bcb0b7706d8f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ja/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ja/firefox-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "96c6f130818df3e642c3f43ea05180629ab9ce80cce7da668873c7cac7745d5448815d00c9dc7be88e48384c0603e2019fabd5743e4c48da6aff4495bb54c740";
+      sha512 = "7cf13ec3bf7bb2e19096732ca8d2f1436296e4955302a8329d80d1ba295c2c622785b370dcc7253070fdbc133a4223e438d37d3b2c2b4fd823c84261907029de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ka/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ka/firefox-52.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7559a392bb227029cc6950d21e222f48744fa7cdba666219ce66697b7ab97c7d036539ee4527d956a0d74c2fe9fd6129c71c6a0faf36062cf001c2b68c973ceb";
+      sha512 = "88a54a3c07aa02e1da990b93975879b29dd87b3c4743357a4a029bd58e793539a039695306de9abf4a01161d61f22049f5a7df2eddb8124b3034be68434412fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kab/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kab/firefox-52.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "f98b871784261f0569aac50f10780bcc79e338d0b385c605a3e348b050e54279e4387daffec826710b8703b2ad38fe8d63d54cf3c12d94da8368091668d9ab3b";
+      sha512 = "31c9197ae7411208cf9fb543da9ea8e21a770ce160a1f109aeba0ee98beea8a760f74d3ba526d8c75b47510bb0475d523592379e511f3a881279b4af49ea2ba8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kk/firefox-52.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "6ecfba23dce0b0ec23c4b309aafc6b6d89a69e889be31dcdffbeed90da4bbecc58c18dfbee6dcb9e09d65a495fc57535457aa7750ebab364cb46a73c548724a4";
+      sha512 = "62cf335828c4ee0f834187c99e2faf03ffe15693d5a7a6d0f9e2756f60f0f014aeb3fa507bbc8dd28a856c98254979c98d5756413c7a7d597b02a2f98bcb5ab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/km/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/km/firefox-52.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b9eef61d168e7f73c537e276c7c4d4ec5ef4e886c10c5c1e0d16c22e07fb68ca39d64b7c0308ae662c73ebd1d1a760638da6000db4ed7a07853f096632df690a";
+      sha512 = "efc614494cb18f21756bb25211c4bdce58af1f43ae927b63c655cd76605a1ee6ea95dedd6398fcf8ef81da2811d8a0e0c46a108a55882e7deea9b27ff089e1c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kn/firefox-52.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "df5cae66a6b62d74d3b55e96135099bee9744edca2e5f3b0e8b21aa9f3cb6228d4477c63d62c18f95eeb06ba774187d214cdf0161be20c7aed7ca9d835722f11";
+      sha512 = "0bfcb783ae230f187133f2fa5eb1fc8d77712e34eb41f73bd64bac7501d28f11bbbf79e7fc0b9a8f00d499b27f7d77917050de7b4c90f0c71387cce149c6e745";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ko/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ko/firefox-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c5d023c4f0034950dbef00bf4ac4945f1e8853e10fbcdb904268bcbb855f5997fa091d7739683776af097524a5a0a602bd05dbab9ede702ec8532b18465ed47e";
+      sha512 = "de4d4f1982351f7013524ee8df8d394888755296724c7c578dc59c5adacf42845aafb31156f69828de49163d72a89f31003140d81b59934bc87ad35e856b9369";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lij/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lij/firefox-52.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1c25e8bdae267c9673783f55dc99a23ba14c904a6763950098591f3a5db2e0007d11fa52506ed86018edfdffa5c3e6a7d3000bc0d30a69381b3a92d9f14192a0";
+      sha512 = "c38525ef79e48ad5e9bc004f2e297598bd86c3aaa578dc525b66b26b5c6b2419daf99b6d45f64739a0d62a03dd281bba2d53b68d4eebdc9ea033b37adc840246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lt/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lt/firefox-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "7c95e21dae9a449617f3405614f8ab934fadd93de771a4aa44a718ccb20e2976922cf88121d9dd3f2fbee892de7d435915b0fc7aa80ec720b297e668beeb042f";
+      sha512 = "ce6a5628317e81dc1b61a2ff3b5a0347624921bda728ac8b4de19d43270bdf294b1e9f1c8f9460594d53a94707a041ec2a4cdfd7363e1a4c273edc9dd68095e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lv/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lv/firefox-52.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "61928f84cd78ca91ad758e4b4fe391a3d50cdae457c66a14511e8770c0f1ba76c986c8a1e07728717642d77557fe8d7f70513f5cf2884566e092482f5b98e18d";
+      sha512 = "43fb630b7202264d98cbefd1b9e7c30c804e6023251e161f5f0d3250d5975b385a3beee08142f32b2c140ab0ed223dbf1909294b3e82def4b0ff7794f5695daa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mai/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mai/firefox-52.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "61ccb7600c1510d6e0480f35f63286cfd095edfeaa24e9ac2540a22fd1ea0c246d221e6e5b4d1f68bdbb1c9071b480240bc660097d2a761ff4166e1b3a6a629c";
+      sha512 = "3db01d1c2b2bc22ab8ad67fcee00c93106b48b2c8859c726d4efb0d66f86088ac2e31ccd4bac5ec76754a9948c77739e7e0473447b227d3ef11743f655705cff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mk/firefox-52.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "89ba4db24bc1e1689925885446846a915adc1bc590f2f65752c54cdf6a69ca21333a4d6ef1b3e9d7252fb890de0ec41b0c6c229b9cd0d03b167e1bf4829befa0";
+      sha512 = "75d8ca10d3ab0e28947e17a5f64ba5fcad21a9ac68784dc2d0cd80d02ff8faafe6aabcb7b26a7c1f05f665ab18fa276e2f28af0fa8487399e6c466ecbb0128a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ml/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ml/firefox-52.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2889ed4020dd1ef59d90dcf727d2758937708b1189bee785640bde9d12b32fdd252cc181c193462fb01421fcac7fe71f5989cdb21a46d8a27939bd814dec1177";
+      sha512 = "7fcf6674469b994b12c8e31fda52be57d8ea9947aeb32dd35f00ac4e0c66d651542b4efaa646c66099bd64c42aeb0358f3a52e4d164b7e91a10bd487eaf23e6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mr/firefox-52.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "d85c03d1dde8003d7f877585e1bd86bf1cd9c3685fa2a3b25d1a0cbe5496b9cf09aa44940babe42fecbe22ab8a261d585695bb441b2e84f29fe4d9721b494361";
+      sha512 = "8784880ce70eb5d0ea160f9f26b4446ffb5ad6796299d36912440076f0cce5f59d3a59aaf7e79eb7b2dad5b5c5001498276891b72d77bc8e9a7df6aaab6bf412";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ms/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ms/firefox-52.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "9e88c9ca69dcc1acb3509d8197a73af221b38e0154e19a0912743064c1a877e23f9966ca111caadebd0245aba019832720aa7e95ac9bcd41c45852aadf7607e3";
+      sha512 = "faaa9c67122e362d011db6b5c403375994f397b3a0270d70468154a8f6f1328dec85f6cb9f3fdb239f3b778a605bb83e64f9b5e1ee99d104fc3abd63fa7a1d17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nb-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nb-NO/firefox-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2b59fc05c2bb90cdd1c8841aca920bb9dd2f4ce125384b1cc91279f3e125668e54bbe8e73efab1d3dc018130f9c1188f0ef7d2d0031255bab6bc16b820b53ddd";
+      sha512 = "755275081354ab0dbd6ba801b918a59df40af7ea94760042c32dfd08c5625fe94104d0eab83a80baaf93b631d65cf9619fa93c49165521cf05e2fde738bf6edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nl/firefox-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cdd2c8feacd7e22dab6762289f9fe7b42dd8581adf70df47f5fe1c69083ad369da2daa8964f846787085bf6932abada8c447b15a7b5693cdd32f4c00eecbb3e8";
+      sha512 = "05c4dabc37487d7ebc379ccab1c062b43124934c885b277d13b7f6adb8563bab04cc55e0c1824d4a66154db6ca6f10ace14deb962645098cc76ba7291db80e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nn-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nn-NO/firefox-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c902e7ad7024e0e2b1acc5ac3b1006edf1d4abc4213db17da4c92628ee3687051363645829db08fd2776221a3048f8373e3a13c6b02f4f13d81f420c93b03df9";
+      sha512 = "fde805c087400922a86557511bfdc8fde97843a7a8e0d138dc83c291219bd29dea404b356d0ff87c1ed907e6e749f73962772b1a3d821505451daf6356327d81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/or/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/or/firefox-52.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "c62a5a2135553015bbbf688bc35fa4ebee02cebb5593f7d31e30f8648bdb715b37161d34ac8310a1a0c0f651c6f336e44a71097c6b09f5cb480b0f0a17e3fff8";
+      sha512 = "47e2bd4cc1c955429f5c28e9ae92833ff7e9211bb1251e01f55a6e0e1709c107d7012c4da3e367c2481e67ba3f2091c9145d93b2920362eea4c33be9904ceacc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pa-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pa-IN/firefox-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "d993d5808649dc7367c38aefe9dbd49d3e434784dc515e1203260da6a6d13968971cb63949f1cf9188d5a05467f07b420825ab752e7ef3f556ca37853f841733";
+      sha512 = "4fe0d44c5b3282b6788656a9d0da4681dae7e5737106fc18d10b339d95359035a8a746f3b5c4364b8beb321f82c9e17059d9eb51b79f5173b60aa0541f51359a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pl/firefox-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e58720685e6e55671c332f916d65ea04301fabb05bc250a56c5aed1f9b1044b333d60ef729e08ca382d775dd35b86d84dd266cd5d5bc0d275f58350a598b7464";
+      sha512 = "d7f1077f616b9d264ad62c04c1734fcf67729f6fdb0a7f3be4a36b33d9ba247550a42b93c8da0c7f2dc1f552278c104a3efaa80bf4cefb1aacf806025b1c1c12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-BR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-BR/firefox-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f26934daddb1f43ef364cb4c97eb9f625a816a2aede791adbfeb3cf959ef1b1c9b75f2e1bdb907be1ea4640956e55ae4facdb67a3323099b12cb23faea0891c1";
+      sha512 = "5cadc49cbd2dbf2af20d99620c7015b2cafa687c1739badcbca0c2daa3435b454fa0fcb001e6ab45d685a950be91963d6649218eeabd6895f530a7f5d007bfd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-PT/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-PT/firefox-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ea0657b1966553e286bb7c610adcea89da7d435675cf575ed4858f207092f0eda5dd3e91a5127679aaa3b8a17efcc660c363327f4ea20590a890cc43d2ebd5ae";
+      sha512 = "f661dbf60b6b844e7fc085492905b2a568a36170150f1712e10ebcc32f9ab57a805b6b9292c2e4451ee72559120867b0b5c589e97ec4efa1ec64c60a2e283317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/rm/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/rm/firefox-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "197b212a29f056b22d3cf5c881bc9dc1b2cd8f47ef5e90573975a180743d81e696f5a3a3ddcd414fcff66979c6fa0e33332e5ef5586ce6e0d2f3ae7e939cd9b9";
+      sha512 = "bea3e8846a1030df7513e8d383cbb82f693951803bbc5954658996052f301747fe2a67cff3ffea2f5b7abdceb028c67c3e66a6189615bc2f90f9c03e53e0cf2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ro/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ro/firefox-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "06143af441806517a03a2ba1293316f1b2979cefa8395ed3b9f3579cc6d23da8ecdd219c8cb53f871d544149e0e2f18ffa9387cd57b2407336866775c56dbcf2";
+      sha512 = "9534563f065de5083af1eaff3ff4bd82079c848092f63fad4b0009e475bb4cc23a8a0c17085c00798b16ff2fb9e3b79f6c3b8e981d9ea083e6f3b8c5edcf3ab1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ru/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ru/firefox-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9680dc697f2760163737a443b345c657da6eb2cd6d6bfab5016675815cdc4a4b393f6f9b91277bdbb2962c7cbd5cce3670a633398a5c59d86d45d47072a72b1a";
+      sha512 = "0cd86a2595715c73a367cac8528abfc07b930274be56f2fe0672161aa27b9e409d9a241ff822d566fed8f4ea7d4795b358e10d929ec77c4992386ad31d49aca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/si/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/si/firefox-52.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "24a870b434a3b58cb93d229f12b58b2316f83e0be6c5e30ff724468116679a90887269af42ffb0080b4bf0866084afdf7767d8d17d3f34a6dd9c30de8de3aa1d";
+      sha512 = "44c760a5c134fe22d0df3e846913f126b2a93129c542e6e4a0d1ad2704d5f275148776568864af08fd4d1f5b50d03d67bb9ca4d07203061522c1974469a27a4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sk/firefox-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "60e5947239a89b616616c1a45375c46463b3a0ff0b2c5d37a4f5eeb6cc8992f21ee5ea87592710a89e1237512179fb84a93f471cbd8e8d7a8dfb506cec39eaac";
+      sha512 = "1af8e84bb1e518e5d21a78a14f4adcbbadc0c3d08afc45923975a320e76492db97f3e0cdc90ea999ff6eb02ef7d717b817bf1ec6ce13d4bbd8e92cad3ce8c6e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sl/firefox-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c3b87002895c5cf12314f7f7c1d784228b50b892eda9c2e94a7630aa5f5bbd35a27963cb008063b53869ff18d6d003deb456ce6506f8a52c5ea11df3b736c312";
+      sha512 = "9d7ca89124f2e1831a762ed210ce89a1ca4cd683382c38083744d1902d357fd7d34e3e573bd54d929a5f03633686f365bdca3ba750c950e97e14209eee65c4fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/son/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/son/firefox-52.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "14437f5b71bc9902fad66e9d7cd3ce144c1dd19a8bfe1f6ce66f7f456da165cc9453b9f314e67e19fca3516d9b2a03b950befa96c2d36cd96593554eaa8a1aff";
+      sha512 = "aa1d0fc504c528e1f2984bf226285e452ded5ab1d650065cea7c3510b0b22c6c87d7cdc4ff4af902a10e471dfad9cb5d513951ef377c28bac250ebef2b67250d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sq/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sq/firefox-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "286d680dabb398e160a1454513938b46d32ab054136b5682533e41d1fea4d860ee192b7de48b822c17ee0386feb05ee2325fe1f135f82b28e8c98b1ab485be1d";
+      sha512 = "b2d59c0e085d7e5be9a81dce19e025d36898dd804a549c3304a5bd4853bc2884f3ad6b88ace53f320eb0f1648bb1be9034b8cd153bdca3a8b1a391d0a3c743fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sr/firefox-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "980ade36ef136932d668222af83d8be9180070c210813abd896ccf90cca0149af2f1b634d147dc63d88bc91a4a9b2411ac24ad50632e49281fb704875e537383";
+      sha512 = "1de0f66b93b22185a58ecae73c1be5497c4d5e2c2f62d9d91775717023e1793cc08fd2ee12e03a39aa008fce8c5a344de92777b00d53dbcf4c80948a627ab329";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sv-SE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sv-SE/firefox-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "95a23a1d149cb95927446fcbc74a6e083b390f1f844d3e783a003f2f7a6699e5f0c72b5090ff9f0cda27df90fb2d1bc34c9c70dca33ef22bd1330e916a1de42d";
+      sha512 = "2f763fc403c14032a2588a2aff730a04c8b3aa4f8b3fa3f812f316db99753a6e9238eba544102800192c879f6c6e5e30e94a1dd11f3cdc77ca79d95e59716d9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ta/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ta/firefox-52.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0fff10acf1d6f427ad848ad852395d70b441cb6a1fb4191ed4671dcf4320665bdd6b3bf697b75331650adcea2bcde8bb07b98e6d0c65912b1573bad6509e35a8";
+      sha512 = "e5096461c09ad9cb8e059772f9ccc90592cd11300ea2055746450b7a32b1d2e6a6ef07fc6c5cd31f7afbecbb23dc231b7608e85b3c1a7530599cd9523c3058b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/te/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/te/firefox-52.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "97fd1e8ce3b2910b99a10bae70b8b2f70abbe7d6306045bdd9b2cda65be070fa2cde5ef950716a22eafb6ac4f841179fe7b982575e8c7ed43e056c8277e5f744";
+      sha512 = "e2ff646646643faab7b63cc1114354e03ce1dafdd7f9aae23b0c56a61e64a707e684fc13707d20e8a00f191cf540afc985521cacc70e66cbd50ce06e78ebe6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/th/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/th/firefox-52.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9da048c44fc7d219d1c6ee0c1298cf98019b1cb14a552d832cb858063e00e3750c364a0bce93bd89a84156ed5cf0e09d5addf0723baf6e607b6516fe1a2a2c6f";
+      sha512 = "724470cf2f1cc4b64f8e2b3c2b49a6fbe67702f76d123f171e637980ab0fadd28731ec31680389dab4ef216e5cd82ff2e3ae1f8eea86e9c8c329406fa41af44e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/tr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/tr/firefox-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7e8aad1d86a396de699c103e2ea422fc2740cd9d70128b30280901ec9df9453fcaf60346db8b1cb82c06ae51108176ef8bcdd4278c1050cefbe71a4f29b3a1e2";
+      sha512 = "eadd1ff93b30212388e4bfb911ed7302badc30f64016366ca2eac69098fd4ab79c8bf7d352d9b91f1fd9c512693585b9673b2aee0ed739dac8db2cf913e1597e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uk/firefox-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "23be58f1f0f75a89fe5ca96c8322b1d3c60b136f479a23b0b96c62767520aa1f09864d7bfc111e924da6c035b03b1eb3f271aecc5799c3c97b7a928c7c8c4a65";
+      sha512 = "2a01e79f7ca1a497605597a2fa164927d5ad6798aa70e8e4f2f72711a6f928ab3a06fe8be288ed220ea7e4e59d24d3283ff9a437ef5359e39392f35e053b33f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uz/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uz/firefox-52.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "fb1f9f93ca6db9510d00c2dc55745cdce67c1e274a952f678d3377d3b3911b20b7a3649acc49c8ad4ca276ae42900ef6560a7a17bf90f758d67208655b9b203d";
+      sha512 = "882daeb95ec0d8ebd5d6c29b06fe55bc66284cbe0b3d8e404798e0db0d33f27cf3df12a7c4f74f122e8a15bbbcdcad3c97f699c66d813821758019d3e1dd0f3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/vi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/vi/firefox-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "925aed6825e77fa78453cab5fc1c2e92e91be01c2890f4fc93bf148c0423a37c3b4deadfb96b466f56cdb95ea0a983f0f4bc2cc41fb1926a4659a701c1d7362a";
+      sha512 = "bef28fbebef2fe622230d72176387bbf4aa115f4aec8b78b4276b1a7c23ad25bb2f92edefa44f989253e7235db6d69f595fa2467a00bd1813b7bc29077347b8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/xh/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/xh/firefox-52.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "1b4297ae13c799cc43b9420c3c6edc7d92700788e77f6871b939fba18120745ad316919b4f8d18528df8da12dea0896ff5e1d78f8699edc72b6cf1f0357c0b6f";
+      sha512 = "dcfdf95811886bea9baa8eb1a46eb4f9419bbeaf1f54d713efc5a3d7d7beaec0d18c79a77221eb7fc246b99aa16193f91de92225fc9c3e8cb795bc9e49887d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-CN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-CN/firefox-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2e9683de094417d96718fb60222d85206b9610123db9bced5905c50da21b42e03133160ad523eeb74df33206e44a6889909dfaa2418b043c5e8024ef871a1502";
+      sha512 = "2650644609f4b2ce2a4d82072fcb95e188334cc0190b9dd2bc13e40a035f60029fffc65fea1a6d644eaa049d31503a68095aa1f8b1df8ac9435708f86741a13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-TW/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-TW/firefox-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "aa1abf501d2ca6bbe71cea5ab885c85f57b88ee68390bdb5a33047f10dbb4e5d4f3c506ee44c62ca293edd3515e32da70d23027aeae23526cbfb9e16402cd803";
+      sha512 = "3c2439185cb7935203dfb774e23dc0cb759f1357b599a026edd93d24c0617bbcb19eded53cb5c55ccadba3f4bc4fe85351c141337d94ee28c102b024e893ae2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ach/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ach/firefox-52.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b01fe99df4dd612bd6e5033782e2dedb5416c7cc9f1de0d659f056371e24340423cd098e7775164c8e605bf895b69a0aae287b131c1533d3175d8ef8b183ae3f";
+      sha512 = "672908e232cb36c8d88229ff9c0cf427363a3e046cd3df21398b67897a179637972e01c08e89623bda23fa4ddbc7c76a2d7f1184a7299665269324f5fe0429fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/af/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/af/firefox-52.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "e42c48a74351afee8e40a791dfa1a20a7a867b4fbf6fbdc9141d4905293646a099c032cb9b52859612d9d16983d11d876bcea0dbc40fa9aa88333345d1d1a788";
+      sha512 = "a6f22c97a43b7ac6d001599f280d01e8cebc1910e6af958d0c9d2058ac2af5b42dab1dc3ac00aac1d2f61d068bff351beaf9514a6baf335a10f3efa0205b4ed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/an/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/an/firefox-52.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "06670ef25bea3800b7a5639ac945c99b7ca67183f89425f597e515385b63c803159a0b18dc27805b9e718c4751ef5232ce9b6ba39c16073e35f47e7910e47624";
+      sha512 = "26b0b7629a11b8ffa20b10eb635c375088d1725a5c829b4f7dfb25d5df3c1a465ec7fc8ce56e36a81794c99ecb758b8462ead8ac4d6f79242c5f6931630e29da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ar/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ar/firefox-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "662cc92061ee62619d4b4f397057ec8142572c74a370be74d75c837e853b97eb17dc798f77e0736f3ca6acd0a4183048e81c5f8a32d57776fa72ab0dfd4f1558";
+      sha512 = "cccc951ad72024eb5790d2a7d668d4103d76ccd6e760504ca7e2e0755d3e41e426f87c6720d53a7668e17cd7b74cfb0ec22d3ff5f23d6cd547e43f97c7f9c609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/as/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/as/firefox-52.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e18f231ea53351d473a0ac4a84abc458fc88eafacc4fac7093657c4b226eef7e52c5b3a4d06616e5556a49929fa79dd68a2f3c1a73e04b9d85ede8ff5b8167c5";
+      sha512 = "1dc216d63a3ba302f532a35d523ff4a3c234c17ae5ad755586ead5fd18b7e530c48c4fd5f8d3a30b679d89a45ed927a5e5a1d6f911f2fe0528989bcaa9128ece";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ast/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ast/firefox-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "05e174a85606820829b279b2226b6f1d2b0f24f6c0b73162b3eaa5955270be8db38c5512aa33c51b0a5df1db304537df5975f061029963eefb5eb06c0174b9b7";
+      sha512 = "384211024df02a1a463a078a255093b8a43b728e7062025cefdc1409c7be63ea97ed74b2f843251b0df6622629d11d667a795e478f1eafdcb6ac5ad2a48cfdfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/az/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/az/firefox-52.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b8fc2bf0d78e511b6c97a731742eb5d36a1ed74f4f6f5a58c8f6652d507b99a51dd6036654d0954488055caeb449be235d006377c3e376b7a650cd14f92945dc";
+      sha512 = "75bdd785a96262d00e7c2ae01cf7314cc6767f99e65e1e73b580fb7e16c93216a8e6180a3cd7dbb479bd5c2d172bfcfc9664cf8977aa9ae6678c0dc9aaca826e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bg/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bg/firefox-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "e10684f0a0f841cbce17a6dba5aacf780fa0c3226f0638d48a29ecd5c22f21b0b882623be6269edba707394f92a581e8719a78dcf28e31505654557add711049";
+      sha512 = "888872d2c630a2e3966a50a1789a8d68f199431ae62b81dec5ac06c0fee37524fbba3fcfd035b7869a3bfcc076cdcab6344e449de3df226cfd6c819898e67e4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-BD/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-BD/firefox-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a5bc927ef7615543b6ad8afa5b61ac08570be96ac0806c8330150ea9bd7e8dbcbc7c51a79bef45c865a05cfb776898435730954ba5b4d336063e0be4880b699c";
+      sha512 = "10277429342c915c2043f4865a5b22741bc729fb8592b9527a42f000943756e9ad8116af30857966d6cb6ae6877ddb6ba2a53e719a4ee42b19963548bf66d9b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-IN/firefox-52.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "72d23cf99c23a4ba414469e823ff0b30947f37f0aeeaa857ab09b22fddb6b224a18f3c3a796288030a1a9ef03f9bf14faf7292e58682e75c5ddb1981a47c8171";
+      sha512 = "31819eea3f2b0d2c90a3bc6f4a60207eba4d1eae568b45cb5d8f48dd500702161d5469c2ab3369358140a413041c1cfd9ce62e892fe5bb0db525b5481fc6a44b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/br/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/br/firefox-52.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "cd5111cd1831c7d7f0498cca21a78f225b9a403cc7e791e0903c88012b6ba31c95b726e8f9df644791350b12a8df5a1d431331a75eb76c8c529935d6447797a7";
+      sha512 = "3320933ae550ab188c8f7f6ad8d317b19439ffe85089e37e23edd24f5ac088b67af4c0968646030683dc02f64ee5c2068cce6f8250114024c8e24f2a9eff0b77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bs/firefox-52.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0871b142576517d4dc2ec2a24322bd8cdc5206356f71ddfb3c71832a9f5e825b2c38471287f2b2e3a699b2331b088dab1291535b66bbd52805ae1dd78f64315f";
+      sha512 = "9ac88212fb64d404c43a2292c8a4ab164ea1fae08249cab6fd8dfeded5e51304ae5b2d870a074c49e8ae14c820742d50700072fb6e5584dcd5ce2a06d7c85899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ca/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ca/firefox-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "4477a8b0650e39a27035913a956acb952f70f0a7c557ee2b97380b195296db4e2af03d08ea6ddf9d1aab699686375db06074796cb16d71807bca0afaa993840d";
+      sha512 = "ea1b4565917e7ffba47a7a030cfa69b8405163ef533c01668a5a65159f2f82b9737f43796fb583306d81216f664afe090e8483c37f348d6d107b5924020d6580";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cak/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cak/firefox-52.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e0cf154538d8580faafeea44494df16995605eae0f7afb97ebad219f4371de3d92127a05dfcc227eeb3cc161a7013f71e45848c41919e3a1ab918521c6e7bc32";
+      sha512 = "a409ae71e157ca692d9919c00ba63679f2e3fe726537fcd49cf38ddae613806be5b9c773a0205013d48815055b6333110d283c48a9651ffb912ba6dedf74accd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cs/firefox-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f6d94786b8068452de617afbfb19d662defc0c00ec412e84ed0fc58ac0510f3b9b98cbe0e26ef98b2fee41d794b46cfbfd307373a04a71a0dbccb49fa29ea916";
+      sha512 = "f236da19b0bea73127a52997a461d704ff7472c3fbac29a57ba54ed18a765eceee6a0a46eceaa70d84de610f7dcdb53fcebdc5b2fb013fb0385e2ffd1fc602cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cy/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cy/firefox-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a794ee2a28402fa0f671b727b16840a8cdf6152e44ff9b0c9bee7bf121a955e570f8d643ae9688db385850e6abd1b9f47574922ad0b3184772184e50370ac788";
+      sha512 = "ace481c656d40e5bb88cacc82220b8384ed7bbb686974caab399f52b362f86c2390306eccc5709ff48d5086493e16dbc8e8f387454eef01e8baeffc05dacc5f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/da/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/da/firefox-52.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "895da18fcfb79737dcfeac111be8a867df75473cc3efa65c81511b9f10a8b1b7373005e42ebafbad9e1f9bb6b1cae23034e66b012cd766c1d0826ac3c919b1a0";
+      sha512 = "50e87a5326f1fba31ae8fe289a022b778136483d0454e81e440198d8e71c29405fbd2c53ea7975b30430d7734298d7e01cc5a9fdc3d3d3adfe6ccb33b4ebda17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/de/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/de/firefox-52.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d212a73bcb4ce90982058e942ec08dbd4054149755dd1cb8f963984b5ad5e7a0c5847760fde105510476f2cea2cb1dca4ccde78a21e9a5769e605e61162505a3";
+      sha512 = "6cab0138fc67670dde0f1b3481d1a6f8d0126d8f336340a52cb87f0cd30942fabdc2a670351f09a63e875a6203f0893c995eec8a556e4240aaf599d0767f4d3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/dsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/dsb/firefox-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "bbbec4179f5ccd5569c0442deaa23015ea9b21a91eccc150838659d399608124ed34b4c57716c1386504e3b74088df705cb4807bf1a12e29b8bc22c5ed15907c";
+      sha512 = "f31b7a88244f60f419bf9a4e64dfd1ee93f406ac0d10ad2c4e63e0cb6260f03fcce45b904433fccad0e3c17b9d6fb999b4810e843be645a9ef283e16e6ae1992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/el/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/el/firefox-52.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f73864a004d1f1bc5460a30ca60f589e7a98d0017b299376e0166ba9bb64b1af6b1523739133c1651945345228130c53bb13c9e9a846afef363a74a9eaf780c4";
+      sha512 = "5a61e800101e0f550d1916fa5bc90fc0bbc201379d5f283cb01901385bc7949a658aab272fbec48d5732907ec7355d8e84c73a46611d46daae31439a64c0bcf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-GB/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-GB/firefox-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "e7e547490b3dd9ed8260c18077e056beab6d523323c51230200a9f1e019fbb8f691e4ad42d936aca546367434d1fe901eb00c1bb16663e47dd8c6f40f0793589";
+      sha512 = "226f999af2ab4274e7e1e83360b432d25609668814ff54480c3df4d081c0f52c617e89d79dafa86f949e7ef8b5b5ac4f873299c90eb97028ca68593179631452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-US/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-US/firefox-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "cf81bd8ea9a98bef6a4ba99e1ed1058bf9cecd2f43bbac310bee8226409512cde220b6a891421adb7166eac83715cbe7e8b41aa96a7ab1cb4d0d8d8a0f15dcbe";
+      sha512 = "00cb5b343e186110d0e55fd28d9f11184af27b697a2e63dad0ea6bbacb274ce946574e6395dcd812ca8d1fdc0bf12968af7abddaa0183ba995452423b2a886aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-ZA/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-ZA/firefox-52.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "853dd3491519ad29536f0ec078aa2f1ab73f4e436aaf9f367a8ad74188818575016292b0b3b1f9da2e94f6b6caeacfc1fc64460d4f7360be63840e45c82361b3";
+      sha512 = "0c66e49588b1b73fdbed23a1de4eecf9a5920c378deb7ebab415d5f7a159983b198ae4191da177170b8015d4975d83271385e3ecce26148d7c0859442ed877a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eo/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eo/firefox-52.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "dd8be779d5bc57be841580a891cb22a2b0743f9cdcd014a6d2e7b430663c74b0d8553571eab972b902dfd5e2f5c19bd9caf6e6d82499595cb7e97ca57580be22";
+      sha512 = "8246ee3309d4dbf8126132a97407f8af71915a3578f6ebf37693262e3be3658454eb12266b00acf62ee7c987985804bf7c4171225b5ec5ebf2cc97927e626049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-AR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-AR/firefox-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7c8928c448295799e73dcdd2c762f52c4c239d09f16c83dbfd1ed1e3f7910144fa41a7d58fa721418d6ed6e6e6f7973de417af67b9dcd68f1db9d32e31d59b93";
+      sha512 = "b962232b534b0603b7bdcd7af4ac05fe136ca7920f9c37f889a203f42a50ead56053f93a49d153edd04e0d4e865ce71a210673514b86d624c1c4820217f76b8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-CL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-CL/firefox-52.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "58ddc5c2020191308d4a6ae23fe2f948592574bb5546a479d7fbfb0e3ace2e9bfbf53a0c26b2bee91e214d2284e8f1c38037b26bfc932c62c5d34dd11e24a84d";
+      sha512 = "034e713a9c5f844fcd2f5911d96dd672c61a3fff9870ab38daab8561d9660b295deb6238b3acc31b0755a043d4c72ea914151a4ffac7a8199ff679d8b1b31272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-ES/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-ES/firefox-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "2aa9e83b82b23e7360cfe1aa8e70131ddd3ec32271ce951fe50aaefa1b45d083c01dfcbd2581dc2377cfca127c16d79f818e1ee09a858f6b0138574a5b8b6b33";
+      sha512 = "8ed0e9d6215aea8c6ffb4212e400063674805329a4cc5135a0d016e04370190349bf166b111c67b43369e43833f8715e53268327696375fc68811e023f55694c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-MX/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-MX/firefox-52.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "689d87ac2ea33dadb20cf6b44426a63e5f058e899c29121caf2d83cf37b13de572e9c32c9e483dedb56f7de198c1745f7e5cab85988399e6790fdf337d85d2e6";
+      sha512 = "a33c8a1ba9e576ac05d3991979028a504cdeddec376fbaf2f2bcca6e4d9fc1edab2f8b34c12f282764b96c49a837bf9d5038a292bb96013233c8e9c60ae65fa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/et/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/et/firefox-52.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "18382e5c6cff469357ea010653665d03a7e9ff9588aa2d6657b98c09ae7f30c2c04c1507475596635843f222419f5caffcd95556eb9b4176ad8d60bf7c5d7f68";
+      sha512 = "4647857b00ddfaf765d1d1cada904d35a2ffae0e0c1d3e2aad073090441d19c5e48b2e837a58ad9d1c20ecff7e44a3bb39f4486c8fb6d84720360e8a5b14827b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eu/firefox-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "5e5464dbfed7e91a087c7b67d715060ff97e24c83b99a68439b823992cd93bbdf994a2977a187761f92d911b19b5f53ce473628a45a8ea160c65bdab3f51c300";
+      sha512 = "327aeee163aa44517914a71971f620116fc68def75e8fc929401c696902f5b6dc35f9c4ca6bc3b4f93f0d116d499e1cf0c49e9296b8e730b3a6d7f644976f109";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fa/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fa/firefox-52.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "34242b1cf86c83920947862561ceff073f818389164f05e88cab01d8949bba2b30a43e212be1bb71e2bb9a2498bd6ab604c52fa169d31b96864c07b747e4e5de";
+      sha512 = "01e489e74b45cf8acb05ec87c4d853ebde51ca228487b8fee9dfece11aac9ed58f0e6a6c2fc6c9935189421d534b2f36e4b51016636c1010a4e93b670aaf9e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ff/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ff/firefox-52.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "ee83ecc78c8b3c7c304971110df8fc9402e67ddcaa8d38bc6a7d0471f3122cbab2a69b578ed85b0d58b0f67bf5e775696e18685e706aacf5787b0d24931df517";
+      sha512 = "b561312de7a9b67ceee00ed5730d8c5951f69d134b93077da06d5bb78f0d26e6a2e89f3acf1141c410f590b1d04c0d50beb78f27007e7bf99255d1dd27fc7347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fi/firefox-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9eac668caa56dd7d819e388d994caa8633d18828e9ce469d0044b90e260a2fcf9b056c5d43274e6392830fa48420b6f3718988e88db70f2820ded2ed6b4527b0";
+      sha512 = "c9fa17537106470d29c2a632df636efe33cccc44ee7cc496321b09dd0c69329fff0063d1a2fb52c336235327923f3ce564ea6bbf513148dceb8d647903663e7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fr/firefox-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9abb5cac7ee05039c374444f7c03604df1b3a79055b1afb42550765ac3f337dcee93cb30f2076697149f560d3d0de4840304259dc9c79325ea04d5585432c1e9";
+      sha512 = "ec5639f4c9c0f1f6bb30aa8e1269b1d772277b34bd5beb965e52a7ab6558da1e481876765cffa21f04f5a13e6cbfef53150051ac0089c3e35949afeb79e1ba10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fy-NL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fy-NL/firefox-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "197d3aa8d9954f4bc6a3a318869310bcd4745b9c611c6df421c0c3f8bbacca48c7118322990a650e00104a429f16cc0eaa81fb56b68c4dca957b14cf2e2746c3";
+      sha512 = "9a2b1e4df459dca591f20d5d389196c4d61ad90b968ade5bdbc006f80ffc7aecf4b6d004bba11bc196be490fa93fb0be5f26dba698518130c9cde120ef11f1cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ga-IE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ga-IE/firefox-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b26159956597932d413e40789e8eda3191cd2e2581e22a4c450bf6a901dd3c40e330fd486a401fed5f2bd94d3affe4763debb118d524aa31d1ff7d1676e02c2d";
+      sha512 = "ed90e0ac43699ddd648a99c008ec775a2cbb34c5de34fb9ce369e1cde7beb8cd98c3d1f56e45910e121bb91f39112a9e7ffeb97f8847bb7ffac76bbfb9aeb762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gd/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gd/firefox-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "38623b6b077c5cee3f4f39bdad198d2a7453a851547a966fc211f4194bff6fee47e7e6022a7600726109fd7043b83ff37275958a1fccb863f57c4e60d175997e";
+      sha512 = "e79d439d2977b10027d6518b7e8dac32e3da9b38cf72a8ebe2521c255bb41682515db2809fac94bcdcddb5e172e090e76ee990f9670fd8b59cab85f17e61222e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gl/firefox-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d9a4287c5c5c28c15d6ac3913ea8cd51b88701ee0c5c091a9127e753d5417eefa7d10bdd159ba63204111ad032498bf80b4c944a194d60a14343db4ee1770d56";
+      sha512 = "ebee1f0b709590d60451be8b8ade78340905b098f08f86214a5816e58f173830902717b68a393c91c5274cbbf8da0fa8915800069e5bb2e48c0973e54c07af9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gn/firefox-52.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "f8ad4718fe88e594eca07cd8ceabd19a51cffb17337eead004b9871f7576fbea35cd5a51434b4225e831f4a76c4fb47f1669936d4ded0953160e978f07e3e6ee";
+      sha512 = "479bae9554c8a8061fb98528ed80a7093444daad909820e7c2ffa3a13384a8b3711ff599fb767345f7edac1ba5eca5aba3cced9a7c1a60577a90c0b7db334813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gu-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gu-IN/firefox-52.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "0cd44e6375a7c11826428a7d13e9b59e73075452806f6f2d8d1e20cd9d32c36e4de684c511544aaf9845ddb6320f8f72657a9f56cae2ab10cc880428bcc55048";
+      sha512 = "ea7f2fa1f5d90e613496affc5f58dea0621fdd36a4c7b04d3559b72b2606941cd315d7de575c649678c3c0e454961c1d8b4a360d1661f6e4fd4e8426cd8aea62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/he/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/he/firefox-52.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "963562443976aa856b5d7e389d057c8bf17bb6045d5f763f5e3f46c500c5f6877d046bebb5515c726bb652b986bde4189fad3c84bc6b8812c7ab6aa47b629d8e";
+      sha512 = "b757a756643c0093757b843b784bafab71d1d7e50e5bc2b2b47b29479dc27ac754ab5d8cfed842cff58de309ec276fe0c0c0ce72adf87dabbcb46f0514eecef8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hi-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hi-IN/firefox-52.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "2ea7bdbf502a950863574bf3502df03a6d2ce8128934f52aa33f2f1d41d41320a0eb0da6b51d0fffe8ffda1ab7dccf72fc904230f2b3f11b82421f55e494a4a8";
+      sha512 = "7fc338870ecedd35d24ed8f20bfcc82d9ca26465704554f3d808f2fed855866d24cf68038651c4975f73a8ec6f90a297160a367132bf1e9b22a69797b311ab02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hr/firefox-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f7f865feab6b90082a59b2d1cf4d5f73380baecdbdda5eabffab3926747c83f3668a5feb4a792e35b56ae47e2c690b2f97b23662f2d5868f6e7be4ec4828f43e";
+      sha512 = "c7be8964891258fce40e7d9062914d6ef418f80ac94c864448e292720f14b58ff1dcedac9cd7aff125a2819ef45c7ebdbb277a1ff87b6e8f1b5ac5e4d4e445b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hsb/firefox-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5aefabeef739ce224cc4d1d3a83f9cca3a5626cb6a3d0026ecf068e5b4283bc16735107f78d5b4ca3748e56489a0463701f1ddc021772f3d3b97ea04254a7d4b";
+      sha512 = "6468362c84079699b82aa0899c4605241e9c55d42acaba84d80120b52aa81be339d9ebb90140ae06b2f33475b972aacf74c6c37fbe7a66b59db314bcd01b9313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hu/firefox-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "fe1c8538d5df66ddf27b2e8e4b2e01fffdba689103371bd5a58f0ed6fe08f704438c440277272a5eeb2c261e51cd6b81d92fc28c23fbd78f87afef3564656199";
+      sha512 = "0c5f56ab09225ced4072e6852be50a352ceb6befda8ba8f420431a6ca3a7d376e73ad11c38044eb7fc1a3a5a8a3dc8f49eba1fea0f17c96401be5a94276e937a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hy-AM/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hy-AM/firefox-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8ed0da0f6df8d2c6ef65f58fc06a25ea1d96b6c69161600b104772c61ddaa3d7a572b9e971e616a6870f57668bdea326b59bdcd968ffcff5485bf8e7399a60aa";
+      sha512 = "c3af17826b66b8faf265c2f2bf8bfd565f916163f3050e8c7d83ca5426749f7c93174be34cfa8b0d0dce6d4ee175ad6977f0fff890f072af1419fd0c8c61145a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/id/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/id/firefox-52.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6f90d870f2964e76b394ba419479f87ad30c0b7677b37305592e028f1611690fa59fe50f32bae694bd30854d8d0cb36c1dd0ff5cb04e3e8d0a3caa779797f734";
+      sha512 = "c12627f8fdc7fce12b5803f989e2a038d041482a86f23ca279e2fc1c54509bc98cc11995dce4a5858b85d9755fe8c44c2171bc1c4371a3e86dba1926caa36553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/is/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/is/firefox-52.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "68559b8cc00c5d0ec92e274e30a10bcacf5c87096617e0a7a0ce30e495482ffd5f2b4f4bc9f61e0f5d41aba722ae2ee12d9a17e2124199717720bd6e4d1a4874";
+      sha512 = "4adf2f31a05f19cc0d075bc47be810cf813535c0152e2e131b0e0017478733e0db2d81cf26867d9701122d3494bc4bc1693e34351ea60e2ca261efea3634a599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/it/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/it/firefox-52.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "3bbbdeae057aafe87b9b7c7c99b67de5c4a2642569570cba9456d680f726a5bace48d785f6871d1731375d0d92084bf30fc60a390dddbd410573f9ffc9c81fce";
+      sha512 = "5fcae4a024210439ab71d41435768283e3cd4ff06d8cbd24e6482559797118398974d42753afb5ddab086cf41f46183827cd3532262625a036c5f22b7de3c9af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ja/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ja/firefox-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "38dbf45822d7d2cabe38f3d0b36a5c0dc93436d42554fc9802c9f69f34241553fc95256edaeb410c9eb16e640e1ba09fd3f6cef48c507660234a892ee1abef43";
+      sha512 = "4a881b1c24cd0d679799373c5b13b5e0c4f03f2ffe4128669db300963a19918b99453446e504f5c25e87331fdc09a300bd6ce567894bf56453a84937d8a4c882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ka/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ka/firefox-52.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d49b3024a54f3ff2ee08b5e9a416b4e3b5ff0a69407d34b8b66a165cd5c9d167adee6cc7107a611a250bbabbf90b798d152d049bcb5c6d59846098035a081afa";
+      sha512 = "c6c120d64184c6171140c23e547b982419f3df12ff5c49ed0a5f7643feabd0d8af0899e9a764b3359d05492bd28598235ca6dc90d0af7dd7cde126243ebf47e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kab/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kab/firefox-52.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6baebe38ecb1412b464702e6ab5d2d46166fc3e4ccaa4e4fb3f012ef5049146136a0eec94849148800d4fc4a1f803caec9fe9ae60b330fd4d97662a61d9bb1a0";
+      sha512 = "f97796c3ed9fb03637decfa6e3fbf53373d8091668ad7adeb778eed173dc3e8e7665ca1aacfa13b2e09410bb5a93e3e3ecf4333292713c55013ba33a93998362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kk/firefox-52.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8300f42545782543318c789f4537bcf12a4e1a1674ed34e11ad3ebc2583aa944ba4f7fb9a92268d36f4c95f4ab06d8b79bb6cf3bd859edbb98c0fc5bc2ac1891";
+      sha512 = "df59e8f662db504fe5368c135a265e0e6f985b14f3402ee0330dee218c699b9828790f3a37081cdf6fca95708770bd1ade2d3140f3c7c804ce624efc74cc2e27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/km/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/km/firefox-52.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8352dc1b0eee5476bc40ba81bd7e387bb36b781df823e900bff4cffa2fce5295aec05aaefe01e24640d3ca015d83d320e95caed91539504f71b2c4591ea9707a";
+      sha512 = "29a03004cce0216508ba7b6f9fdf6f2e9407293c0e95d142d30045cd4ecf347c713c07d12c486dbd7e619e57e500bee15ce6eb539fe9314b7101f6f4fd35cfa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kn/firefox-52.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0767e6bbcd9db184206dbd8d6a8519bee3824451ef1f856608ebf6eb6bfff0266b3f4f680d47fccbe5e86f4b14d8243354f3ca8683d6741d76aa8fa77621e10e";
+      sha512 = "11af63e757722279bb71270349f952e35771a08c3fc182f5a24b02b192775b84d966393c10f19034ef762ea7105b79354642b735e04817465afe90c818ba78ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ko/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ko/firefox-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f9b18473ffddd1f9d9f63d29ce7ba7fbaddf195d57e791a7c2a03e634714b2dc2f811730d9ad1534f2bb6271a79522f32f1e88d365b664df54146db9366f6911";
+      sha512 = "51f8c8a08f605877dbfb44eaf2c552221458780cd5b3f8a4124b096c36543dbe9aef1e4dbf7d8b3775d31a5fdfde2d8b71d1f8b1f7beaa826efb211d8751b9bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lij/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lij/firefox-52.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b72a26fc384860a17bd81f075b7080129711fc9b640b5c332958ece8c47540d2b3ca41c46f35999afdacb15e4f7928b2ba943ae10ed1ea3863a7222f30329756";
+      sha512 = "a8420d626862c54ea298c75bcb19bd90e55c713ca3b6d6802e8a4d8e7c02ddcd260d11392c9011e6fe807c17b3cedfa579d356e766b531819c89e24cdd4d7977";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lt/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lt/firefox-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2b8e656a402b935c640a17db9d3907bb99498180d36fc0b8f2eab2a007fea9d0dddd7283292f549aead49c6ec2c926eeba728e03975905adfc561f159eae5e42";
+      sha512 = "0c577c917af487d700501205e3267d42db0c1b12c8a3168a053e90cabc1a2a4a111355c0f7a1331367afeaf8f20f662b155738ed9ebb1fc987d8086704b938a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lv/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lv/firefox-52.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b571c834c1181c5ba2685c8ae77165cc0dad5a60d45717d2fe9e2528814b2352748295a0817fc127057a1403bd5ee2c154d8eb2d876d3ac428638562c19fa3f6";
+      sha512 = "3df4ca413c2f388d65aef69600be089062731bc3521de3ccb706e1185b5cb40505ac5c9325c8f5d1d91fe8b366d461998eaadd42e090dee1dc4f8b81e0822182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mai/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mai/firefox-52.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "1f703f3f3456d6fdb69f6702a8c7b8e069387862b99e09d9e85ba0d34d35f5ce30bca8268d1332930f55a9d7e614ae77afbfdae5caec7c1fbbc7abb8c9898710";
+      sha512 = "a614b5b82df1b71a3880a7ba75bfcf7bd0047b6be7a49126ce2620a6b76590a9798e142f23dff99a67d569978ba565ddd7a33e3ece69cd2c33cf74c3674cf27b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mk/firefox-52.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "526b2b8709942a6c3d071c39b03625e90aba2e298b89934c3623dd61bc0beb8680729ef8f716375abb0d487507eafe885407a995f3d4365cdaea8b2d0fb55070";
+      sha512 = "029d1a4196ef641b4da250520f852bf2cd27a4396620fa699777a9f470a019070384098bcc25a8d01410cb2e353cc13df60ca7b8a4fdaf89bbcfe9cf50484e6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ml/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ml/firefox-52.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0c36352abe8088a2d0fe151e6e7d39273dafc370e1222e8251859f99b89baa8782bf108cd97c2df7dc22fc1231c6cac5409a3c0bcdb1a849c7f894732bebf78a";
+      sha512 = "078cb38737ff67e92cfb56fa5a9b18ba39479a92d23e2d70c0a45ddf7533f422f8887db6d4c6483da761ef15b93798e1c8edcf9d469ab484b53bb02d256d531b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mr/firefox-52.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "ba013b86e7b16f1d90b1e6328ef9932e3fed6b6e9f2961944ff4a3a00afd0d0c94f9db1b25c54191b50b798bad9e5f740c2b63e094077df562d39634074d1b01";
+      sha512 = "e16481b30598b84768ceef0e3b50f4f022b0b19d48c01f24f4fb2848244a07c8dc3babfcaadfb237dad6f41434e2fec8a51217850fc6af3f2ce8025eb9b68352";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ms/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ms/firefox-52.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a5df3ab9feaaaf459f545154a0f30dafb384febc269e701974e221a6a33e2701777141b7ca15624eeae009e984f4e813d134823ba733955d2deaeccfb1add161";
+      sha512 = "bee27e45bda71129c09ad7c26fc678713bbf1ae066d07adab661a96ea4fe0cb7a2ee561541932ae7869b5fdb2367332001aec45cb3a776c23fd98f96a376a770";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nb-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nb-NO/firefox-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "81e16991c9e68b8fffc47eda12c1858879781a1e512a244cdb5ea202ed4abc8366b587433568b1d31a943520bbf56416b62bd00a52a2db313de619f037f5e87e";
+      sha512 = "e07bb11cc2158ae8d1d5d5c0d3d9380c50aa11091a55f444a7b84cdaa271cacbf2dac42a39f21aaa636bc51678707b54e2ed393f4c2156fa1e407dd0659ca1cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nl/firefox-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "31bc837dd0a974e51712f0e3be8fbd114ebb285d34329a4282d9d41c4927bb031738958997ba77f8ec5ecff09342d2c2dbc13bc8161e8d54d331c55e7df3684c";
+      sha512 = "b3fdc32a487c7c9f519f8f4de6c547054ed58ec85c76991d6268040844012b85b8a85aa7add09fab2e25fbb0a5f9a645cfc5b51d8a18b735f64678cf0ceddb3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nn-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nn-NO/firefox-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "361730a873a3912a10437eb3f766fde1a79f2a8f9f2302e6515fb5fdc34d615fea07a225f9ef25314d4cba2b83b35f9fceda7dbdb31433ebe9cacc2dbcc4794d";
+      sha512 = "b78a4caffd59c8610b783c743f6896db2bffd40a910c394473ec7258525557d922bcd8f993d12c2aacc49763f4f1afa0872658d5dc03be662a285b04b54872ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/or/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/or/firefox-52.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "cbdc0f8f11194bec2894daa29d92ac6c644ba55a6921315d3e30c560d761c226c0673a35c98e19e31afda3992583ce14ecb51ced97077a6a52196f30da7c127d";
+      sha512 = "2c68f1b4c0becb38ebc75720a1af76a2dd1031bb05d4c9aab05b17d486ec18d3fd3733a4d729b29fc7d1dbcf8ca8a9cdde75429c790de62f3930bf3ab7a52bbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pa-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pa-IN/firefox-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "21819c58f4c7e9f98f714e6392283bb2e5aedc3866a5f7360535050d75f8b54b527593af4b0004accce95459545c176cbbefb09199be15e088123556e378c5b2";
+      sha512 = "69022b727226221c9f412ef47340fa4aa4d9495f617add10f343bac457353aa9bb3eee1ebbcbe16d06625e6fa4f77fbc1d6ce2ba021b90acbbfff8e4bc49e62d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pl/firefox-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "293090773a416b8282e8eda9904646390a0b17215a156cb63bee043bf68e69a28656ab880f9c825c280deea9b6c9e13ae55e08284f540c7b50d7b7844c5989f4";
+      sha512 = "3852945b017f4d88f0dd59b824fe5d67a904d736d9b9e180d116ed77a4da66d9a5a624c7706b11885d50817aae3a8890b0e6fee0b01f121a5ffe9ceac4184541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-BR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-BR/firefox-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "ce58560445849eb90798150ebe4ffe6bad23a6cf2bdffe1688b1e0e8da01c088334604a2d32ed9317ba63f9064f4a3ba406a282cf74ca64bbb5abfb0a6c37f6e";
+      sha512 = "59c7d15417a2f81dbadfa23e27b08fef1d9e4d37f93642ced7dad81158e47d12ea28b620af7ebadb419f90f2a340b9b87dbc5321a77a4580573cc8fa4e0b7368";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-PT/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-PT/firefox-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "04f86eb4d434190f313a76a3b366c35cd132930ec5fbcdf6f5bafacbaa7433cb161c278ee28a120dcdb0ea70cd9d2a36cb5fd52d45b6811bf748bde11dc43398";
+      sha512 = "ec95ff787a5dd3f7b736e97e50333828bbd1726b6c88f95502aa92b245d00eb8bb8ce43f665f75f993c530498ce49642aa99d2466fd7b65921390991859c50e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/rm/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/rm/firefox-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "0e1307cae4e83a0c0b883c8b84c623ccdf5f91b2d39097eb4ba86db7cbca70982c9ddf76b7036ce5dc574fbec0f02ccede1bf5ff28e2a53c4afcecab33c0073b";
+      sha512 = "88c28449200c951bbb8a08dccbff253176d62e61776c58900fff1f0bfb9daeb65e3d49f0e4a9bb8a962af40b1174d1878c4162cf6aafee65c643b35cd7535565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ro/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ro/firefox-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "cb93e5a9ba39abab21069206a6267d87773177cda7d5966dfe76cf2a6ea83a00348a7f4b1aadfa890585874a9b2cc2e27cbaba73037f4026a56f7790ce0b7df4";
+      sha512 = "ca333f714287da738d469b32285d9b1496268656206ae4f648896adca89007950548456340b8efbbae61f26b3692f474c1af9112a9d0bc8064502e25a447e6c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ru/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ru/firefox-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3972def5e0d34011e33476306d748e6e8936bedd3a3a4746c21a572bbf1dc71db364b5b4f83506d677d9d148dfe49aefeb56bff91e4943910348e7ec58c791ae";
+      sha512 = "75a19e48ac59114456a6e32f1c7557d6ab9a21377c440e88cd018620f85d14d8ef2538e271f04052c47e311d9eeba78a99d5a0f7550d1c4223d86301365dc763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/si/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/si/firefox-52.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "216f65d5f9ec399cb4317123d4fe9186c3caa1c403df16acf86d1987c356c32db809155bc3d9904c7396951a09b8398e402bb93d269372c924da7e690a7569d1";
+      sha512 = "6423857acae37915ebdd69b1e5868bbe7d8b578f48e7c87fc4ce2dadbb812098a37627c53cc7d56dc66a9431bb8a995e28dc837ebc50cc14ce3edc0cfc6e7733";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sk/firefox-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a23944d43660d5d151b8fa618303aa5cc673eec16868ceb3b1b1c7e197f6a707cc511f63ea07263fabf20ec75d630dd699f0ec8cb2c5fc53d1642b35c90b4e2d";
+      sha512 = "19e49096ff410d3abf571895c73af14a1977ea2b44f9aab917f7d6df6cf172187f40e13faaaab095ff659b5ef17457ce315c7af8de60bf50e599048d2cac4a24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sl/firefox-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ff3bd653e64c26f387c231687d4f26502ba284138596bb1f5f75549476270be712242c42be07902faed80bc327bba49f2be37db3ffa5258a9c944c3408461cb0";
+      sha512 = "aa81792a46431668d7c73c937e88997adc1fc79f570d1984d48ef328ba2543aa4e3b0bba83084cad75c911566e762d8f6c689bd938367ce5940bef52fb218823";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/son/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/son/firefox-52.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "adfcae5aa31e9c153b53234c9c10ff51927b8785e0952c233aff08a3de800d7b0076c9304368a0ffd52ef91b9aab1dd0718a5228c28300b03fac69edfebba0dc";
+      sha512 = "db4e58058f5a96ff86716a94ac5cfd08d286770560ce9d2dd0b4e66c2b2cb2de49044d0add4e47afea815910435b89c4ded953d4c8908bcf2bd0b006d8eb2e1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sq/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sq/firefox-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32f039f1f05771766d0413d0ed9a526c5cb21a0ebf5688ed577afa73e39d482cbec87878c8acd2ddf56e048992ef0c37725a6209d89add9fab72c48bcf135553";
+      sha512 = "412b08900c697b8aacca05a0e8e972d5f8a94c659fcb43883ee53e5e70ebefa6ef96ae25b7053bc0652a1600b2fc552effa62add6ad126a2ff00614b7c956873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sr/firefox-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "22a0ec9854a80f0ca6aeaf8baa98d72d0781b6e67af899701686a8b4def205b90d9b9084a2d0b160b690d4fbfc6eb55c6bb6cfaffe9f1e394b484f264fade306";
+      sha512 = "2a6d6d5c4d8215b08e0de5f85c9bb20df27975a27ef81f7706c78d6315fa73adb99b7676237463d73a376ebfe1960702291b38100e9035d4f9961270e07a5a50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sv-SE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sv-SE/firefox-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3f1204d3b069dbfcfac753ec72ca7265008f2543c14455fec81f4cab1cacb815c1529e7c9b50672552acf6855c2de81645428bb5ae43d514d2aeab3c750159d1";
+      sha512 = "6c12add3fc10a2bba6603418662e02331d6266a4df5b05a25a921f5da3f5235366e7114dabf2cd8d41b27b43932f14ebfdf10d30baea9b065a1d6a419ec887ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ta/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ta/firefox-52.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4f32b734fd4e4cfa1f031516176ba82b9128cf7f9577eef1b5243aaf20dc719697c86330fe58feb54aa650109fd33a97ce3e6c0d5639ca7a40d90208a0a195f7";
+      sha512 = "63532f2d237a8533ce87872e939cab06345cafb7e51488972c51f9a63f16bcc768d21a13574b798bf09ae9412b827f95cf3acda33a08082e764a9fbbc026a044";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/te/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/te/firefox-52.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "55cc6c548a2f0a89ecbced9aa9903089d04771d97e71f99ca943f73c489e8f3dd0fb0a3f999d641d5162b3f43a0b2058eec62ee5009f7d796ac89d013ac15426";
+      sha512 = "42a37106d3921dbc65dd4ef1729513c6bc97cb9b0a7412c44223d07b49b5b2d48b3275fff1454cc022935d32741a434fbc45387a2151629c24f832a04b9baee8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/th/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/th/firefox-52.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "64202fab7515634d5cc12845902e4c0df6b1e4b59606f1c4ca779ed684edd329915b9e133b19b465ac6343d5af91572b767171f56c7ea2883d1dd216a39eb1b8";
+      sha512 = "6707469f29aad81f15e9522e49373b39988598f40ad4e4afee0fcdee9551e66aa74d94d31268fa0fb62f7ef69f6eda177d7b30408691af694ad6475db30c5612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/tr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/tr/firefox-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "aec62567d934fae018c8ab4273c7f3a7350ea1e14820990374ab2542c512e005536e851b6fe315667c9ec63d48ed391ffa896fe7cbd24405945ed7f8aca4d945";
+      sha512 = "6c6ecc7d4fcbb967217b1c174a993b711485eec530cbc171d64b9f777b867b4ee1a6e17ea3fe054fa3c1e6255c28c3ffcdc3beccd28546977714f0d5cada7871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uk/firefox-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e1f3df0c6637cfa394ae0d2829b24b486d0af39d46f7747e77e579e0ad4325663ba312504f5cdbc5fc2da378e7205a5e9528df99e61af20b9df58f8cf1cd54db";
+      sha512 = "d7cd7d0b100ad257c92444d9637e924d5900b9b99f04e205149e79e59c757fae741ec3f6cd01842efe1c7f219c594cece5d7a9345925a8765ee4d3245afe5215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uz/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uz/firefox-52.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c095ff29e2c42920975400b0f80a55e22b3334859d82dde662fd9a8889884bdb045601522e961f4d0f6c6c934a5d42cc838fd263e91337fa9838479acb2064fc";
+      sha512 = "c1ded0aa9b6975a71b5132349521f745648bd2cf74aacf71764120cfb5c663ffc23615e62bfa662feab8c6e8c2cc40f8d0bc5b707c8cf7619de9b712d893a7f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/vi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/vi/firefox-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "14ae54681bd1a6e48f94c6d624e00a034689489e631f4216beb019baa51f35f00eb2a764c66a4e79762c9d1188659b78e5ad50b8187354863abe9b501d4fef77";
+      sha512 = "fd19f568b5467df2f92ffb4367bbac35ff36979c875847433da573cee0f6fc24cac1c538e197a53c1a920bc274e4715a3f3734df131fc00ae8972b1a14218418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/xh/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/xh/firefox-52.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "6bcba0e20540cb93811aae08f6b10e0cf6a9108528fd0f00aa84d2af9d982578d4e03f034e6d0f155fac4519ff0ea90f3d8aa4731aafc179a5a497a26d224ef9";
+      sha512 = "58d10220a9ae70cddd7e814071a57f944654edd58abf8dba6a083a9de0d6b1887f09e3e6756896ca65d49622dd2981dc7abafdb655187650b7aff7023b87c60d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-CN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-CN/firefox-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ffa67e88d736bdb41dd7bc046bdfa02161f3c703e992615cd98df788cce5e9f97a610f8b7b31e825dcf17dff790029081aa13316433db2c2ecd06de6aec4f811";
+      sha512 = "59fd16400cde462fc339e5df5dd8c21dcea02cc8d46268ee01566d0a5e3188d51bb71ece2516fa2ca141b8f93fe35aa97af92841f0a7211760708f01d5cbcc36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-TW/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-TW/firefox-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d67b82836f4035ac4050751b9235d49bafb2bbea2da9d1b209451e0fc3cbf54ce70b4111d66f107a22be30baa6b6a043c2736f6e05961f0aa3cff95531601134";
+      sha512 = "f288f83fc827221d46e656c5217e16b2fe23d1d9cde279ccf64824ded9135c4ea0ea3d3657a22aaab6e42f679a7c1040fe5de0875f57ae568712f1e6287177b1";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index f2da6257efd12..68e3bf1b2022f 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -148,8 +148,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "51.0.1";
-    sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312";
+    version = "52.0";
+    sha512 = "bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
@@ -158,8 +158,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "45.7.0esr";
-    sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d";
+    version = "52.0esr";
+    sha512 = "7e191c37af98163131cbba4dcc820a4edc0913d81c3b2493d9aad0a2886e7aed41a990fa5281ccfb08566ecfdfd7df7353063a01ad92d2ec6e1ce19d277b6e67";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ad1091c9d39e5..f2ca9eaa622bb 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -17,7 +17,7 @@ browser:
 , desktopName ? # browserName with first letter capitalized
   (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
 , nameSuffix ? ""
-, icon ? browserName, libtrick ? true
+, icon ? browserName
 }:
 
 let
@@ -52,16 +52,15 @@ let
   gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
   gtk_modules = [ libcanberra_gtk2 ];
 
-in
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   inherit name;
 
   desktopItem = makeDesktopItem {
     name = browserName;
-    exec = browserName + " %U";
+    exec = "${browserName}${nameSuffix} %U";
     inherit icon;
     comment = "";
-    desktopName = desktopName;
+    desktopName = "${desktopName}${nameSuffix}";
     genericName = "Web Browser";
     categories = "Application;Network;WebBrowser;";
     mimeType = stdenv.lib.concatStringsSep ";" [
@@ -84,39 +83,27 @@ stdenv.mkDerivation {
         exit 1
     fi
 
-    makeWrapper "${browser}/bin/${browserName}" \
+    makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
         --suffix LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
-        --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" \
+        --suffix PATH ':' "$out/bin" \
+        --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
         ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''}
 
-    ${ lib.optionalString libtrick
-    ''
-    libdirname="$(echo "${browser}/lib/${browserName}"*)"
-    libdirbasename="$(basename "$libdirname")"
-    mkdir -p "$out/lib/$libdirbasename"
-    ln -s "$libdirname"/* "$out/lib/$libdirbasename"
-    script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")"
-    mv "$out/bin/${browserName}${nameSuffix}" "$script_location"
-    ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}"
-    ''
-    }
-
     if [ -e "${browser}/share/icons" ]; then
         mkdir -p "$out/share"
         ln -s "${browser}/share/icons" "$out/share/icons"
     else
         mkdir -p "$out/share/icons/hicolor/128x128/apps"
-        ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
+        ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \
             "$out/share/icons/hicolor/128x128/apps/${browserName}.png"
     fi
 
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
+    install -D -t $out/share/applications $desktopItem/share/applications/*
 
     # For manpages, in case the program supplies them
     mkdir -p $out/nix-support
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 148e20f1bbcbd..be2a836a085ca 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.13";
+  version = "2.14";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405";
+    sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
   };
 
   buildInputs =
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://links.twibright.com/;
     description = "A small browser with some graphics support";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ raskin urkud viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 0985c86949aff..b2d70b1f767c8 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4";
+    sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
index 709491a76f8ad..e321b2c1b0ace 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
@@ -1,21 +1,21 @@
 # This file was generated by go2nix.
 [
   {
-    goPackagePath = "github.com/alexzorin/libvirt-go";
+    goPackagePath = "github.com/docker/machine";
     fetch = {
       type = "git";
-      url = "https://github.com/alexzorin/libvirt-go";
-      rev = "9359c4feb97212380aa05213fa30c4b7348365f0";
-      sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa";
+      url = "https://github.com/docker/machine";
+      rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea";
+      sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd";
     };
   }
   {
-    goPackagePath = "github.com/docker/machine";
+    goPackagePath = "github.com/libvirt/libvirt-go";
     fetch = {
       type = "git";
-      url = "https://github.com/docker/machine";
-      rev = "bb37dc7806687013c0c3097342ef7db4257655d2";
-      sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03";
+      url = "https://github.com/libvirt/libvirt-go";
+      rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f";
+      sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl";
     };
   }
 ]
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 46105f34b5b76..a73ec99cb9fb9 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -1,25 +1,21 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
 
 buildGoPackage rec {
   name = "docker-machine-kvm-${version}";
-  version = "0.7.0";
+  version = "0.8.2";
 
   goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
   goDeps = ./kvm-deps.nix;
 
   src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "dhiltgen";
-    repo = "docker-machine-kvm";
-    sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6";
+    rev    = "v${version}";
+    owner  = "dhiltgen";
+    repo   = "docker-machine-kvm";
+    sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
   };
 
-  buildInputs = [ libvirt ];
-
-  postInstall = ''
-    mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm
-  '';
+  buildInputs = [ libvirt pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/dhiltgen/docker-machine-kvm;
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c773d8ac23a4b..fcc17df3fc46b 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -5,14 +5,14 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "0njx4vzr0cpr3dba08w0jrlpfb8qrmxq5lqfrk3qrx29x5y6i6hi"
-             else "0i21m1pys6rdxcwsk987l08lhzpcbg4bdrznaam02g6jj6jxvq0x";
+             then "0cdcabsx5l4jbpyj3zzyz5bnzks6wl64bmzdsnk41x92ar5y5yal"
+             else "12f3b7s5lwpvzx4wj6i6h62n4zjshqf206fxxwpwx9kpsdaw6xdi";
 
 # TODO: compile from source
 
 in stdenv.mkDerivation rec {
   pname = "minikube";
-  version = "0.16.0";
+  version = "0.17.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     sha256 = "${checksum}";
   };
 
-  phases = [ "installPhase" ];
+  phases = [ "installPhase" "fixupPhase" ];
 
   buildInputs = [ makeWrapper ];
 
@@ -28,6 +28,10 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm755 ${src} $out/bin/${pname}
+  '';
+
+  fixupPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/minikube"
 
     wrapProgram $out/bin/${pname} \
       --prefix PATH : ${binPath}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 2f57456f309cf..7dc2c5ed49823 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.8.7";
+  version = "0.8.8";
 
   goPackagePath = "github.com/hashicorp/terraform";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "hashicorp";
     repo   = "terraform";
     rev    = "v${version}";
-    sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
+    sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index b7845b177060a..e2641b2d6571c 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.10.3";
+  version = "0.11.0";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1vyyal4m8qwmlsvd2hriwvgly17iava0siyx7gdhy6dcs8ivc4ng";
+    sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index dcc8ee66fb420..31f9f9a2b7032 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "9350193373dc6d4bb4d6af55675c11ca7fc4230c";
-      sha256 = "0n9b1szwf69mjmf7dgl1b2hv3aqjhih2pvfcjxnv1xgbigm821w2";
+      rev = "78568b07950e5e7948496878fe99b9436add41d4";
+      sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
-      sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
+      rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
+      sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
     };
   }
 ]
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 3ceb9c4d81646..95a2e8877c317 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
+, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
+, glib_networking }:
 
 stdenv.mkDerivation rec {
   version = "1.3.3";
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [
-    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest glib_networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
 
   meta = {
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 01707dd1ff32f..ca8d7f2076eca 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -1,42 +1,35 @@
-{ stdenv, fetchgit
+{ stdenv, fetchFromGitHub
 , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool
 , libunwind, ncurses, curl, jansson, texinfo
 , automake, autoconf
 }:
 
-let
-  s = rec {
-    baseName="freetalk";
-    version="4.0rc6";
-    name="${baseName}-${version}";
-    url="https://github.com/GNUFreetalk/freetalk";
-    rev = "refs/tags/v${version}";
-    sha256="1wr3q40f4gwmr0vm6w07d5vzr65q6llk9xxq75klpcj83va5l3xv";
-  };
-  buildInputs = [
-    guile pkgconfig glib loudmouth gmp libidn readline libtool
-    libunwind ncurses curl jansson texinfo
-    autoconf automake
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchgit {
-    inherit (s) url rev sha256;
+stdenv.mkDerivation rec {
+  name = "freetalk-${version}";
+  version = "4.1";
+  
+  src = fetchFromGitHub {
+    owner = "GNUFreetalk";
+    repo = "freetalk";
+    rev = "v${version}";
+    sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
   };
 
   preConfigure = ''
-    patchShebangs .
     ./autogen.sh
   '';
 
-  meta = {
-    inherit (s) version;
+ buildInputs = [
+    guile pkgconfig glib loudmouth gmp libidn readline libtool
+    libunwind ncurses curl jansson texinfo
+    autoconf automake
+  ];
+
+  meta = with stdenv.lib; {
     description =  "Console XMPP client";
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
     downloadPage = "http://www.gnu.org/software/freetalk/";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index ee05f16a8f4f8..30fedec1a4bbe 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -8,11 +8,11 @@ assert stdenv.isLinux;
 stdenv.mkDerivation rec {
 
   name = "jitsi-${version}";
-  version = "2.8.5426";
+  version = "2.10.5550";
 
   src = fetchurl {
     url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
-    sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6";
+    sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
   };
 
 
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index 9db7ec368b08e..e477bdfe2fd41 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -8,20 +8,20 @@
 +#mkdir -p $HOME/.sip-communicator/log
 +
 +cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
- 
+
  # Get architecture
  ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
-@@ -6,10 +11,12 @@
+@@ -6,7 +11,9 @@
  # Additionnal JVM arguments
  CLIENTARGS=""
- 
+
 +NATIVELIBS="lib/native/linux-64"
- if [ $ARCH -eq 32 ]
+ if [ $ARCH = 32 ]
  then
      CLIENTARGS="-client -Xmx256m"
 +    NATIVELIBS="lib/native/linux"
  fi
- 
+
  export PATH=$PATH:native
 -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
 +LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index cc58736afa590..30e4992ff36cd 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -1,30 +1,58 @@
-{ stdenv, fetchFromGitHub, pidgin, glib, json_glib, mercurial, autoreconfHook } :
+{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } :
 
-stdenv.mkDerivation rec {
-  name = "purple-facebook-${version}";
-  version = "2016-04-09";
+
+let
+  pidginHg = fetchhg {
+    url = "https://bitbucket.org/pidgin/main";
+    # take from VERSION file
+    rev = "c9b74a765767";
+    sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "purple-facebook-0.9.0";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "66ee77378d82";
-    sha256 = "0kr9idl79h70lacd3cvpmzvfd6il3b5xm2fj1sj96l7bjhiw9s3y";
+    rev = "v0.9.0-c9b74a765767";
+    sha256 = "1f7jhmaj15p3c9s4xmfygrpav9c8wq0vilbi5cj4jysb7xgndlqv";
   };
 
-  preAutoreconf = "./autogen.sh";
+  postPatch = ''
+    # we do all patching from update.sh in preAutoreconf
+    echo "#!/bin/sh" > update.sh
+  '';
+
+  preAutoreconf = ''
+    for FILE in $(cat MANIFEST_PIDGIN); do
+        install -Dm644 "${pidginHg}/$FILE" "pidgin/$FILE" || true
+    done
+
+    touch $(cat MANIFEST_VOIDS)
+
+    patchdir="$(pwd)/patches"
+    pushd pidgin
+
+    for patch in $(ls -1 "$patchdir"); do
+      patch -p1 -i "$patchdir/$patch"
+    done
+    popd
+
+    ./autogen.sh
+  '';
 
   makeFlags = [
     "PLUGIN_DIR_PURPLE=/lib/pidgin/"
     "DATA_ROOT_DIR_PURPLE=/share"
-    "DESTDIR=$(out)"
   ];
 
-  postInstall =  ''
+  installPhase = ''
     mkdir -p $out/lib/purple-2
     cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/
   '';
 
-  buildInputs = [ pidgin glib json_glib mercurial autoreconfHook];
+  buildInputs = [pidgin glib json_glib mercurial autoreconfHook];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 240aebe917530..fa0c72f0ca059 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "2.3.4";
+  version = "2.5.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -26,6 +26,7 @@ let
     stdenv.cc.cc
     systemd
 
+    xorg.libxkbfile
     xorg.libX11
     xorg.libXcomposite
     xorg.libXcursor
@@ -42,8 +43,8 @@ let
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd";
+        url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+        sha256 = "1rrhgqmz0ajv2135bzykv3dq0mifzf5kiycgrisk2sfxn6nwyyvj";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";
@@ -59,7 +60,7 @@ in stdenv.mkDerivation {
     mkdir -p $out
     dpkg -x $src $out
     cp -av $out/usr/* $out
-    rm -rf $out/usr $out/share/lintian
+    rm -rf $out/etc $out/usr $out/share/lintian
 
     # Otherwise it looks "suspicious"
     chmod -R g-w $out
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400ec..700fab0611640 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.unix;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 05fea05fd14e2..9c2ab08babcf2 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -33,5 +33,8 @@ python2Packages.buildPythonApplication rec {
     license = [ licenses.asl20 licenses.agpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
+    knownVulnerabilities = [
+      "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104"
+    ];
   };
 }
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index f3fdea59e48dd..b348010c61f1c 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,41 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages
-, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
-, webkitgtk, json_glib, gobjectIntrospection, gst_all_1
-, libnotify
-, makeWrapper
+{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
+, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1
+, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg
+, gobjectIntrospection, glib_networking
 }:
 
 let
   pname = "liferea";
-  version = "1.10.19";
-  inherit (pythonPackages) python pygobject3;
+  version = "1.12-rc2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "1h6x8xd4ldrgw9mbf2gwf7wxi6z34h0d0rnwy9kyskdcgkymvi80";
+    sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb";
   };
 
-  buildInputs = with gst_all_1; [
-    pkgconfig intltool python
-    glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
-    webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
-    gnome3.libpeas gnome3.dconf
-    gst-plugins-base gst-plugins-good gst-plugins-bad
-    gnome3.libgnome_keyring gnome3.defaultIconTheme
-    libnotify
-    makeWrapper
-  ];
+  nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
+
+  buildInputs = [
+    glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
+    libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
+    librsvg glib_networking libnotify
+  ] ++ (with gst_all_1; [
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+  ]);
+
+  pythonPath = with python3Packages; [ pygobject3 pycairo ];
 
   preFixup = ''
-    for f in "$out"/bin/*; do
-      wrapProgram "$f" \
-        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
+    buildPythonPath "$out $pythonPath"
+    gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 99ba36ca71563..74f0ef392efc5 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.0.0";
+  version = "6.4.5";
   name = "frostwire-${version}";
 
   src = fetchurl {
-    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.x86_64.tar.gz";
-    sha256 = "16rpfh235jj75vm4rx6qqw25ax3rk2p21l6lippbm0pi13lp2pdh";
+    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
+    sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z";
   };
 
   inherit jre;
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/frostwire
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.frostwire.com/;
     description = "BitTorrent Client and Cloud File Downloader";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.gavin ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ gavin ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index b1181960f41a3..6d204de9ac438 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
 
-let
-  version = "1.19.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ncdc-${version}";
+  version = "1.20";
 
   src = fetchurl {
     url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
-    sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6";
+    sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca";
   };
 
-  buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Modern and lightweight direct connect client with a friendly ncurses interface";
     homepage = http://dev.yorhel.nl/ncdc;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux; # arbitrary
-    maintainers = [ stdenv.lib.maintainers.ehmry ];
+    license = licenses.mit;
+    platforms = platforms.linux; # arbitrary
+    maintainers = with maintainers; [ ehmry ];
   };
 }
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index bc75fb5f9a485..f51b41d85686b 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -6,12 +6,14 @@
 }:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "znc-1.6.3";
+  name = "znc-${version}";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733";
+    sha256 = "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423";
   };
 
   buildInputs = [ openssl pkgconfig ]
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
     homepage = http://wiki.znc.in/ZNC;
-    maintainers = with maintainers; [ viric schneefux ];
+    maintainers = with maintainers; [ viric schneefux lnl7 ];
     license = licenses.asl20;
     platforms = platforms.unix;
   };
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 0ae0732da27f2..d24c59b87d997 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,6 +1,30 @@
-{ fetchurl, stdenv, dpkg, makeWrapper, which
-, gcc, orc, xorg, qt4, zlib
-, ...}:
+{ fetchurl, stdenv, dpkg, which
+, alsaLib
+, desktop_file_utils
+, dbus
+, libcap
+, fontconfig
+, freetype
+, gcc
+, gconf
+, glib
+, icu
+, libxml2
+, libxslt
+, orc
+, nss
+, nspr
+, qt5
+, sqlite
+, xorg
+, xlibs
+, zlib
+# The provided wrapper does this, but since we don't use it
+# we emulate the behavior.  The downside is that this
+# will leave entries on your system after uninstalling mendeley.
+# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u')
+, autorunLinkHandler ? true
+}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -12,20 +36,49 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.16.3-stable";
+  shortVersion = "1.17.8-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv"
-    else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz";
+    then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7"
+    else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5";
 
   deps = [
+    qt5.qtbase
+    qt5.qtsvg
+    qt5.qtdeclarative
+    qt5.qtwebchannel
+    qt5.qtquickcontrols
+    qt5.qtwebkit
+    qt5.qtwebengine
+    alsaLib
+    dbus
+    freetype
+    fontconfig
     gcc.cc
+    gconf
+    glib
+    icu
+    libcap
+    libxml2
+    libxslt
+    nspr
+    nss
     orc
-    qt4
+    sqlite
     xorg.libX11
+    xlibs.xcbutilkeysyms
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXext
+    xorg.libXrender
+    xorg.libXi
+    xorg.libXcursor
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.xcbutilimage
     zlib
   ];
 
@@ -39,19 +92,33 @@ stdenv.mkDerivation {
     sha256 = sha256;
   };
 
-  buildInputs = [ dpkg makeWrapper which ];
+  nativeBuildInputs = [ qt5.makeQtWrapper ];
+  buildInputs = [ dpkg which ] ++ deps;
 
   unpackPhase = "true";
 
   installPhase = ''
     dpkg-deb -x $src $out
-    mv $out/opt/mendeleydesktop/{bin,lib,plugins,share} $out
+    mv $out/opt/mendeleydesktop/{bin,lib,share} $out
 
     interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf)))
-    patchelf --set-interpreter $interpreter $out/bin/mendeleydesktop
-
-    librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib:$out/lib/qt"
-    wrapProgram $out/bin/mendeleydesktop --prefix LD_LIBRARY_PATH : "$librarypath"
+    patchelf --set-interpreter $interpreter \
+             --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \
+             $out/bin/mendeleydesktop
+    paxmark m $out/bin/mendeleydesktop
+
+    wrapQtProgram $out/bin/mendeleydesktop \
+      --add-flags "--unix-distro-build" \
+      ${stdenv.lib.optionalString autorunLinkHandler
+      ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
+
+    # Remove bundled qt bits
+    rm -rf $out/lib/qt
+    rm $out/bin/qt* $out/bin/Qt*
+
+    # Patch up link handler script
+    wrapProgram $out/bin/install-mendeley-link-handler.sh \
+      --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] }
   '';
 
   dontStrip = true;
diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index 5076a8f586e3a..ad571cd8b186c 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -18,15 +18,10 @@ python3Packages.buildPythonPackage rec {
 
   patchPhase = ''
       substituteInPlace ./setup.py \
-        --replace "/usr/share" "$out/usr/share"
+        --replace "/usr/share" "usr/share"
 
       substituteInPlace ./libqnotero/_themes/default.py \
-        --replace "/usr/share" "$out/usr/share"
-  '';
-
-  postInstall = ''
-      mkdir -p "$out/usr/share/qnotero"
-      mv resources "$out/usr/share/qnotero"
+         --replace "/usr/share" "$out/usr/share"
   '';
 
   meta = {
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index ee01643d85ea0..97d1db83a162b 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
     license = with licenses; gpl2Plus;
     maintainers = with maintainers; [ ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index d9bbda9512a7c..f87a26cda8a5d 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,21 +7,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.3.2";
+  name = "R-3.3.3";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j";
+    sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss";
   };
 
-  buildInputs = [ bzip2 gfortran libX11 libXmu libXt
-    libXt libjpeg libpng libtiff ncurses pango pcre perl readline
-    texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk openblas curl ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
+  buildInputs = [
+    bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
+    pango pcre perl readline texLive xz zlib less texinfo graphviz icu
+    pkgconfig bison imake which jdk openblas curl
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
-  patches = [ ./no-usr-local-search-paths.patch ./zlib-version-check.patch ];
+  patches = [ ./no-usr-local-search-paths.patch ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -55,26 +55,23 @@ stdenv.mkDerivation rec {
       OBJC="clang"
   '' + ''
     )
-    echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
-  '';
-
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
-    sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
+    echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
+    echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo"
   '';
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = withRecommendedPackages;
+  doCheck = true;
+  preCheck = "bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.r-project.org/";
     description = "Free software environment for statistical computing and graphics";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
     longDescription = ''
       GNU R is a language and environment for statistical computing and
@@ -95,9 +92,9 @@ stdenv.mkDerivation rec {
       user-defined recursive functions and input and output facilities.
     '';
 
-    platforms = stdenv.lib.platforms.all;
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    platforms = platforms.all;
+    hydraPlatforms = platforms.linux;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    maintainers = [ maintainers.peti ];
   };
 }
diff --git a/pkgs/applications/science/math/R/zlib-version-check.patch b/pkgs/applications/science/math/R/zlib-version-check.patch
deleted file mode 100644
index 83cfed2cac4cd..0000000000000
--- a/pkgs/applications/science/math/R/zlib-version-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/configure b/configure
-index cf368ce..dc528ff 100755
---- a/configure
-+++ b/configure
-@@ -35507,10 +35507,11 @@ else
- #include <string.h>
- #include <zlib.h>
- int main() {
--#ifdef ZLIB_VERSION
--/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
--   version on the master site zlib.net */
--  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
-+#ifdef ZLIB_VERNUM
-+  if (ZLIB_VERNUM < 0x01250) {
-+    exit(1);
-+  }
-+  exit(0);
- #else
-   exit(1);
- #endif
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 0dd1222b0965b..ccdd666e90bd5 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
 
-stdenv.mkDerivation rec {
-  name = "fricas-1.2.2";
+let
+  version = "1.3.1";
+  name = "fricas-" + version;
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url    = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
-    sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
+    url    = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
+    sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx";
   };
 
   buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
new file mode 100644
index 0000000000000..8fb1095dc581a
--- /dev/null
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -0,0 +1,41 @@
+{ fetchFromGitHub
+, buildPythonPackage
+, stdenv
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "nitpick";
+  version = "1.1";
+  name = "${pname}-${version}";
+
+  format = "other";
+  disabled = !isPy27;
+  
+  src = fetchFromGitHub {
+    owner = "travisb-ca";
+    repo = pname;
+    rev = version;
+    sha256 = "11gn6nc6ypwivy20bx1r0rm2giblwx6jv485zk875a9pdbcwbrf6";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/src
+    install -m 755 -t $out/share/src nitpick.py
+  
+    mkdir -p $out/bin
+    ln -s $out/share/src/nitpick.py $out/bin/nitpick
+  '';
+
+  meta = {
+    description = "A distributed issue tracker";
+    longDescription = ''
+      Nitpick is a distributed issue tracker. It helps keep track of which nits you
+      should pick. It's intended to be used with source code such that the issues can
+      follow the code via whatever VCS or distribution mechanism.
+    '';
+    homepage = http://travisbrown.ca/projects/nitpick/docs/nitpick.html;
+    license = with stdenv.lib.licenses; gpl2;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 824ef9661b8e7..157e4903e52eb 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,23 +1,37 @@
-{ pkgs, stdenv, fetchurl, pythonPackages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
+{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
+, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
 
 let
-  inherit (pythonPackages) dbus-python buildPythonApplication pygtk;
+  inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
 
 in buildPythonApplication rec {
-  name = "devede-3.23.0";
+  name = "devede-4.8.8";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "http://www.rastersoft.com/descargas/${name}.tar.bz2";
-    sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1";
+  src = fetchFromGitHub {
+    owner = "rastersoft";
+    repo = "devedeng";
+    rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68";
+    sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
   };
 
-  buildInputs = [ ffmpeg ];
+  nativeBuildInputs = [
+    gettext wrapGAppsHook
+  ];
 
-  propagatedBuildInputs = [ pygtk dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit ];
+  buildInputs = [
+    ffmpeg
+  ];
+
+  propagatedBuildInputs = [
+    gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+  ];
 
   postPatch = ''
-    substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede"
+    substituteInPlace setup.py --replace "'/usr'," ""
+    substituteInPlace src/devedeng/configuration_data.py \
+      --replace "/usr/share" "$out/share" \
+      --replace "/usr/local/share" "$out/share"
   '';
 
   meta = with stdenv.lib; {
@@ -25,6 +39,5 @@ in buildPythonApplication rec {
     homepage = http://www.rastersoft.com/programas/devede.html;
     license = licenses.gpl3;
     maintainers = [ maintainers.bdimcheff ];
-    broken = true;  # tarball is gone
   };
 }
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
new file mode 100644
index 0000000000000..e59469c704cb6
--- /dev/null
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, pkgconfig
+, flex, bison, gettext
+, xineUI, wxSVG
+, fontconfig
+, xmlto, docbook5, zip
+, cdrtools, dvdauthor, dvdplusrwtools
+, dvdisasterSupport ? true, dvdisaster ? null
+, thumbnailSupport ? true, libgnomeui ? null
+, udevSupport ? true, libudev ? null
+, dbusSupport ? true, dbus ? null
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "dvdstyler-${version}";
+  srcName = "DVDStyler-${version}";
+  version = "3.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
+    sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q";
+  };
+
+  nativeBuildInputs = 
+  [ pkgconfig ];
+
+  packagesToBinPath =
+  [ cdrtools dvdauthor dvdplusrwtools ];
+
+  buildInputs =
+  [ flex bison gettext xineUI
+    wxSVG fontconfig xmlto
+    docbook5 zip makeWrapper ]
+  ++ packagesToBinPath
+  ++ optionals dvdisasterSupport [ dvdisaster ]
+  ++ optionals udevSupport [ libudev ]
+  ++ optionals dbusSupport [ dbus ]
+  ++ optionals thumbnailSupport [ libgnomeui ];
+
+  binPath = makeBinPath packagesToBinPath;
+
+  postInstall = ''
+    wrapProgram $out/bin/dvdstyler \
+      --prefix PATH ":" "${binPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A DVD authoring software";
+    longDescription = ''
+    DVDStyler is a cross-platform free DVD authoring application for the
+    creation of professional-looking DVDs. It allows not only burning of video
+    files on DVD that can be played practically on any standalone DVD player,
+    but also creation of individually designed DVD menus. It is Open Source
+    Software and is completely free.
+
+    Some of its features include:
+    -  create and burn DVD video with interactive menus
+    - design your own DVD menu or select one from the list of ready to use menu
+      templates
+    - create photo slideshow
+    - add multiple subtitle and audio tracks
+    - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
+    - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
+      video formats
+    - support of multi-core processor
+    - use MPEG and VOB files without reencoding
+    - put files with different audio/video format on one DVD (support of
+      titleset)
+    - user-friendly interface with support of drag & drop
+    - flexible menu creation on the basis of scalable vector graphic
+    - import of image file for background
+    - place buttons, text, images and other graphic objects anywhere on the menu
+      screen
+    - change the font/color and other parameters of buttons and graphic objects
+    - scale any button or graphic object
+    - copy any menu object or whole menu
+    - customize navigation using DVD scripting
+    '';
+    homepage = http://www.dvdstyler.org/;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index eb184933964b8..ca44742b0461e 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index fdaa049fa428b..069c3ba7800b7 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 841587fcab30f..b0891a3d69f36 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index f50a41129adb1..571f46de38546 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
+    sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg";
   };
 
   patches = [ ./fix-paths.patch ];
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index 3b5aff984e424..3bca24379142a 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hasklig-${version}";
-  version = "0.9";
+  version = "1.1";
 
   src = fetchurl {
     url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip";
-    sha256 = "0rav55f6j1b8pqjgwvw52b92j2m630ampamlsiiym2xf684wnw2d";
+    sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index c3a49011c1d9a..4d662cf52a998 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,7 +1,9 @@
 { callPackage, pkgs }:
 rec {
   mate-common = callPackage ./mate-common { };
+  mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+  mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
 }
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 7a7ad23c6bdde..b020351afe210 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-common-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.16";
+  major-ver = "1.17";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "02pj5ry3c7p5sd2mp9dsshy0ij0xgv00bxr4vvmnm027hv2silrl";
+    sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc";
   };
 
   meta = {
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
new file mode 100644
index 0000000000000..fcb66c9ad7993
--- /dev/null
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name      = "mate-desktop-${version}";
+  version   = "${major-ver}.${minor-ver}";
+  major-ver = "1.17";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g";
+  };
+
+  propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ];
+
+  buildInputs = with pkgs; [
+      intltool
+      pkgconfig
+
+      gnome3.dconf
+      gnome3.gtk
+      gnome3.defaultIconTheme
+  ];
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  meta = with stdenv.lib; {
+    description = "Library with common API for various MATE modules";
+    homepage    = "http://mate-desktop.org";
+    license     = licenses.gpl2;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8acef03387151..ab699c78c0efa 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.16";
+  major-ver = "1.17";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1zldw22p1i76iss8car39pmfagpfxxlfk1fdhvr4x5r6gf36gv7d";
+    sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
new file mode 100644
index 0000000000000..dd380f39477a1
--- /dev/null
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name      = "mate-terminal-${version}";
+  version   = "${major-ver}.${minor-ver}";
+  major-ver = "1.17";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f";
+  };
+
+  buildInputs = with pkgs; [
+     intltool
+     pkgconfig
+     glib
+     itstool
+     libxml2
+
+     mate.mate-desktop
+
+     gnome3.vte
+     gnome3.gtk
+     gnome3.dconf
+  ];
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  meta = with stdenv.lib; {
+    description = "The MATE Terminal Emulator";
+    homepage    = "http://mate-desktop.org";
+    license     = licenses.gpl3;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ace5f289ab4d8..36ef85aeb124d 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -32,9 +32,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   thunar          = callPackage ./core/thunar.nix { };
   thunarx-2-dev   = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs.
   thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
-  thunar-archive-plugin 
+  thunar-archive-plugin
                   = callPackage ./thunar-plugins/archive { };
-  thunar-dropbox-plugin 
+  thunar-dropbox-plugin
                   = callPackage ./thunar-plugins/dropbox { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
@@ -89,8 +89,11 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
   xfce4_netload_plugin          = callPackage ./panel-plugins/xfce4-netload-plugin.nix          { };
   xfce4_notes_plugin            = callPackage ./panel-plugins/xfce4-notes-plugin.nix            { };
+  xfce4_mailwatch_plugin        = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix        { };
+  xfce4_mpc_plugin              = callPackage ./panel-plugins/xfce4-mpc-plugin.nix              { };
   xfce4-sensors-plugin          = callPackage ./panel-plugins/xfce4-sensors-plugin.nix          { };
   xfce4_systemload_plugin       = callPackage ./panel-plugins/xfce4-systemload-plugin.nix       { };
+  xfce4_timer_plugin            = callPackage ./panel-plugins/xfce4-timer-plugin.nix            { };
   xfce4_verve_plugin            = callPackage ./panel-plugins/xfce4-verve-plugin.nix            { };
   xfce4_xkb_plugin              = callPackage ./panel-plugins/xfce4-xkb-plugin.nix              { };
   xfce4_weather_plugin          = callPackage ./panel-plugins/xfce4-weather-plugin.nix          { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
new file mode 100644
index 0000000000000..dd80259db5fab
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-mailwatch-plugin";
+  ver_maj = "1.2";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+    libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Mailwatch plugin for Xfce panel";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
new file mode 100644
index 0000000000000..6a2f5bd508499
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+libxfcegui4, xfconf, gtk, exo }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-mpc-plugin";
+  ver_maj = "0.4";
+  ver_min = "5";
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7";
+  };
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+    libxfcegui4 xfconf gtk exo ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "MPD plugin for Xfce panel";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
new file mode 100644
index 0000000000000..17dcb10c9d1ed
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-timer-plugin";
+  ver_maj = "1.6";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf
+    gtk ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  hardeningDisable = [ "format" ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Battery plugin for Xfce panel";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
new file mode 100644
index 0000000000000..00ec11abc47b6
--- /dev/null
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -0,0 +1,170 @@
+{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+, perl, which, pkgconfig, patch, fetchpatch
+, pcre, cacert
+, Security, Foundation, bash }:
+
+let
+
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  clangHack = writeScriptBin "clang" ''
+    #!${stdenv.shell}
+    exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+  '';
+
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_bootstrap}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.8";
+
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "go";
+    rev = "go${version}";
+    sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch ];
+  buildInputs = [ pcre ]
+    ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
+  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+  hardeningDisable = [ "all" ];
+
+  prePatch = ''
+    patchShebangs ./ # replace /bin/bash
+
+    # This source produces shell script at run time,
+    # and thus it is not corrected by patchShebangs.
+    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+      --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+    # Remove the timezone naming test
+    sed -i '/TestLoadFixed/areturn' src/time/time_test.go
+
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+
+    # Disable cgo lookup tests not works, they depend on resolver
+    rm src/net/cgo_unix_test.go
+
+  '' + optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + optionalString stdenv.isDarwin ''
+
+    # Disabling `format_test.go` because it fails on Darwin for an
+    # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727
+    rm src/time/format_test.go
+
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+
+    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+    sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
+    sed -i '1 a\exit 0' misc/cgo/errors/test.bash
+  '';
+
+  patches =
+    [ ./remove-tools-1.8.patch
+      ./cacert-1.8.patch
+      ./creds-test.patch
+      ./remove-test-pie-1.8.patch
+    ];
+
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  configurePhase = ''
+    mkdir -p $out/share/go/bin
+    export GOROOT=$out/share/go
+    export GOBIN=$GOROOT/bin
+    export PATH=$GOBIN:$PATH
+  '';
+
+  postConfigure = optionalString stdenv.isDarwin ''
+    export PATH=${clangHack}/bin:$PATH
+  '';
+
+  installPhase = ''
+    cp -r . $GOROOT
+    ( cd $GOROOT/src && ./all.bash )
+  '';
+
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+    ln -s $out/share/go/bin $out/bin
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ go_bootstrap ];
+
+  meta = with stdenv.lib; {
+    branch = "1.8";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/cacert-1.8.patch
new file mode 100644
index 0000000000000..bf44e123711fa
--- /dev/null
+++ b/pkgs/development/compilers/go/cacert-1.8.patch
@@ -0,0 +1,80 @@
+diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
+index a4b33c7..9700b75 100644
+--- a/src/crypto/x509/root_cgo_darwin.go
++++ b/src/crypto/x509/root_cgo_darwin.go
+@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) {
+ import "C"
+ import (
+ 	"errors"
++	"io/ioutil"
++	"os"
+ 	"unsafe"
+ )
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
+ 
+ 	var data C.CFDataRef = nil
+ 	err := C.FetchPEMRoots(&data)
+diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
+index 66cdb5e..bb28036 100644
+--- a/src/crypto/x509/root_darwin.go
++++ b/src/crypto/x509/root_darwin.go
+@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) {
+ 		println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy)))
+ 	}
+
+-	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
+-	data, err := cmd.Output()
+-	if err != nil {
+-		return nil, err
+-	}
+-
+ 	var (
+ 		mu          sync.Mutex
+ 		roots       = NewCertPool()
+ 		numVerified int // number of execs of 'security verify-cert', for debug stats
+ 	)
+
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
++
++	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
++	data, err := cmd.Output()
++	if err != nil {
++		return nil, err
++	}
++
+ 	blockCh := make(chan *pem.Block)
+ 	var wg sync.WaitGroup
+diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+index 7bcb3d6..3986e1a 100644
+--- a/src/crypto/x509/root_unix.go
++++ b/src/crypto/x509/root_unix.go
+@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
++
+ 	var firstErr error
+ 	for _, file := range certFiles {
+ 		data, err := ioutil.ReadFile(file)
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.8.patch b/pkgs/development/compilers/go/remove-test-pie-1.8.patch
new file mode 100644
index 0000000000000..d09e143c74c19
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-test-pie-1.8.patch
@@ -0,0 +1,23 @@
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index c51dcea..8fbec5e 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -461,17 +461,5 @@ func (t *tester) registerTests() {
+ 		})
+ 	}
+
+-	// Test internal linking of PIE binaries where it is supported.
+-	if t.goos == "linux" && t.goarch == "amd64" {
+-		t.tests = append(t.tests, distTest{
+-			name:    "pie_internal",
+-			heading: "internal linking of -buildmode=pie",
+-			fn: func(dt *distTest) error {
+-				t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag(""))
+-				return nil
+-			},
+-		})
+-	}
+-
+ 	// sync tests
+ 	t.tests = append(t.tests, distTest{
+ 		name:    "sync_cpu",
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/remove-tools-1.8.patch b/pkgs/development/compilers/go/remove-tools-1.8.patch
new file mode 100644
index 0000000000000..b53e48e1a515d
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools-1.8.patch
@@ -0,0 +1,35 @@
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index 9706b8b..f250751 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1513,7 +1513,7 @@ func init() {
+ }
+ 
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+ 
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index 441dcd9..a50277e 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -230,6 +230,17 @@ func GOROOT() string {
+ 	return sys.DefaultGoroot
+ }
+ 
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++	s := gogetenv("GOTOOLDIR")
++	if s != "" {
++		return s
++	}
++	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index e6f98a1219461..f0f3a130ef68d 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
   # work around broken build system
   NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
 
+  # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
+  # (setting it to an absolute path causes include files to go to $out/$out/include,
+  #  because the absolute path is interpreted with root at $out).
+  cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
+
   prePatch = ''
     substituteInPlace hphp/util/generate-buildinfo.sh \
       --replace /bin/bash ${stdenv.shell}
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 354c8f4e5f57e..ecf975bf76f16 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchgit, boost, cmake, jsoncpp }:
+{ stdenv, fetchzip, fetchgit, boost, cmake }:
+
+let jsoncpp = fetchzip {
+  url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
+  sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
+}; in
 
 stdenv.mkDerivation rec {
   version = "0.4.8";
@@ -13,9 +18,13 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8
+    substituteInPlace deps/jsoncpp.cmake \
+      --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp}
+    substituteInPlace cmake/EthCompilerSettings.cmake \
+      --replace 'add_compile_options(-Werror)' ""
   '';
 
-  buildInputs = [ boost cmake jsoncpp ];
+  buildInputs = [ boost cmake ];
 
   meta = {
     description = "Compiler for Ethereum smart contract language Solidity";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dd5d42b8a9f73..6163e177a8983 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -448,6 +448,16 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
+  # See instructions provided by Peti in https://github.com/NixOS/nixpkgs/issues/23036
+  purescript = super.purescript.overrideScope (self: super: {
+    # TODO: Re-evaluate the following overrides after the 0.11 release.
+    aeson = self.aeson_0_11_3_0;
+    http-client = self.http-client_0_4_31_2;
+    http-client-tls = self.http-client-tls_0_2_4_1;
+    pipes = self.pipes_4_2_0;
+    websockets = self.websockets_0_9_8_2;
+  });
+
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
@@ -624,20 +634,6 @@ self: super: {
     haskell-src-exts = self.haskell-src-exts_1_19_1;
   };
 
-  # https://github.com/yesodweb/Shelly.hs/issues/106
-  # https://github.com/yesodweb/Shelly.hs/issues/108
-  # https://github.com/yesodweb/Shelly.hs/issues/130
-  shelly =
-    let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch {
-                url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch";
-                sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69";
-              });
-    in overrideCabal drv (drv : {
-         # doJailbreak doesn't seem to work for build-depends inside an
-         # if-then-else block so we have to do it manually.
-         postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal";
-       });
-
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
@@ -873,4 +869,10 @@ self: super: {
   # https://github.com/snoyberg/yaml/issues/106
   yaml = disableCabalFlag super.yaml "system-libyaml";
 
+  # https://github.com/diagrams/diagrams-lib/issues/288
+  diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
+
+  # https://github.com/cartazio/arithmoi/issues/49
+  arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; });
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 32348f2c90953..03a905ea3d110 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -43,9 +43,9 @@ self: super: {
   # These packages are core libraries in GHC 7.10.x, but not here.
   binary = self.binary_0_8_4_1;
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 16c1ff4f0652a..ca271e6c271e6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -37,9 +37,9 @@ self: super: {
   # These packages are core libraries in GHC 7.10.x, but not here.
   binary = self.binary_0_7_6_1;
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 6a7fe29b80fa0..54cd16957edc0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -191,6 +191,7 @@ self: super: {
   unordered-containers = dontCheck super.unordered-containers;
 
   # GHC versions prior to 8.x require additional build inputs.
+  dependent-map = addBuildDepend super.dependent-map self.semigroups;
   distributive = addBuildDepend super.distributive self.semigroups;
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 5aea83e7567db..ee6e59c65ef3f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -36,8 +36,8 @@ self: super: {
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 32d3c89d5fe31..3bbfa34fb5022 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -35,8 +35,8 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index ffd6845b1d054..27fed51e6fc8e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -34,8 +34,8 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
@@ -100,8 +100,12 @@ self: super: {
   semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
+  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;
 
+  # Breaks a dependency cycle between QuickCheck and semigroups
+  unordered-containers = dontCheck super.unordered-containers;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 4b18332648db8..1be8f16a7d587 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -65,7 +65,7 @@ self: super: {
     mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
     mtl = super.mtl_2_2_1;
     transformers = super.transformers_0_4_3_0;
-    haskeline = self.haskeline_0_7_2_1;
+    haskeline = self.haskeline_0_7_3_1;
     transformers-compat = disableCabalFlag super.transformers-compat "three";
   })) (drv: {});
 
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 826869f828b12..e4a4f74907a88 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -47,10 +47,10 @@ self: super:
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   bin-package-db = null;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_1;
   hpc = self.hpc_0_6_0_2;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   xhtml = self.xhtml_3000_2_1;
 
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 47fb3f7f87f1a..76c460786c1e5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,6 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
+  - store < 0.4.1               # https://github.com/fpco/store/issues/104
   # LTS Haskell 8.3
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
@@ -2247,6 +2248,13 @@ extra-packages:
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
   - zlib < 0.6                          # newer versions break cabal-install
+  - aeson == 0.11.3.0                   # purescript 0.10.7
+  - bower-json == 1.0.0.1               # purescript 0.10.7
+  - optparse-applicative == 0.13.1.0    # purescript 0.10.7
+  - http-client == 0.4.31.2             # purescript 0.10.7
+  - http-client-tls == 0.2.4.1          # purescript 0.10.7
+  - pipes == 4.2.0                      # purescript 0.10.7
+  - websockets == 0.9.8.2               # purescript 0.10.7
 
 package-maintainers:
   peti:
@@ -2480,6 +2488,7 @@ dont-distribute-packages:
   amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-codebuild:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ec2:                                 [ i686-linux ]
   amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-health:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2489,12 +2498,15 @@ dont-distribute-packages:
   amazonka-polly:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-rekognition:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-s3:                                  [ i686-linux ]
+  amazonka-s3-streaming:                        [ i686-linux ]
   amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-shield:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-sms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-swf:                                 [ i686-linux ]
   amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2654,6 +2666,7 @@ dont-distribute-packages:
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3566,6 +3579,7 @@ dont-distribute-packages:
   direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3678,6 +3692,7 @@ dont-distribute-packages:
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easytensor:                                   [ i686-linux ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3934,6 +3949,7 @@ dont-distribute-packages:
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-statistics:                             [ i686-linux ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3951,6 +3967,7 @@ dont-distribute-packages:
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format-numbers:                               [ i686-linux ]
   format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   formattable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4156,6 +4173,7 @@ dont-distribute-packages:
   github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-tools:                                 [ i686-linux ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4788,6 +4806,7 @@ dont-distribute-packages:
   hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4812,6 +4831,8 @@ dont-distribute-packages:
   higher-leveldb:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   highjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson-swagger:                             [ i686-linux ]
+  highjson-th:                                  [ i686-linux ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4933,6 +4954,7 @@ dont-distribute-packages:
   hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hora:                                         [ i686-linux ]
   ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5155,6 +5177,7 @@ dont-distribute-packages:
   http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-link-header:                             [ i686-linux ]
   http-pony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5427,6 +5450,7 @@ dont-distribute-packages:
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jenga:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5434,6 +5458,7 @@ dont-distribute-packages:
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jose-jwt:                                     [ i686-linux ]
   jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5858,6 +5883,7 @@ dont-distribute-packages:
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  machines-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5946,6 +5972,8 @@ dont-distribute-packages:
   mech:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mediabus:                                     [ i686-linux ]
+  mediabus-rtp:                                 [ i686-linux ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6340,6 +6368,7 @@ dont-distribute-packages:
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  octane:                                       [ i686-linux ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6445,6 +6474,7 @@ dont-distribute-packages:
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude-lens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6764,7 +6794,6 @@ dont-distribute-packages:
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7073,6 +7102,7 @@ dont-distribute-packages:
   rncryptor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   robot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rocksdb-haskell:                              [ i686-linux ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7119,6 +7149,7 @@ dont-distribute-packages:
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7246,6 +7277,7 @@ dont-distribute-packages:
   servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-docs:                                 [ i686-linux ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7328,6 +7360,7 @@ dont-distribute-packages:
   sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sigma-ij:                                     [ i686-linux ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7657,6 +7690,7 @@ dont-distribute-packages:
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger2:                                     [ i686-linux ]
   swagger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7736,6 +7770,7 @@ dont-distribute-packages:
   tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7912,6 +7947,7 @@ dont-distribute-packages:
   total:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tower:                                        [ i686-linux ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8145,6 +8181,7 @@ dont-distribute-packages:
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ViennaRNA-bindings:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8190,6 +8227,7 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-auth:                          [ i686-linux ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8480,6 +8518,7 @@ dont-distribute-packages:
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yet-another-logger:                           [ i686-linux ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8521,6 +8560,7 @@ dont-distribute-packages:
   zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zip:                                          [ i686-linux ]
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7ba06b6b60c1b..df17c769ea2d0 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -56,7 +56,7 @@ let
 
       haskellSrc2nix = { name, src, sha256 ? null }:
         let
-          sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"'';
+          sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
         in pkgs.stdenv.mkDerivation {
           name = "cabal2nix-${name}";
           buildInputs = [ pkgs.cabal2nix ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0c70f42b65f98..d9ebdb70b82cb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3450,19 +3450,22 @@ self: {
      }) {};
 
   "DPutils" = callPackage
-    ({ mkDerivation, base, containers, criterion, kan-extensions
-     , parallel, pipes, QuickCheck, tasty, tasty-quickcheck, tasty-th
-     , vector
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , kan-extensions, lens, mtl, parallel, pipes, pipes-bytestring
+     , pipes-parse, QuickCheck, quickcheck-instances, stringsearch
+     , tasty, tasty-quickcheck, tasty-th, transformers, vector
      }:
      mkDerivation {
        pname = "DPutils";
-       version = "0.0.0.2";
-       sha256 = "cfa99cdd515cffd20f5c20ad100d4793ea3d36f650a7c049bc7182efec5cc33e";
+       version = "0.0.1.0";
+       sha256 = "2640e8e994275b3227578d33551f60528da345ad336c287b10136113f0de11a8";
        libraryHaskellDepends = [
-         base containers kan-extensions parallel pipes QuickCheck vector
+         base bytestring containers kan-extensions parallel pipes QuickCheck
+         stringsearch transformers vector
        ];
        testHaskellDepends = [
-         base containers kan-extensions parallel pipes QuickCheck tasty
+         base bytestring containers kan-extensions lens mtl parallel pipes
+         pipes-bytestring pipes-parse QuickCheck quickcheck-instances tasty
          tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
@@ -4543,6 +4546,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Empty" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "Empty";
+       version = "0.1.0.1";
+       sha256 = "62afb83e3ca21f67181289f6496e566ffb2bbadfec91f170bc6f40a76212953d";
+       libraryHaskellDepends = [ base containers ];
+       description = "A type class for empty containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Encode" = callPackage
     ({ mkDerivation, base, Cabal, containers, mtl }:
      mkDerivation {
@@ -8022,8 +8036,8 @@ self: {
      }:
      mkDerivation {
        pname = "HSH";
-       version = "2.1.2";
-       sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
+       version = "2.1.3";
+       sha256 = "54df051277d3dfe263277e2c2416ecb5f1515bc69729870f13749b495565670d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13750,22 +13764,23 @@ self: {
 
   "PrimitiveArray" = callPackage
     ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
-     , deepseq, DPutils, hashable, OrderedBits, primitive, QuickCheck
-     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th
-     , vector, vector-binary-instances, vector-th-unbox
+     , containers, deepseq, DPutils, hashable, log-domain, OrderedBits
+     , primitive, QuickCheck, smallcheck, tasty, tasty-quickcheck
+     , tasty-smallcheck, tasty-th, text, vector, vector-binary-instances
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.7.1.0";
-       sha256 = "d950e1f842ff65012484a7d0c03f1b3e990d3ff6bdd08eecdac4d478f9af23f6";
+       version = "0.8.0.0";
+       sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector deepseq DPutils
-         hashable OrderedBits primitive QuickCheck smallcheck vector
-         vector-binary-instances vector-th-unbox
+         hashable log-domain OrderedBits primitive QuickCheck smallcheck
+         text vector vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
-         tasty-th
+         base containers QuickCheck smallcheck tasty tasty-quickcheck
+         tasty-smallcheck tasty-th
        ];
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
@@ -13774,17 +13789,18 @@ self: {
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
-    ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-postscript
-     , diagrams-svg, log-domain, QuickCheck, split, test-framework
-     , test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, diagrams, diagrams-contrib, diagrams-lib
+     , diagrams-postscript, diagrams-svg, filepath, log-domain
+     , QuickCheck, split, test-framework, test-framework-quickcheck2
+     , test-framework-th
      }:
      mkDerivation {
        pname = "PrimitiveArray-Pretty";
-       version = "0.0.0.1";
-       sha256 = "cd1b84ee169bb3fa05eac16916158a622984a78e9ddaca834deec3f79e6095ac";
+       version = "0.0.0.2";
+       sha256 = "87d0b2c42dc47f3c6c42b94dcd543b09bdc512e67f81c7ab72368cc374bc894d";
        libraryHaskellDepends = [
-         base diagrams diagrams-lib diagrams-postscript diagrams-svg
-         log-domain split
+         base diagrams diagrams-contrib diagrams-lib diagrams-postscript
+         diagrams-svg filepath log-domain split
        ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -17477,16 +17493,22 @@ self: {
      }) {};
 
   "ViennaRNA-bindings" = callPackage
-    ({ mkDerivation, array, base, c2hs }:
+    ({ mkDerivation, array, base, c2hs, QuickCheck, tasty, tasty-hunit
+     , tasty-silver, tasty-th
+     }:
      mkDerivation {
        pname = "ViennaRNA-bindings";
-       version = "0.1.2.2";
-       sha256 = "83169ef8f28901644c36446b12322ab5e63b5d5c5a007de4fad878ddb61eff1b";
+       version = "0.233.1.1";
+       sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       testHaskellDepends = [
+         array base QuickCheck tasty tasty-hunit tasty-silver tasty-th
+       ];
+       homepage = "https://github.com/choener/ViennaRNA-bindings";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -20189,6 +20211,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_0_11_3_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
+     , QuickCheck, quickcheck-instances, scientific, syb, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.11.3.0";
+       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist fail ghc-prim
+         hashable mtl scientific syb tagged template-haskell text time
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-orphans bytestring containers ghc-prim
+         hashable HUnit QuickCheck quickcheck-instances tagged
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, dlist
@@ -22719,6 +22770,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -23394,6 +23446,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -23418,6 +23471,7 @@ self: {
        homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-s3-streaming_0_2_0_1" = callPackage
@@ -23703,6 +23757,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -28400,15 +28455,18 @@ self: {
      }:
      mkDerivation {
        pname = "azubi";
-       version = "0.2.0.0";
-       sha256 = "c3ac3b5ff5960c7ba0349bae282be1b0e4f361268b85aa80d57f399bac5a455c";
+       version = "0.2.0.1";
+       sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651";
        libraryHaskellDepends = [
          base Diff directory filepath options process unix
        ];
-       testHaskellDepends = [ base filepath hspec ];
+       testHaskellDepends = [
+         base Diff directory filepath hspec options process unix
+       ];
        homepage = "http://palovandalo.com/azubi";
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-acs" = callPackage
@@ -29327,6 +29385,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "basic-prelude_0_6_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, hashable
+     , lifted-base, ReadArgs, safe, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "basic-prelude";
+       version = "0.6.1.1";
+       sha256 = "f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7";
+       libraryHaskellDepends = [
+         base bytestring containers filepath hashable lifted-base ReadArgs
+         safe text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/basic-prelude";
+       description = "An enhanced core prelude; a common foundation for alternate preludes";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "basic-sop" = callPackage
     ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
      mkDerivation {
@@ -30258,8 +30335,8 @@ self: {
      }:
      mkDerivation {
        pname = "bimaps";
-       version = "0.1.0.1";
-       sha256 = "c143b5e2643d3c679b0e3083fe46a447eeab4fbac1f979c593c5c189f047ba04";
+       version = "0.1.0.2";
+       sha256 = "9774dd645620074f0b95d8c29183f4bf328944f571b2dbe9c0f02d508c6d9520";
        libraryHaskellDepends = [
          aeson base binary cereal cereal-vector containers deepseq hashable
          primitive storable-tuple unordered-containers vector
@@ -34431,15 +34508,13 @@ self: {
      }) {};
 
   "bson-mapping" = callPackage
-    ({ mkDerivation, base, bson, compact-string-fix, template-haskell
-     , th-lift
-     }:
+    ({ mkDerivation, base, bson, template-haskell, text, th-lift }:
      mkDerivation {
        pname = "bson-mapping";
-       version = "0.1.4.1";
-       sha256 = "eaa729942da079f4d4bce93ab1be378491fe171d74d6297814b8d203fdcc214d";
+       version = "0.1.5.0";
+       sha256 = "ba8ec4df8362c67e3da032399e92ddc94a6ddbd80232e2566648de0b5d53085a";
        libraryHaskellDepends = [
-         base bson compact-string-fix template-haskell th-lift
+         base bson template-haskell text th-lift
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
@@ -35681,8 +35756,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.0.4";
-       sha256 = "2621cd4e76357bcf7f175413c111874c6afc552d80c85372dc43f4bcd5c99719";
+       version = "1.0.5";
+       sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35705,8 +35780,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.10";
-       sha256 = "464b299f095150bd0831df7dbab45d272909875a21f4030b79aee58faefdbb1d";
+       version = "0.7.11";
+       sha256 = "160d44411a0a8fe922ae1aa192de5b481d4354d5df4e863d2782f49f0ab57277";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36078,8 +36153,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.8";
-       sha256 = "0dd6bbe6b77f6d8cfaff690f0ce53064e9fae10d317278205895fa5fb8d13195";
+       version = "0.4.9";
+       sha256 = "59bb6a13229fbb28a481cb8839369cfd0e30c2d9f65a93f3ee8240ad19288238";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -40516,6 +40591,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude_1_2_0_1" = callPackage
+    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
+     , hashable, hspec, lifted-async, lifted-base, monad-unlift
+     , mono-traversable, mono-traversable-instances, mtl
+     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
+     , semigroups, stm, stm-chans, text, time, time-locale-compat
+     , transformers, transformers-base, unordered-containers, vector
+     , vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "1.2.0.1";
+       sha256 = "a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34";
+       libraryHaskellDepends = [
+         async base basic-prelude bifunctors bytestring chunked-data
+         containers deepseq dlist exceptions ghc-prim hashable lifted-async
+         lifted-base monad-unlift mono-traversable
+         mono-traversable-instances mtl mutable-containers primitive
+         safe-exceptions say semigroups stm stm-chans text time
+         time-locale-compat transformers transformers-base
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
@@ -41086,18 +41193,23 @@ self: {
      }) {};
 
   "clit" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , data-default, http-client, http-client-tls, http-types, lens
-     , optparse-applicative, split, text
+    ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
+     , bytestring, data-default, http-client, http-client-tls
+     , http-types, lens, megaparsec, MissingH, optparse-applicative
+     , split, text
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.6";
-       sha256 = "28913ec550761c623008250ef071840761216eaa1bb9e02b77c32c1dac6bb656";
+       version = "0.3.0.3";
+       sha256 = "963a5a636ded2f1f7ac7a6b4b4af8a38403ecda4913e12b36719ee57c1a27925";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson authenticate-oauth base bytestring data-default http-client
-         http-client-tls http-types lens optparse-applicative split text
+         aeson ansi-wl-pprint authenticate-oauth base bytestring
+         data-default http-client http-client-tls http-types lens megaparsec
+         MissingH optparse-applicative split text
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
@@ -43344,14 +43456,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_1_0_0" = callPackage
+  "concurrency_1_1_1_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.1.0.0";
-       sha256 = "bc6e4d9db178937bf5223b8534bb56bf508242259ee489709af203ad39914605";
+       version = "1.1.1.0";
+       sha256 = "f955671cc7814d06d99a84f003423d8903604cdc9911d7f4986acaa39c519973";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -51969,15 +52081,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_5_1_1" = callPackage
+  "dejafu_0_5_1_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , monad-loops, mtl, random, ref-fd, semigroups, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.5.1.1";
-       sha256 = "c8ba221dd45a107488e5b499fc59f66587a66eb366c4e3dafb76b84b9d38488a";
+       version = "0.5.1.2";
+       sha256 = "0e6114f59678ff0c5a9f5a4561f9b1ae4d87c77c50fd498e447ca7f67eae6d4c";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions monad-loops mtl
          random ref-fd semigroups transformers transformers-base
@@ -54325,26 +54437,27 @@ self: {
 
   "discord-hs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, data-default, hakyll, hashable, hslogger, lens
-     , mmorph, mtl, pipes, split, stm, stm-conduit, text, time
-     , transformers, unordered-containers, url, vector, websockets, wreq
-     , wuss
+     , containers, data-default, hakyll, hashable, hslogger, http-client
+     , mmorph, mtl, pipes, req, split, stm, stm-conduit, text, time
+     , transformers, unordered-containers, url, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "discord-hs";
-       version = "0.1.3";
-       sha256 = "4cdcbc983ef10838e96344ad9b63e772296d9e734b4dc87768f657b7aaa106fc";
+       version = "0.2.1";
+       sha256 = "439cc60b1206c4709a9a28e9ac5c64f7fb6eb5e40014ef055624459842add95e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers data-default
-         hashable hslogger lens mmorph mtl pipes stm stm-conduit text time
-         transformers unordered-containers url vector websockets wreq wuss
+         hashable hslogger http-client mmorph mtl pipes req stm stm-conduit
+         text time transformers unordered-containers url vector websockets
+         wuss
        ];
        executableHaskellDepends = [ base hakyll split ];
        homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -54476,8 +54589,8 @@ self: {
     ({ mkDerivation, base, dlist }:
      mkDerivation {
        pname = "disposable";
-       version = "0.1.0.0";
-       sha256 = "fc7d7dc460566c9f3ac965c355792806278a19a0fa35e89ab3a5df465fb34e43";
+       version = "0.1.1.0";
+       sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12";
        libraryHaskellDepends = [ base dlist ];
        homepage = "https://github.com/louispan/disposable#readme";
        description = "Allows storing different resource-releasing actions together";
@@ -57462,6 +57575,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ebeats" = callPackage
@@ -61132,13 +61246,22 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, base, constraints, profunctors, singletons }:
+    ({ mkDerivation, aeson, base, bytes, constraints, deepseq
+     , generic-random, hashable, profunctors, QuickCheck, singletons
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "exinst";
-       version = "0.2";
-       sha256 = "64c8d5a121db7274436f4e0fdb5c7ea3c9746419a84c0f16e6edb92bb83c7a3b";
+       version = "0.3";
+       sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11";
        libraryHaskellDepends = [
-         base constraints profunctors singletons
+         aeson base bytes constraints deepseq hashable profunctors
+         QuickCheck singletons
+       ];
+       testHaskellDepends = [
+         aeson base bytes constraints deepseq generic-random hashable
+         profunctors QuickCheck singletons tasty tasty-hunit
+         tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for your existential types";
@@ -61584,6 +61707,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4" = callPackage
+    ({ mkDerivation, base, comonad, constraints, criterion, deepseq
+     , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton
+     , mtl, primitive, profunctors, semigroups, tagged, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4";
+       sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c";
+       libraryHaskellDepends = [
+         base comonad constraints deepseq ghc-prim monad-skeleton mtl
+         primitive profunctors semigroups tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion effin extensible-effects freer lens mtl
+       ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -62282,8 +62430,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "3";
-       editedCabalFile = "636e2fbbe689dde982c327a7fc33871804ec66e47105d6cbffd6ce09716c241f";
+       revision = "4";
+       editedCabalFile = "efe4614bc8832765c649a86b4e4a8c26122af3a5a23cad77676e062e3a85f66c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63130,6 +63278,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl_5_5_3_1" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , microbench, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "fgl";
+       version = "5.5.3.1";
+       sha256 = "dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c";
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base deepseq microbench ];
+       description = "Martin Erwig's Functional Graph Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fgl-arbitrary" = callPackage
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
@@ -63142,6 +63308,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl-arbitrary_0_2_0_3" = callPackage
+    ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "fgl-arbitrary";
+       version = "0.2.0.3";
+       sha256 = "55ba994bdb884497b5e664b1c14969d66235ba2358eb38283aca21efded7c152";
+       libraryHaskellDepends = [ base fgl QuickCheck ];
+       testHaskellDepends = [ base containers fgl hspec QuickCheck ];
+       description = "QuickCheck support for fgl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fgl-extras-decompositions" = callPackage
     ({ mkDerivation, base, containers, fgl }:
      mkDerivation {
@@ -64778,8 +64957,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.1";
-       sha256 = "9230417d449ea9af3257dbaba15a7aada3db6289b2e26246bbd92787f3cb394c";
+       version = "0.5.1.2";
+       sha256 = "30a8f7229bb16ccd72bdefddf67d4ef23e9c87e200207dfdf944b737dd49a71d";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -64945,8 +65124,8 @@ self: {
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.3";
-       sha256 = "a6cc32309e996acc4db281368184a1333b52072023315dfa8f20fbfa235ed81b";
+       version = "0.0.0.4";
+       sha256 = "bfc71940c7f5c90c72945906e0887eb71894858593d536cb43b04109fd82634f";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring microlens text
          text-format
@@ -65113,6 +65292,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "foldl-transduce" = callPackage
@@ -65518,6 +65698,7 @@ self: {
        homepage = "https://github.com/agrafix/format-numbers#readme";
        description = "Various number formatting functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "format-status" = callPackage
@@ -70110,6 +70291,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghcjs-hplay_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , ghcjs-perch, mtl, transformers, transient, transient-universe
+     }:
+     mkDerivation {
+       pname = "ghcjs-hplay";
+       version = "0.4.1";
+       sha256 = "0589b76f6411abcf05a61a3f2b9d2d25064d5c1140dabf14b4a5d6aca0162b2b";
+       libraryHaskellDepends = [
+         base bytestring containers directory ghcjs-perch mtl transformers
+         transient transient-universe
+       ];
+       homepage = "https://github.com/transient-haskell/ghcjs-hplay";
+       description = "Client-side web EDSL for transient nodes running in the web browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-perch" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -71659,6 +71858,7 @@ self: {
        homepage = "https://toktok.github.io/";
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "github-types" = callPackage
@@ -75885,6 +76085,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "google-maps-geocoding" = callPackage
+    ({ mkDerivation, aeson, base, http-client, servant, servant-client
+     , text
+     }:
+     mkDerivation {
+       pname = "google-maps-geocoding";
+       version = "0.1.0.0";
+       sha256 = "375204744bebde75f9d249dc535d6b3199b342c6e68e452b7af4a3ac55521ef5";
+       revision = "1";
+       editedCabalFile = "293782aef4b6465cfe154b1601db24c5720a444c802f5a454fa06f04f0549614";
+       libraryHaskellDepends = [
+         aeson base http-client servant servant-client text
+       ];
+       homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
+       description = "Google Maps Geocoding API bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-oauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit
      , http-types, load-env
@@ -76973,10 +77191,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphql-api";
-       version = "0.1.1";
-       sha256 = "e8d19197ff982e111ec199b411faf78e2800778b82c3c0147f1ef35615522a7d";
-       revision = "1";
-       editedCabalFile = "593742fa27cf4b14bcb88ced31b9af3a0567a5fab700e18e2f47f49a6c5fd1a9";
+       version = "0.1.2";
+       sha256 = "8620df9b4750b3b6003d3efe6ba74e27581f3df042c7333ce0bd9c6e9e2e8c13";
        libraryHaskellDepends = [
          aeson attoparsec base containers exceptions protolude QuickCheck
          scientific text transformers
@@ -76989,7 +77205,7 @@ self: {
          attoparsec base criterion exceptions protolude transformers
        ];
        homepage = "https://github.com/jml/graphql-api#readme";
-       description = "Write type-safe GraphQL services in Haskell";
+       description = "Sketch of GraphQL stuff";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -85321,23 +85537,22 @@ self: {
 
   "hasmin" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, doctest
-     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec
-     , mainland-pretty, matrix, mtl, numbers, optparse-applicative
-     , parsers, QuickCheck, semigroups, text
+     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec, matrix
+     , mtl, numbers, optparse-applicative, parsers, QuickCheck, text
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "0.3.0.1";
-       sha256 = "b4b7b8fbe3553a2b93de7a7f3a90b9e8a5410a5e79f59db15e1f08ef62777e38";
+       version = "0.3.1.3";
+       sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers mainland-pretty matrix mtl
-         numbers parsers semigroups text
+         attoparsec base bytestring containers matrix mtl numbers parsers
+         text
        ];
        executableHaskellDepends = [
-         attoparsec base bytestring containers gitrev hopfli mainland-pretty
-         matrix mtl numbers optparse-applicative parsers text
+         attoparsec base bytestring containers gitrev hopfli matrix mtl
+         numbers optparse-applicative parsers text
        ];
        testHaskellDepends = [
          attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
@@ -88247,8 +88462,8 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat";
-       version = "0.20.9";
-       sha256 = "5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d";
+       version = "0.20.10";
+       sha256 = "39e6a1a30e80873165c3287a5b84de325c0b1dee1ddfd271daa360c1b15e0e2e";
        libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
@@ -88829,6 +89044,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hgis" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo
+     , Chart, Chart-cairo, Chart-diagrams, colour, composition
+     , data-binary-ieee754, data-default, directory, filepath, hspec
+     , lens, monad-loops, optparse-applicative, transformers
+     }:
+     mkDerivation {
+       pname = "hgis";
+       version = "0.1.1.2";
+       sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring Chart Chart-cairo
+         Chart-diagrams colour composition data-binary-ieee754 data-default
+         directory filepath lens monad-loops optparse-applicative
+         transformers
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/vmchale/hgis#readme";
+       description = "Package and command-line for GIS with Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "hgithub" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, case-insensitive, cmdargs, directory, http-enumerator
@@ -89289,6 +89531,7 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highjson-th" = callPackage
@@ -89310,6 +89553,7 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight-versions" = callPackage
@@ -92542,6 +92786,7 @@ self: {
        homepage = "https://github.com/ciez/hora";
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "horizon" = callPackage
@@ -97820,6 +98065,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-client_0_4_31_2" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.4.31.2";
+       sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
+       libraryHaskellDepends = [
+         array base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         exceptions filepath ghc-prim http-types mime-types network
+         network-uri random streaming-commons text time transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring blaze-builder bytestring
+         case-insensitive containers deepseq directory hspec http-types
+         monad-control network network-uri streaming-commons text time
+         transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
@@ -97981,6 +98257,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-client-tls_0_2_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, connection, data-default-class
+     , hspec, http-client, http-types, network, tls
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.2.4.1";
+       sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3";
+       revision = "1";
+       editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c";
+       libraryHaskellDepends = [
+         base bytestring connection data-default-class http-client network
+         tls
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, criterion, cryptonite, data-default-class, exceptions
@@ -98256,6 +98554,7 @@ self: {
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "http-listen" = callPackage
@@ -102890,21 +103189,22 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , data-default-class, dlist, exceptions, http-client, HUnit, mtl
-     , network-uri, retry, scientific, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, template-haskell, text, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
+     , containers, foldl, http-client, http-types, HUnit, lens, mtl
+     , network, optional-args, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "0.10.0";
-       sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb";
+       version = "1.0.0";
+       sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring containers data-default-class
-         dlist exceptions http-client mtl network-uri retry scientific
-         tagged template-haskell text vector
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific text time
+         unordered-containers vector
        ];
        testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
@@ -103865,7 +104165,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_1_0_9" = callPackage
+  "intro_0_1_0_10" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, safe
      , string-conversions, tagged, text, transformers
@@ -103873,8 +104173,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.9";
-       sha256 = "963620591271c3a8e39cfc6b222b4ea9266da0121887298de7e6e59962d422ae";
+       version = "0.1.0.10";
+       sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -106070,6 +106370,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jenga" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , http-conduit, http-types, text
+     }:
+     mkDerivation {
+       pname = "jenga";
+       version = "0.1.0.0";
+       sha256 = "4468d8a1c55009b146b8294ab9ed677b5c7a5e3d0fbae1825a5aebcd509412d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers http-conduit http-types text
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/erikd/jenga";
+       description = "Generate a cabal freeze file from a stack.yaml";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jespresso" = callPackage
     ({ mkDerivation, arrows, base, bytestring, cmdargs
      , data-default-class, data-default-instances-base, Diff, directory
@@ -106354,6 +106674,7 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -108742,8 +109063,8 @@ self: {
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20170122";
-       sha256 = "39349c641898e77e340d171263a9b2d860089a4ae7a6068a563e8e6647a1fd7e";
+       version = "0.20170303";
+       sha256 = "1785ee897795fcde79ef96742b473f84705335a22d6f033981163cf8a3a9b45a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117056,15 +117377,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lucid_2_9_8" = callPackage
+  "lucid_2_9_8_1" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
      , mtl, parsec, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "lucid";
-       version = "2.9.8";
-       sha256 = "9ab498348a68317d2b995c29e0963895d0943de571e9164a28fc3f30ae7f9b72";
+       version = "2.9.8.1";
+       sha256 = "eba0e020ce560c5b6146bd7786d8c531026c5c898590e46f7d94a8019740da08";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mmorph mtl text
          transformers unordered-containers
@@ -117073,7 +117394,7 @@ self: {
          base bifunctors hspec HUnit mtl parsec text
        ];
        benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text
+         base blaze-builder bytestring criterion deepseq text transformers
        ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
@@ -117623,6 +117944,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "machines-amazonka" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-ec2, amazonka-s3
+     , amazonka-sts, base, concurrent-machines, containers, exceptions
+     , focus, hashable, liblawless, lifted-async, list-t, monad-control
+     , mtl, resourcet, stm, stm-containers, time, transformers
+     }:
+     mkDerivation {
+       pname = "machines-amazonka";
+       version = "0.4.1";
+       sha256 = "cce59823213d25be8bc6b570baaf2f2af5bcbbb5ccc79443afa6542586d5d6bd";
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-ec2 amazonka-s3 amazonka-sts base
+         concurrent-machines containers exceptions focus hashable liblawless
+         lifted-async list-t monad-control mtl resourcet stm stm-containers
+         time transformers
+       ];
+       description = "Machine transducers for Amazonka calls";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, machines }:
      mkDerivation {
@@ -118969,18 +119311,18 @@ self: {
 
   "marvin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, configurator
-     , deepseq, directory, filepath, hashable, haskeline, http-client
-     , http-client-tls, http-types, irc-conduit, lens, lifted-async
-     , lifted-base, marvin-interpolate, monad-control, monad-logger
-     , monad-loops, mtl, mustache, network-uri, optparse-applicative
-     , random, stm, text, text-icu, time, transformers
-     , transformers-base, unordered-containers, vector, wai, warp
-     , warp-tls, websockets, wreq, wuss
+     , deepseq, directory, filepath, hashable, haskeline, hspec
+     , http-client, http-client-tls, http-types, irc-conduit, lens
+     , lifted-async, lifted-base, marvin-interpolate, monad-control
+     , monad-logger, monad-loops, mtl, mustache, network-uri
+     , optparse-applicative, random, stm, text, text-icu, time
+     , transformers, transformers-base, unordered-containers, vector
+     , wai, warp, warp-tls, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.2.0";
-       sha256 = "7928adc11b0fe646db3bb20333c6dcea09664a7b6a341de9d5ed3bfb639e6301";
+       version = "0.2.2";
+       sha256 = "87c5aa6059c7dbf6c8d20d31d3a242bc68aa888313453448ca520f726272dbbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118995,6 +119337,7 @@ self: {
          aeson base bytestring configurator directory filepath mustache
          optparse-applicative text
        ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
@@ -119778,6 +120121,7 @@ self: {
        homepage = "https://github.com/lindenbaum/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "mediabus-rtp" = callPackage
@@ -119816,6 +120160,7 @@ self: {
        homepage = "https://github.com/lindenbaum/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "median-stream" = callPackage
@@ -122955,6 +123300,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-skeleton_0_1_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "monad-skeleton";
+       version = "0.1.3";
+       sha256 = "4de3aee29408f98fe0f3dc6161d98e13a5292a67b23cb80e7f1875eead7d8a40";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/monad-skeleton";
+       description = "Monads of program skeleta";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-st" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -124108,6 +124466,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mosquitto-hs" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mosquitto-hs";
+       version = "0.1.0.0";
+       sha256 = "964a6f05bbbcf3c4797ca35d82c99c21d257b8ce252397ffc87dbe8482bb0031";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/anishray/mosquitto-hs#readme";
+       description = "Mosquitto client library bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mount" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -130384,6 +130754,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octohat" = callPackage
@@ -133405,6 +133776,36 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) pango;};
 
+  "pansite" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default
+     , directory, doctest, filepath, Glob, hspec, http-types, MissingH
+     , optparse-applicative, pandoc, pandoc-types, shake, split
+     , template-haskell, text, time, unordered-containers, vcs-revision
+     , vector, wai, wai-logger, warp, yaml
+     }:
+     mkDerivation {
+       pname = "pansite";
+       version = "0.1.0.0";
+       sha256 = "656dbab42493e28e112650ba1095d2f0cde42a06c47a640714be969cd9a3a8c2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default split text unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring data-default directory filepath
+         http-types MissingH optparse-applicative pandoc pandoc-types shake
+         template-haskell text time unordered-containers vcs-revision wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [ base doctest Glob hspec ];
+       homepage = "https://github.com/rcook/pansite#readme";
+       description = "Pansite: a simple web site management tool";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "papa" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, papa-base
      , papa-base-export, papa-base-implement, papa-bifunctors
@@ -137286,6 +137687,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "pipes_4_2_0" = callPackage
+    ({ mkDerivation, base, criterion, mmorph, mtl, optparse-applicative
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.2.0";
+       sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124";
+       revision = "1";
+       editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0";
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
@@ -137882,6 +138307,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-lines" = callPackage
+    ({ mkDerivation, base, bytestring, lens, mtl, pipes, pipes-group
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "pipes-lines";
+       version = "1.0.3.1";
+       sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc";
+       libraryHaskellDepends = [ base bytestring pipes pipes-group text ];
+       testHaskellDepends = [
+         base bytestring lens mtl pipes pipes-group QuickCheck
+       ];
+       homepage = "https://github.com/mindreader/pipes-lines";
+       description = "Pipes for grouping by lines with carriage returns";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-lzma" = callPackage
     ({ mkDerivation, base, bytestring, lzma, pipes, pipes-bytestring
      , QuickCheck
@@ -142940,13 +143382,14 @@ self: {
      }) {};
 
   "protolude-lifted" = callPackage
-    ({ mkDerivation, base, lifted-async, lifted-base, protolude }:
+    ({ mkDerivation, async, base, lifted-async, lifted-base, protolude
+     }:
      mkDerivation {
        pname = "protolude-lifted";
-       version = "0.1.0.1";
-       sha256 = "1cf719477b66ad04fca3c5322fc3e9b27d6208bf677cbab84b4577cdce83364f";
+       version = "0.1.1.0";
+       sha256 = "82a83f5b6ba7f16be05dfaa5e490b6fe65b93fe3b6b3dbf8969f7bda9f2bf532";
        libraryHaskellDepends = [
-         base lifted-async lifted-base protolude
+         async base lifted-async lifted-base protolude
        ];
        homepage = "https://github.com/pbogdan/protolude-lifted";
        description = "Protolude with lifted-base and lifted-async";
@@ -143686,7 +144129,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -143940,6 +144382,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pushover" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
+     , http-client-tls, mtl, tasty, tasty-hunit, text, time
+     , transformers, uri-encode
+     }:
+     mkDerivation {
+       pname = "pushover";
+       version = "0.1.0.1";
+       sha256 = "8c3168b78d79384eeabfa83ba810314c1c81adcd70a491c76ad9af016646262a";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-client http-client-tls mtl
+         text time transformers uri-encode
+       ];
+       testHaskellDepends = [
+         base bytestring http-client tasty tasty-hunit text time
+       ];
+       homepage = "https://github.com/DanMeakin/pushover";
+       description = "A Haskell Pushover API library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "putlenses" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, lens, mtl, QuickCheck
      , random, safe, split, template-haskell, transformers
@@ -144962,6 +145425,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-special_0_1_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
+     , text
+     }:
+     mkDerivation {
+       pname = "quickcheck-special";
+       version = "0.1.0.4";
+       sha256 = "9a3f3a24b6595aaa12b4c61644e329c82457f2d49ee913986b08378dacba67b7";
+       libraryHaskellDepends = [
+         base bytestring ieee754 QuickCheck scientific text
+       ];
+       homepage = "https://github.com/minad/quickcheck-special#readme";
+       description = "Edge cases and special values for QuickCheck Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-string-random" = callPackage
     ({ mkDerivation, base, QuickCheck, string-random, tasty
      , tasty-quickcheck, text
@@ -151803,6 +152283,7 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -153235,6 +153716,7 @@ self: {
        homepage = "https://github.com/NCrashed/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safeint" = callPackage
@@ -156386,30 +156868,28 @@ self: {
      }) {};
 
   "serokell-util" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-extra, base
-     , base16-bytestring, base64-bytestring, binary, binary-orphans
-     , bytestring, cereal, cereal-vector, clock, containers
-     , data-msgpack, deepseq, directory, either, exceptions, extra
-     , filepath, formatting, hashable, hspec, lens, log-warper
+    ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal
+     , base, base16-bytestring, base64-bytestring, binary
+     , binary-orphans, bytestring, cereal, cereal-vector, clock
+     , containers, data-msgpack, deepseq, directory, either, exceptions
+     , extra, filepath, formatting, hashable, hspec, lens, log-warper
      , monad-control, mtl, optparse-applicative, parsec, QuickCheck
      , quickcheck-instances, safecopy, scientific, semigroups, stm
      , template-haskell, text, text-format, time-units, transformers
-     , unordered-containers, vector, yaml
+     , universum, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.5";
-       sha256 = "4d39b93b18636db11004b7b03fc118da8417ff9abe4db32164c200da23a22391";
-       revision = "1";
-       editedCabalFile = "3bcba06004dd1f2cfe23b7321917dd53e08efff1c65e2c48898d773b91ce5a35";
+       version = "0.1.4.0";
+       sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf";
        libraryHaskellDepends = [
-         acid-state aeson aeson-extra base base16-bytestring
+         acid-state aeson aeson-extra ansi-terminal base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
          cereal-vector clock containers data-msgpack deepseq directory
          either exceptions extra filepath formatting hashable lens
          log-warper monad-control mtl optparse-applicative parsec QuickCheck
          quickcheck-instances safecopy scientific semigroups stm
-         template-haskell text text-format time-units transformers
+         template-haskell text text-format time-units transformers universum
          unordered-containers vector yaml
        ];
        testHaskellDepends = [
@@ -157051,6 +157531,7 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "servant-docs_0_10" = callPackage
@@ -158048,8 +158529,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-persistent";
-       version = "1.0.2";
-       sha256 = "19dfb2c55d64168e3fa2ceb6476ac55c67e69a750e0a39b400d9b3b0fbd3be4b";
+       version = "1.0.3";
+       sha256 = "689eb02ada5f1ad8ce0e0c43ae0931953533fab1f65d10d3a7c35dd01688c5ae";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
@@ -158074,8 +158555,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-redis";
-       version = "1.0.1";
-       sha256 = "b4b30860fa2e431fd7101b3fb5541e7a687bce71886ca164564c35fbf104af4f";
+       version = "1.0.2";
+       sha256 = "d7746682f83e796bb1de3d14dd26d20c3c0723d7683af93e58d8a0a57b9bf917";
        libraryHaskellDepends = [
          base bytestring hedis path-pieces serversession tagged text time
          transformers unordered-containers
@@ -158097,8 +158578,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-frontend-snap";
-       version = "1.0";
-       sha256 = "91719ff595a845f26a670c4f41c9a1d405d78ee4f213e666fa2e98ede46049d8";
+       version = "1.0.1";
+       sha256 = "bb2476bb04907b0f2df1be9ef8c7a6c2aa984b8a06fe4bd6342ed990c2868d2c";
        libraryHaskellDepends = [
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
@@ -159313,10 +159794,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.8.1";
-       sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
-       revision = "1";
-       editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
+       version = "1.6.8.3";
+       sha256 = "78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159342,8 +159821,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly-extra";
-       version = "0.3.0.1";
-       sha256 = "0502062de043c0322d3cddf379847c1148e515c4fa18f19db835210d422d85d5";
+       version = "0.3.0.2";
+       sha256 = "19d39c38a90fb19d9f79a648d72f73d0a5ec2bd3788abf7dac3d77da19ae5446";
        libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ];
        testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
@@ -159765,6 +160244,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "sign" = callPackage
@@ -167519,8 +167999,61 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.3.1";
-       sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90";
+       version = "0.4.0";
+       sha256 = "bdbbc77a10941ee721c4c3fb456ec236ada3be51a890415c00a57cd4f06973cc";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant cryptohash deepseq directory filepath free
+         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
+         monad-control mono-traversable network primitive resourcet safe
+         semigroups smallcheck store-core streaming-commons syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring cereal
+         cereal-vector conduit containers contravariant criterion cryptohash
+         deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core streaming-commons syb template-haskell text
+         th-lift th-lift-instances th-orphans th-reify-many th-utilities
+         time transformers unordered-containers vector
+         vector-binary-instances void weigh
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant criterion cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core streaming-commons
+         syb template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "store_0_4_1" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
+     , containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, streaming-commons, syb, template-haskell
+     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.4.1";
+       sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
          containers contravariant cryptohash deepseq directory filepath free
@@ -167564,8 +168097,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.3";
-       sha256 = "8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087";
+       version = "0.4";
+       sha256 = "aa8df93b9c5aba42b800b17a6cfd6bbdeef9369dc71ef684108d424a88ecf4f5";
        libraryHaskellDepends = [
          base bytestring fail ghc-prim primitive text transformers
        ];
@@ -167616,6 +168149,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_4_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.4.1";
+       sha256 = "7a8a7c8bbe4c154c1a8def4a0bb7384ff9f60198ce7a8583063c7cd0c84bc790";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hashable hlint lens
+         tasty tasty-hspec template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -169543,6 +170101,7 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "swapper" = callPackage
@@ -171887,6 +172446,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-auto_0_2_0_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-auto";
+       version = "0.2.0.0";
+       sha256 = "b24e6f45aca98bc83316261d21ac5d9094aede0c5c7179c16ef2f69dfa3cf65a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/minad/tasty-auto#readme";
+       description = "Auto discovery for Tasty with support for ingredients and test tree generation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -172093,6 +172674,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-jenkins-xml" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hlint, hspec
+     , io-capture, mockery, tasty, tasty-ant-xml, tasty-hunit, unix
+     }:
+     mkDerivation {
+       pname = "tasty-jenkins-xml";
+       version = "0.2.0.0";
+       sha256 = "b5f88fb4478d7d3dc1e74237fabea54d0098dc5a726752279f41c5ce0eaaade4";
+       libraryHaskellDepends = [ base tasty tasty-ant-xml ];
+       testHaskellDepends = [
+         base bytestring directory hlint hspec io-capture mockery tasty
+         tasty-hunit unix
+       ];
+       homepage = "https://github.com/IxpertaSolutions/tasty-jenkins-xml#readme";
+       description = "Render tasty output to both console and XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-kat" = callPackage
     ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit
      , tasty-quickcheck
@@ -177503,6 +178103,7 @@ self: {
        homepage = "https://github.com/tonyday567/tower";
        description = "A numeric tower";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "toxcore" = callPackage
@@ -178054,6 +178655,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "transient_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, mtl
+     , random, stm, time, transformers
+     }:
+     mkDerivation {
+       pname = "transient";
+       version = "0.5.1";
+       sha256 = "a6b90bed245013a7ffe61f8d6e5b0f5798dd64999c914c1f956b0d3a1c3a8d25";
+       libraryHaskellDepends = [
+         base bytestring containers directory mtl random stm time
+         transformers
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "Making composable programs with multithreading, events and distributed computing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transient-universe" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
@@ -178084,6 +178703,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transient-universe_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , directory, filepath, hashable, HTTP, iproute, mtl, network
+     , network-info, network-uri, process, random, stm, TCache, text
+     , time, transformers, transient, vector, websockets
+     }:
+     mkDerivation {
+       pname = "transient-universe";
+       version = "0.4.1";
+       sha256 = "2000815b5df5dfa3e02856e0ba3e1f408efaf4fc6365c6949c0f9cca4ad8d6fb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers directory filepath
+         hashable HTTP iproute mtl network network-info network-uri process
+         random stm TCache text time transformers transient vector
+         websockets
+       ];
+       executableHaskellDepends = [ base transformers transient ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers directory filepath
+         hashable HTTP mtl network network-info network-uri process random
+         stm TCache text time transformers transient vector websockets
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "Remote execution and map-reduce: distributed computing for Transient";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "translatable-intset" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -186174,6 +186823,7 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -188152,6 +188802,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets_0_9_8_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , blaze-builder, bytestring, case-insensitive, containers, entropy
+     , HUnit, network, QuickCheck, random, SHA, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.9.8.2";
+       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy HUnit network QuickCheck random
+         SHA test-framework test-framework-hunit test-framework-quickcheck2
+         text
+       ];
+       doCheck = false;
+       homepage = "http://jaspervdj.be/websockets";
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
@@ -192256,6 +192935,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml-combinators" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
+     , scientific, tasty, tasty-hunit, text, transformers
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "yaml-combinators";
+       version = "1.0";
+       sha256 = "9997df825976d8e02ce501248dc2ab82bc4ba30510fe3511b199e4d99bd9bd17";
+       libraryHaskellDepends = [
+         aeson base bytestring generics-sop scientific text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base doctest tasty tasty-hunit unordered-containers
+       ];
+       homepage = "https://github.com/feuerbach/yaml-combinators";
+       description = "YAML parsing combinators for improved validation and error reporting";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml
@@ -194829,6 +195529,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "yhccore" = callPackage
@@ -195938,6 +196639,32 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+     }) {};
+
+  "zip_0_1_9" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, exceptions
+     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "0.1.9";
+       sha256 = "82dd97404ff2dde034b6786838ee51a5102da31c20835d61fef3bdfe69279860";
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest exceptions filepath mtl path
+         path-io plan-b resourcet text time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers exceptions filepath hspec path
+         path-io QuickCheck text time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/zip";
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 2d27185a9fca2..31a58bcde11d9 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "elixir";
     rev = "v${version}";
-    sha256 = "1q05f1s581nk475a8d9hakh2irgvsg50x3084yjzhrcmmykwnysi";
+    sha256 = "0jqww3l5jgqvlqpp6lh8i55v23a5imw4giarr05gsl7imv2qqshz";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 69eea056c7638..f30bd175daac5 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -93,7 +93,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
     platforms = python.meta.platforms;
   } // meta // {
     # add extra maintainer(s) to every package
-    maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ];
+    maintainers = (meta.maintainers or []) ++ [ chaoflow ];
     # a marker for release utilities to discover python packages
     isBuildPythonPackage = python.meta.platforms;
   };
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2bf7ec5d2dfec..6f3df4e866d64 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
     homepage = http://racket-lang.org/;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ kkallio henrytill vrthra ];
-    platforms = platforms.unix;
+    platforms = platforms.x86_64;
   };
 }
diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix
new file mode 100644
index 0000000000000..e245496c63acd
--- /dev/null
+++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "arpa2";
+    repo = "gnutls-kdh";
+    rev = "ff3bb36f70a746f28554641d466e124098dfcb25";
+    sha256 = "1rr3p4r145lnprxn8hqyyzh3qkj3idsbqp08g07ndrhqnxq0k0sw";
+  };
+})
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
new file mode 100644
index 0000000000000..0e8457a8c54b8
--- /dev/null
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -0,0 +1,92 @@
+{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
+, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake
+, yacc, texinfo
+
+# Version dependent args
+, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
+, ...}:
+
+assert guileBindings -> guile != null;
+let
+  # XXX: Gnulib's `test-select' fails on FreeBSD:
+  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+  doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
+in
+stdenv.mkDerivation {
+  name = "gnutls-kdh-${version}";
+
+  inherit src patches;
+
+  outputs = [ "bin" "dev" "out" ];
+
+  patchPhase = ''
+      # rm -fR ./po
+      # substituteInPlace configure "po/Makefile.in" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_list.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_digest_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_mac_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_pk_self_test.3" " "
+      printf "all: ;\n\ninstall: ;" > "po/Makefile.in"
+      printf "all: ;\n\ninstall: ;" > "po/Makefile.in.in"
+      '';
+
+  postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
+    sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
+      -i tests/cert-tests/name-constraints
+  '' + postPatch;
+
+  preConfigure = "patchShebangs .";
+  configureFlags =
+    lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+  ++ [
+    "--disable-dependency-tracking"
+    "--enable-fast-install"
+  ] ++ lib.optional guileBindings
+    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
+
+  # Build of the Guile bindings is not parallel-safe.  See
+  # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
+  # for the actual fix.  Also an apparent race in the generation of
+  # systemkey-args.h.
+  enableParallelBuilding = false;
+
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp
+  autogen gperftools gperf gettext automake yacc texinfo ]
+    ++ lib.optional doCheck nettools
+    ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
+    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
+    ++ [ unbound ]
+    ++ lib.optional guileBindings guile;
+
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
+
+  #inherit doCheck;
+  doCheck = false;
+
+  # Fixup broken libtool and pkgconfig files
+  preFixup = lib.optionalString (!stdenv.isDarwin) ''
+    sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
+        -e 's,-lz,-L${zlib.out}/lib -lz,' \
+        -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
+        -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
+        -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
+  '';
+
+  meta = with lib; {
+    description = "GnuTLS with additional TLS-KDH ciphers: Kerberos + Diffie-Hellman";
+
+    longDescription = ''
+       The ARPA2 project aims to add security. This is an enhanced
+       version of GnuTLS,  a project that aims to develop a library which
+       provides a secure layer, over a reliable transport
+       layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman.
+    '';
+
+    homepage = http://www.gnu.org/software/gnutls://github.com/arpa2/gnutls-kdh;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 307fde4e5c277..2ab0977004c4c 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE =
     with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
+  AM_CXXFLAGS =
+    with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L";
+
   meta = with stdenv.lib; {
     homepage = "http://www.gnupg.org/related_software/gpgme";
     description = "Library for making GnuPG easier to use";
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index a748d9582695c..0cc6a07e08394 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl
-
-# Optional Dependencies
-, shishi ? null
+, withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
+assert withShishi -> shishi != null;
+
 stdenv.mkDerivation rec {
   name = "gss-1.0.3";
 
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = [ shishi ];
+  buildInputs = stdenv.lib.optional withShishi shishi;
 
   configureFlags = [
-    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+    "--${if withShishi != null then "enable" else "disable"}-kereberos5"
   ];
 
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
+  postInstall = stdenv.lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 
diff --git a/pkgs/development/libraries/java/javasvn/builder.sh b/pkgs/development/libraries/java/javasvn/builder.sh
deleted file mode 100755
index 5eaed4c88425a..0000000000000
--- a/pkgs/development/libraries/java/javasvn/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-$unzip/bin/unzip $src
-mkdir -p $out
-mv $name*/* $out
diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix
deleted file mode 100644
index 2ad9a33879cab..0000000000000
--- a/pkgs/development/libraries/java/javasvn/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, unzip} :
-
-stdenv.mkDerivation {
-  name = "javasvn-1.0.6";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip;
-    sha256 = "0l2s3jqi5clzj5jz962i7gmy8ims51ma60mm5iflsl00dwbmgrqf";
-  };
-  
-  inherit unzip;
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 7ff992ccc5546..1be3a74fbff57 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,5 +1,7 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db
-, libuuid, lzo, pkgconfig, guile }:
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt
+, gdbm, gperf, tdb, gnutls, db, libuuid
+, lzo, pkgconfig, guile
+}:
 
 stdenv.mkDerivation rec {
   name = "libchop-0.5.2";
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
   };
 
-  patches = [ ./gets-undeclared.patch ];
+  patches = [ ./gets-undeclared.patch ./size_t.patch ];
 
   nativeBuildInputs = [ pkgconfig gperf ];
   
@@ -21,13 +23,13 @@ stdenv.mkDerivation rec {
       guile
     ];
 
-  doCheck = true;
+  doCheck = false;
 
   preConfigure = ''
     sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools & library for data backup and distributed storage";
 
     longDescription =
@@ -46,9 +48,8 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://nongnu.org/libchop/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/development/libraries/libchop/size_t.patch
new file mode 100644
index 0000000000000..82b6cb995ef36
--- /dev/null
+++ b/pkgs/development/libraries/libchop/size_t.patch
@@ -0,0 +1,11 @@
+--- a/src/chop.c
++++ b/src/chop.c
+@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc
+   chop_qdbm_block_iterator_class;
+ 
+ const struct chop_class_entry *
+-chop_lookup_class_entry (const char *str, unsigned int len);
++chop_lookup_class_entry (const char *str, size_t len);
+ 
+ /* Include the gperf-generated perfect hash table.  */
+ #include "class-lookup.c"
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fe4ed6e410ecd..0b3b86e66a24a 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
     ]
-      # sometimes: timeout (no output)
-      ++ stdenv.lib.optional stdenv.isDarwin "process_title";
+      # sometimes: timeout (no output), failed uv_listen
+      ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
       sed '/${tdRegexp}/d' -i test/test-list.h
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7bedc189f0303..1987bbd323ee1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, intltool, autoreconfHook, substituteAll
 , file, expat, libdrm, xorg, wayland, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva
@@ -6,9 +6,11 @@
 , grsecEnabled ? false
 , enableRadv ? false
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
+, galliumDrivers ? null
+, driDrivers ? null
+, vulkanDrivers ? null
 }:
 
-
 /** Packaging design:
   - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now).
     This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
@@ -27,6 +29,40 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
+  defaultGalliumDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then ["nouveau" "freedreno" "vc4" "etnaviv"]
+    else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
+  defaultDriDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then ["nouveau"]
+    else ["i915" "i965" "nouveau" "radeon" "r200"];
+  defaultVulkanDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then []
+    else ["intel"] ++ lib.optional enableRadv "radeon";
+in
+
+let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
+
+let
+  galliumDrivers =
+    ["svga"]
+    ++ (if gallium_ == null
+          then defaultGalliumDrivers
+          else gallium_)
+    ++ ["swrast"];
+  driDrivers =
+    (if dri_ == null
+      then defaultDriDrivers
+      else dri_) ++ ["swrast"];
+  vulkanDrivers =
+    if vulkan_ == null
+    then defaultVulkanDrivers
+    else vulkan_;
+in
+
+let
   version = "17.0.1";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
@@ -64,14 +100,17 @@ stdenv.mkDerivation {
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
     "--with-egl-platforms=x11,wayland,drm"
-  ] ++ (if stdenv.isArm || stdenv.isAarch64 then [
-      "--with-gallium-drivers=nouveau,freedreno,vc4,etnaviv,swrast"
-      "--with-dri-drivers=nouveau,swrast"
-  ] else [
-      "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast"
-      "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
-      ("--with-vulkan-drivers=intel" + optionalString enableRadv ",radeon")
-  ]) ++ [
+  ]
+  ++ (optional (galliumDrivers != [])
+      ("--with-gallium-drivers=" +
+        builtins.concatStringsSep "," galliumDrivers))
+  ++ (optional (driDrivers != [])
+      ("--with-dri-drivers=" +
+        builtins.concatStringsSep "," driDrivers))
+  ++ (optional (vulkanDrivers != [])
+      ("--with-vulkan-drivers=" +
+        builtins.concatStringsSep "," vulkanDrivers))
+  ++ [
     (enableFeature enableTextureFloats "texture-float")
     (enableFeature grsecEnabled "glx-rts")
     (enableFeature stdenv.isLinux "dri3")
@@ -144,7 +183,7 @@ stdenv.mkDerivation {
 
     # set the default search path for DRI drivers; used e.g. by X server
     substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
-  '' + optionalString (!(stdenv.isArm || stdenv.isAarch64)) ''
+  '' + optionalString (builtins.elem "intel" vulkanDrivers) ''
     # move share/vulkan/icd.d/
     mv $out/share/ $drivers/
     # Update search path used by Vulkan (it's pointing to $out but
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 4e3db9b0d4017..7561f3b322b5f 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -16,16 +16,12 @@ stdenv.mkDerivation rec {
         "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
-  preConfigure = ''
-    find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
-  '';
-
   meta = {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    broken = true;              # cannot cope with Octave 4.x
+    broken = (octave != null);              # cannot cope with Octave 4.x
   };
 
 }
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 56d40f8183384..d8358757094df 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
     "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
   ];
 
+  # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
+  # if DESTDIR is unset
+  DESTDIR="/";
+
   nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 
   cmakeFlags =
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index d3e1a6dc17e77..d450cd21aecda 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,35 +1,27 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.17.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
-    sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z";
+    url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip";
+    sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6";
   };
 
-  buildInputs = [ unzip tcl ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
 
-  # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer.
-  # Hopefully this work-around can be removed for future releases.
-  postConfigure = ''
-    substituteInPlace Makefile \
-      --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"'
-  '';
-
-  buildPhase = ''
-    make sqlite3_analyzer
-  '';
+  makeFlags = [ "sqlite3_analyzer" ];
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    mv sqlite3_analyzer "$out/bin"
+    install -Dm755 sqlite3_analyzer \
+      "$out/bin/sqlite3_analyzer"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.sqlite.org/;
     description = "A tool that shows statistics about sqlite databases";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pesterhazy ];
   };
 }
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index bc9035d479b58..cee71df4849a8 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/unittest-cpp/unittest-cpp";
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 9089889f4dd21..6b5c48a6105da 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,19 +1,35 @@
 { stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
-  name = "uriparser-0.8.2";
+  name = "uriparser-${version}";
+  version = "0.8.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
-    sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
+    url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2";
+    sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f";
   };
 
-  buildInputs = [ cpptest pkgconfig doxygen graphviz ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cpptest doxygen graphviz ];
+
+  # There is actually no .map files to install in doc for v0.8.4
+  # (dot outputs only SVG and PNG in this release)
+  preBuild = ''
+    substituteInPlace doc/Makefile.am --replace " html/*.map" ""
+    substituteInPlace doc/Makefile.in --replace " html/*.map" ""
+  '';
+
 
   meta = with stdenv.lib; {
     homepage = http://uriparser.sourceforge.net/;
     description = "Strictly RFC 3986 compliant URI parsing library";
+    longDescription = ''
+      uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C.
+      API documentation is available on uriparser website.
+    '';
+    license = licenses.bsd3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ bosu ];
-    license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b0a4cc07bc63d..c15259c585adc 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in
   '';
 
-  buildTargets = [ "all-shared" ];
-
   preBuild = ''
     makeFlagsArray+=("prefix=$out")
     makeFlagsArray+=("LDCONFIG=echo")
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
new file mode 100644
index 0000000000000..b991590924db3
--- /dev/null
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+, pkgconfig, wxGTK
+, ffmpeg, libexif
+, cairo, pango }:
+
+stdenv.mkDerivation rec {
+
+  name = "wxSVG-${version}";
+  srcName = "wxsvg-${version}";
+  version = "1.5.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
+    sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ wxGTK ffmpeg libexif ];
+
+  buildInputs = [ cairo pango ];
+
+  meta = with stdenv.lib; {
+    description = "A SVG manipulation library built with wxWidgets";
+    longDescription = ''
+    wxSVG is C++ library to create, manipulate and render
+    Scalable Vector Graphics (SVG) files with the wxWidgets toolkit.
+    '';
+    homepage = http://wxsvg.sourceforge.net/;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 36b55c59c2455..e461ce858cfd4 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,23 +1,28 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
-stdenv.mkDerivation rec {
-  name = "xapian-${version}";
-  version = "1.4.0";
+let
+  generic = version: sha256: stdenv.mkDerivation rec {
+    name = "xapian-${version}";
 
-  src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
-    sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
-  };
+    src = fetchurl {
+      url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+      inherit sha256;
+    };
 
-  outputs = [ "out" "doc" ];
+    outputs = [ "out" "doc" ];
 
-  buildInputs = [ libuuid zlib ];
+    buildInputs = [ libuuid zlib ];
 
-  meta = {
-    description = "Search engine library";
-    homepage = http://xapian.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.unix;
+    meta = {
+      description = "Search engine library";
+      homepage = http://xapian.org/;
+      license = stdenv.lib.licenses.gpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.chaoflow ];
+      platforms = stdenv.lib.platforms.unix;
+    };
   };
+in {
+  # used by xapian-ruby
+  xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
+  xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
 }
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 77a7989baab4e..9b7a90266284a 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma }:
+{ stdenv, fetchurl, lzma }:
 
-stdenv.mkDerivation {
-  name = "zimlib";
-  version = "20150710";
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+stdenv.mkDerivation rec {
+  name = "zimlib-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "http://www.openzim.org/download/${name}.tar.gz";
+    sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
   };
-  buildInputs = [ automake autoconf libtool lzma ];
-  setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
-  preConfigure = "./autogen.sh";
 
-  meta = {
-    description = "Library for reading and writing ZIM files (file format for storing Web content offline)";
+  buildInputs = [ lzma ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Library for reading and writing ZIM files";
     homepage =  http://www.openzim.org/wiki/Zimlib;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ robbinch ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 56509ab5786a6..755724bc8b826 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }:
+{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
 
 stdenv.mkDerivation rec {
   version = "0.3.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  buildInputs = [ ocaml ocaml_oasis findlib ];
+  buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild ];
   propagatedBuildInputs = [ result cstruct ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
index fef4fd81158fd..fe4fc5d87ab71 100644
--- a/pkgs/development/ocaml-modules/core_extended/default.nix
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -12,6 +12,13 @@ buildOcaml rec {
     sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3";
   };
 
+  preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+    patch lib/extended_unix_stubs.c <<EOF
+    0a1
+    > #define _LINUX_QUOTA_VERSION 2
+    EOF
+  '';
+
   hasSharedObjects = true;
   buildInputs = [ pa_bench pa_test pa_ounit ];
   propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 8c1aac4d83b2a..eb148311be0b8 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools
+{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
 , async ? null, lwt ? null
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
 
-  buildInputs = [ ocaml findlib ppx_tools lwt async ];
+  buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ];
   propagatedBuildInputs = [ ocplib-endian sexplib ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 44d8ce393fbd2..aec6851e12bc4 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, jsonm, hex, sexplib, lwt }:
 
 let version = "0.4.3"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls";
   };
 
-  buildInputs = [ ocaml findlib lwt ];
+  buildInputs = [ ocaml findlib ocamlbuild lwt ];
   propagatedBuildInputs = [ jsonm hex sexplib ];
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 07b7773ff2c72..56d5e07f1d190 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
 
 let version = "1.0.0"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0g4cq4bsksga15fa5ln083gkglawknbnhi2s4k8yk0yi5xngvwm4";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ cstruct ];
   configureFlags = "--enable-tests";
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 8580bb6471343..ed058d82a0ed9 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
 
 let version = "1.5.1"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ cstruct ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
new file mode 100644
index 0000000000000..2110b1d6b5049
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, core_kernel, ppx_jane
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-async_kernel-113.33.00";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz;
+    sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [ core_kernel ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
new file mode 100644
index 0000000000000..595e1198de5f8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, async_kernel, core, ppx_jane
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz;
+    sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [ async_kernel core ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 579571ef62530..4f7c791420195 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -11,14 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
 
-  patches = ./destdir.patch;
-
   # some patching is required so that the lablgtk2 library is taken into account. It
   # does not reside in a subdirectory of the default library path, hence:
   # * configure looked in the wrong path
   # * ocaml needs that directory and the stubs directory as -I flag
   postPatch = ''
-    sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
+    sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
     sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in
     sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
   '';
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 4b4056a69d721..a1255b2dbc178 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,15 +1,16 @@
-{stdenv, buildOcaml, fetchurl,
- cppo, ppx_tools, result, ounit}:
+{ stdenv, buildOcaml, fetchzip
+, cppo, ppx_tools, result, ounit
+}:
 
 buildOcaml rec {
   name = "ppx_deriving";
-  version = "v3.3";
+  version = "4.1";
 
   minimumSupportedOcamlVersion = "4.02";
 
-  src = fetchurl {
-    url = "https://github.com/whitequark/${name}/archive/${version}.tar.gz";
-    sha256 = "1j20c6r2v7h05a4v9m8z5m1yqgwif41yrp63mik14pf3dkrj8x3f";
+  src = fetchzip {
+    url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz";
+    sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9";
   };
 
   hasSharedObjects = true;
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
new file mode 100644
index 0000000000000..76f58e695f28c
--- /dev/null
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six,
+  lazy-object-proxy, wrapt }:
+
+  buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "astroid";
+    version = "1.4.9";
+
+    src = fetchurl {
+      url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+      sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4";
+    };
+
+    propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ];
+
+    postPatch = ''
+      cd astroid/tests
+      for i in $(ls unittest*); do mv -v $i test_$i; done 
+      cd ../..
+      rm -vf astroid/tests/test_unittest_inference.py
+    '';
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A abstract syntax tree for Python with inference support";
+      homepage = http://bitbucket.org/logilab/astroid;
+      license = licenses.lgpl2;
+      platform = platforms.all;
+      maintainers = with maintainers; [ nand0p ]; 
+    };
+  }
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index a923e553582c1..21a7755c4097c 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -82,10 +82,13 @@ in buildPythonPackage rec {
   '';
 
   meta = {
+    # https://github.com/pandas-dev/pandas/issues/14866
+    # pandas devs are no longer testing i686 so safer to assume it's broken
+    broken = stdenv.isi686;
     homepage = "http://pandas.pydata.org/";
     description = "Python Data Analysis Library";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ raskin fridh ];
     platforms = stdenv.lib.platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
new file mode 100644
index 0000000000000..844d2e2295474
--- /dev/null
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
+  pytest,  mccabe, configparser, backports_functools_lru_cache }:
+
+  buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "pylint";
+    version = "1.6.5";
+
+    src = fetchurl {
+      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
+      sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6";
+    };
+
+    buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];
+
+    propagatedBuildInputs = [ astroid isort ];
+
+    postPatch = ''
+      # Remove broken darwin tests
+      sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py
+      sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py
+      rm -vf pylint/test/test_functional.py
+    '';
+
+    checkPhase = ''
+      cd pylint/test
+      ${python.interpreter} -m unittest discover -p "*test*"
+    '';
+
+    postInstall = ''
+      mkdir -p $out/share/emacs/site-lisp
+      cp "elisp/"*.el $out/share/emacs/site-lisp/
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://www.logilab.org/project/pylint;
+      description = "A bug and style checker for Python";
+      platform = platforms.all;
+      license = licenses.gpl1Plus;
+      maintainers = with maintainers; [ nand0p ];
+    };
+  }
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 9357ea90b4056..04e820307a48a 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -3,8 +3,8 @@
 , buildPythonPackage
 , isPy35, isPy27
 , cudaSupport ? false
-, cudatoolkit75 ? null
-, cudnn5_cudatoolkit75 ? null
+, cudatoolkit ? null
+, cudnn ? null
 , gcc49 ? null
 , linuxPackages ? null
 , numpy
@@ -16,8 +16,8 @@
 , zlib
 }:
 
-assert cudaSupport -> cudatoolkit75 != null
-                   && cudnn5_cudatoolkit75 != null
+assert cudaSupport -> cudatoolkit != null
+                   && cudnn != null
                    && gcc49 != null
                    && linuxPackages != null;
 
@@ -97,7 +97,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = with stdenv.lib;
     [ numpy six protobuf3_2 swig mock ]
-    ++ optionals cudaSupport [ cudatoolkit75 cudnn5_cudatoolkit75 gcc49 ];
+    ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];
 
   # Note that we need to run *after* the fixup phase because the
   # libraries are loaded at runtime. If we run in preFixup then
@@ -105,7 +105,7 @@ buildPythonPackage rec {
   postFixup = let
     rpath = stdenv.lib.makeLibraryPath
       (if cudaSupport then
-        [ gcc49.cc.lib zlib cudatoolkit75 cudnn5_cudatoolkit75
+        [ gcc49.cc.lib zlib cudatoolkit cudnn
           linuxPackages.nvidia_x11 ]
       else
         [ gcc.cc.lib zlib ]
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
new file mode 100644
index 0000000000000..8d36d3c3a61f4
--- /dev/null
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -0,0 +1,16 @@
+{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }:
+buildPythonPackage rec {
+  name = "typed-ast-${version}";
+  version = "1.0.1";
+  src = fetchzip {
+    url = "mirror://pypi/t/typed-ast/${name}.zip";
+    sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154";
+  };
+  # Only works with Python 3.3 and newer;
+  disabled = !isPy3k && !(pythonOlder "3.3");
+  meta = {
+    homepage = "https://pypi.python.org/pypi/typed-ast";
+    description = "a fork of Python 2 and 3 ast modules with type comment support";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 0d9c1490d2b98..5aa839b3b5a85 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -94,9 +94,6 @@ mv cran-packages.nix.new cran-packages.nix
 
 Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
 mv bioc-packages.nix.new bioc-packages.nix
-
-Rscript generate-r-packages.R irkernel  > irkernel-packages.nix.new
-mv irkernel-packages.nix.new irkernel-packages.nix
 ```
 
 `generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index b2cb8857db770..a19aa0f51a2d6 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2017-02-23"; };
+let derive2 = derive { snapshot = "2017-03-03"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -76,6 +76,7 @@ in with self; {
   AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; };
   AWR = derive2 { name="AWR"; version="1.11.89"; sha256="0mg48720ny2a28yfwqx5p4r7g7rbjbzzgbkd2m31hfyz4vnrsr4v"; depends=[rJava]; };
   AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; };
+  AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
   AbSim = derive2 { name="AbSim"; version="0.1"; sha256="0z3ghz0wmf2z4s2mnadiacir5frzlw77gca8fkvdh8rv5pwyy38c"; depends=[ape poweRlaw]; };
   AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5"; sha256="0071llj6xqsj495nlnvhzsqbrvls7fs3xscng537332xinmfhwdr"; depends=[DESeq limma Rcpp RcppArmadillo]; };
   AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-5"; sha256="18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"; depends=[]; };
@@ -112,6 +113,7 @@ in with self; {
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
+  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.0"; sha256="14cdkbwv6bf0h6na200gwq6gdldzawsvzk9pnpixj1kq2n8amm6b"; depends=[ape seqinr]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
   AnthropMMD = derive2 { name="AnthropMMD"; version="1.0.1"; sha256="1zb5qxmnbp2ha7hsnb4cvlc6n83gimwsq2g5pwkg7yqi5xgcp1ff"; depends=[tcltk2]; };
@@ -184,7 +186,7 @@ in with self; {
   BH = derive2 { name="BH"; version="1.62.0-1"; sha256="01vfdpfznd4ynqql33z238xr262mvy3i80lyi8l3a3p3hi0a262p"; depends=[]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BIEN = derive2 { name="BIEN"; version="1.0.0"; sha256="1yzn7inxc471pnk8b1c6q3s07r8j400dhmplnk7nbbgfbagqi987"; depends=[ape DBI maptools rgdal rgeos RPostgreSQL sp]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.12-0"; sha256="13bdv9wh5s5jz5hkl839hd9x13958r3p3zzkz6j0nd7z5xax47x6"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
+  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.13-24"; sha256="03p4k067s5wl7i9qy1iym9ndq4977a42nbbcac40akvibqpzhgdy"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="1.5.5"; sha256="1blqaxhx9ffa036zcz30kmkhh58l0ybmyrb2sb947f2i13h7qsk0"; depends=[haplo_stats XML]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
   BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; };
@@ -201,7 +203,8 @@ in with self; {
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
-  BNPdensity = derive2 { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
+  BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
+  BNSP = derive2 { name="BNSP"; version="1.1.1"; sha256="00rmfn0ivrjghwzpfig3znwpswj0l1jvs9kvkknb1z33kvwbc9b4"; depends=[]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; };
   BPEC = derive2 { name="BPEC"; version="1.0"; sha256="15ys0nzy6988yw1lf4lmv2h9i164cbl41x261gdyvmg0dy62qsnc"; depends=[ape coda fields igraph maps maptools mvtnorm phytools R2G2 sp]; };
@@ -258,7 +261,7 @@ in with self; {
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
-  BayesS5 = derive2 { name="BayesS5"; version="1.22"; sha256="18bs9kgpk7qg1hqdk7av0ygmrkn19nmrdprxf5syy0iqj5l3y13q"; depends=[abind Matrix snowfall]; };
+  BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
@@ -283,7 +286,7 @@ in with self; {
   Bergm = derive2 { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
-  BeviMed = derive2 { name="BeviMed"; version="3.0"; sha256="0mm1n9lmx03cmwdm3nwj7x42sa24vnahhxizykfd1npcfm9zz5ij"; depends=[Rcpp]; };
+  BeviMed = derive2 { name="BeviMed"; version="4.0"; sha256="16hwjs3kv1f49la2p5qlywc02n9g7g7qzb5v4m7p2mmi0p2ybmvm"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.2.2"; sha256="13v8kwf8rnagf978v26a5qn19x44lzdz61n80rw8vxi2ydxbdbr9"; depends=[biclust foreign]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
@@ -337,6 +340,7 @@ in with self; {
   BrailleR = derive2 { name="BrailleR"; version="0.24.2"; sha256="07kd9x176gd3ccpskv7vn22jam1pknsywcd09qj7l4zfbv9l0rqx"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
   Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
+  Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; };
   BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
@@ -357,7 +361,7 @@ in with self; {
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CATT = derive2 { name="CATT"; version="1.0"; sha256="1hnhzla14y0cii51pi53a42bmsxcqvylj88fyvgpfavmvz301f7d"; depends=[]; };
   CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; };
-  CAvariants = derive2 { name="CAvariants"; version="3.3"; sha256="14ly5pyhvsbz08p0pk1ijwivz17jrnd0qqzn4n9jqzc9b8yml4dw"; depends=[]; };
+  CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
   CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
@@ -373,6 +377,7 @@ in with self; {
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
+  CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.0"; sha256="1sj6w80w5qmy5advk2y38lrq9xz1zidq9f83xc364kpn3nw2d7x2"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; };
   CEGO = derive2 { name="CEGO"; version="2.1.0"; sha256="141gr1sin6sgvjasm6sczvq2za25ybw7wapdljdx2lx7qhgq77rk"; depends=[DEoptim expm MASS Matrix quadprog]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
@@ -454,7 +459,7 @@ in with self; {
   CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
   CensMixReg = derive2 { name="CensMixReg"; version="1.0"; sha256="0plqirl6vhk2rx9q2kgniq7km9jl1g6xdn74sdjpdcm4srmr7074"; depends=[mixsmsn mnormt mvtnorm]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
-  CensSpatial = derive2 { name="CensSpatial"; version="1.2"; sha256="07zi8mxzrqfdcyrrgch9yn0dpmvj5aj2d10q26cnykifsdbaq12c"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
+  CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
   CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; };
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.5"; sha256="1q6dcikmk5la5msb4gml0llvbb9262bsgmdhxi75myv4jlb3b8p9"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
@@ -520,8 +525,9 @@ in with self; {
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
   CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
+  CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="1.1.2"; sha256="14y18vvj13f3wi5gzrwabmj908hh1c2mizw98a36xxzlxw79fipd"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
-  Compositional = derive2 { name="Compositional"; version="2.2"; sha256="06s101fa8iv1sdg6x5yz3fl08mjjw265ff9kj9dxds02h036b84s"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
+  Compositional = derive2 { name="Compositional"; version="2.3"; sha256="1w2knd1h2827vl31zm9k2h404w9kcavigsj8idi8ndp6c0b2j6pc"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
   ConR = derive2 { name="ConR"; version="1.1"; sha256="1jl6pp0g7qrp0h5771r03gjiy4g7xbqw12liiqd8cfyl045s07yr"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat]; };
@@ -536,7 +542,7 @@ in with self; {
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
-  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.4"; sha256="087kyq6bmnv12cg1il2hb9x1wbac5a85khf8mgvcvy4f1f8hhckr"; depends=[ggplot2 plyr reshape2 rstan]; };
+  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.5"; sha256="0zc2i3d7b0p7qn6gy1pygq6xn31fkasdqgqa40zidzjwiwl3h3g4"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
@@ -598,7 +604,7 @@ in with self; {
   DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
   DClusterm = derive2 { name="DClusterm"; version="0.1"; sha256="0xkl4677vqy4sdkm0fczscqszjxk1kfmlbzdgm88shcnjzjg71d8"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
-  DDD = derive2 { name="DDD"; version="3.3"; sha256="1rjk35gz8zq0xprzag9nzfs569pm7nhl7bfrvcnapigd2h7gw612"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
+  DDD = derive2 { name="DDD"; version="3.4"; sha256="0rjn28ndwa5cp23xdk830qidgs0kg3rx34yipkfg1bi4r7751was"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
   DDRTree = derive2 { name="DDRTree"; version="0.1.4"; sha256="02z4j777yxqp09gxwzmn6x5fjz4rbsp1lh4qj20vgdjp8wcn3pn0"; depends=[BH irlba Rcpp RcppEigen]; };
@@ -624,7 +630,7 @@ in with self; {
   DLASSO = derive2 { name="DLASSO"; version="1.0.0"; sha256="1rnm9f31d021yk2rhk7zcp2l9zbyxhpvdx32q6jjjjsiignjzc60"; depends=[MASS]; };
   DLMtool = derive2 { name="DLMtool"; version="3.2.2"; sha256="13qpv6k3dn793kykxi9bmj2bl893lql7zsyfp6s3r7wp29k3kjj1"; depends=[abind boot MASS Rcpp readxl snowfall]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
-  DMRMark = derive2 { name="DMRMark"; version="1.0"; sha256="09bw1iyyc4hqy6cjbci736zh0qzdfzk1s90in93f7s967d73mj8w"; depends=[ellipse MCMCpack mvtnorm]; };
+  DMRMark = derive2 { name="DMRMark"; version="1.1.0"; sha256="11kwlk0q5c548m28n3hjsnmn8fcbjwsaw29qr4lb503mqsm2k7wn"; depends=[ellipse MCMCpack mvtnorm]; };
   DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
   DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; };
   DNAprofiles = derive2 { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[bit Rcpp RcppProgress]; };
@@ -642,6 +648,7 @@ in with self; {
   DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.4.0"; sha256="1dy6kxk63yaa8npaszcsc5g5is8ikcdfxkk1csy34m6q5l18yxar"; depends=[adaptivetau deSolve knitr shiny]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
@@ -705,12 +712,13 @@ in with self; {
   DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; };
   DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; };
   DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; };
+  DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; };
   DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
-  Directional = derive2 { name="Directional"; version="2.4"; sha256="1yrk0x4dydsx82415kv6a2asbd1d06ac7vyqi5j6rm4sa5cp6qmb"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="2.6"; sha256="0qgaxsicrklkarp25k10z8w51gdidl421hnbiiyrjfslxlghqr2n"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
   Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
   DiscML = derive2 { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
@@ -724,7 +732,7 @@ in with self; {
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
   DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
-  DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.5"; sha256="009fy4c11w0p30jpd94vj020pnrzm8z2iwlhkdij1f14ifpamzv2"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
+  DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
   DoE_base = derive2 { name="DoE.base"; version="0.29"; sha256="013p4y7imf6nb1mq7dx62c0nq5shf1yzdlfbri86icrdm00s63fd"; depends=[combinat conf_design lattice MASS vcd]; };
@@ -754,7 +762,7 @@ in with self; {
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; };
   ECctmc = derive2 { name="ECctmc"; version="0.2.3"; sha256="1iplg647qs52007h4vx507s643h7knisravif3v6rfyp6fhfl7v2"; depends=[Rcpp RcppArmadillo]; };
-  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.5"; sha256="0ml623q679id989gbr9k52719blgbhfcsrzi9xaqzvwcg5qq9bi5"; depends=[jsonlite shiny]; };
+  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.8"; sha256="1yy3qxp1555h76xybnsxqnwg65flwp473wif9r1wx9965v8v6brq"; depends=[jsonlite shiny]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
@@ -843,8 +851,9 @@ in with self; {
   EnvCpt = derive2 { name="EnvCpt"; version="0.1.1"; sha256="052yz26lypcffwnxdqxm2d029rzcdkw5dvf2xyvyhi5lcnxjrn9r"; depends=[changepoint forecast MASS zoo]; };
   EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; };
   EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; };
+  EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.7"; sha256="0pc1k9xr6ghm7v4cpi8qkz0b3xbq6yy4r3fqjlqly16rsvznnpcr"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
+  Epi = derive2 { name="Epi"; version="2.10"; sha256="0kmyan9jhjsr9f1yhff94yyy56xhm9irfrzm2m4dpf56376m2w8b"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.10.0"; sha256="0x0ah55nx68mq05hpp29g9h21is3kx9d84r82j4x4asyqjv92s7v"; depends=[]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
@@ -957,7 +966,7 @@ in with self; {
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-0"; sha256="0mywkrq929a0v20a1zaa9zc5l9k2kw5y1zz458iff3i56pzrcrsj"; depends=[minpack_lm timeSeries]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.4.0"; sha256="1rai3hgx10q6jcjpqd0jsqvp15am3i48n1ph6dl88mhwgiblvh9w"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
+  FedData = derive2 { name="FedData"; version="2.4.5"; sha256="1ad5dffrp2rwl8sdbik40g8p0c1drb5fxkcysh3qzsd6wi1zc2ff"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
@@ -996,7 +1005,7 @@ in with self; {
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.3.3"; sha256="0n4c6lfljp7mbl05r75rj31q0rkwnmj6gif3fmxmv1y5x7x2jrxj"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.0"; sha256="06nnqij3cki1mdks5r422ydyc1hswfv03686jx5g9fcgxbs907kh"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
   Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
@@ -1059,7 +1068,7 @@ in with self; {
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
   GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; };
-  GLDreg = derive2 { name="GLDreg"; version="1.0.6"; sha256="02g4g3w7dq5jjrir1fcxirbx36ci04fcadli921r6hz4xifhil7d"; depends=[ddst GLDEX]; };
+  GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
   GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
@@ -1136,7 +1145,6 @@ in with self; {
   GeneralTree = derive2 { name="GeneralTree"; version="0.0.1"; sha256="0wlhpxky4vckmcg0imvcxsg2rg2pbrh5822lpkdp28aj7b4s7wqv"; depends=[R6]; };
   GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
-  GeneticTools = derive2 { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT plotrix Rcpp RcppArmadillo snpStats]; };
   GenomicTools = derive2 { name="GenomicTools"; version="0.2.3"; sha256="1ga2myi2y5rpab0v58y1ndfqrxmbl1wdr3d0s8215apwiax4rfm4"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
   GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; };
   GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
@@ -1178,7 +1186,7 @@ in with self; {
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GrowingSOM = derive2 { name="GrowingSOM"; version="0.1.1"; sha256="0pzhf27kk9nc73w6wp0qd50i7hk7904y90l2ppdgy738z9gcbz4i"; depends=[plotrix]; };
   GrpString = derive2 { name="GrpString"; version="0.1.1"; sha256="0kqz2m6ycj83s5kcgbf7l6cpfgfrza7b0y23cgljf952pys2ndys"; depends=[plyr]; };
-  GsymPoint = derive2 { name="GsymPoint"; version="1.1"; sha256="0dps7mwq17y4fd64if2d99pr38y2wn3mksv3nsijysj0bhiwzh11"; depends=[ROCR Rsolnp truncnorm]; };
+  GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; };
   GuardianR = derive2 { name="GuardianR"; version="0.8"; sha256="07bg7wz7d2rgjkw5ldzi5p7nd4ch39m6ql5w4sqnvds4r08jspj9"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
@@ -1218,12 +1226,12 @@ in with self; {
   HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-  HRM = derive2 { name="HRM"; version="0.4.3"; sha256="1g6kka2havns39c2m3ynq3k2zfl5vjvrf2xhhr3xhfd1p4sl0c6g"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
+  HRM = derive2 { name="HRM"; version="0.5.0"; sha256="0xppx5ip0qhrfhri7yzqmkqrr6lf1a4pmk2lc5vxmsxdfs273y9r"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HSAR = derive2 { name="HSAR"; version="0.4.0"; sha256="1k40hh546hrdm2yh64l51sky17mnmkzckb7l3bnkpw495rsk73g2"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
-  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
-  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
+  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-15"; sha256="0vsmx201dwfgdwm9kz6nl2z5v0x3fpkbf5qmj39zb174rfz4bvhf"; depends=[]; };
+  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-6"; sha256="1mn9nawi2nv6qmzm5h3259sb4k0ywc281rfnwjcv8wv88i11qiwd"; depends=[]; };
   HSROC = derive2 { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
@@ -1238,7 +1246,7 @@ in with self; {
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
-  Haplin = derive2 { name="Haplin"; version="6.0.1"; sha256="1hdni0ni7qbhcwg7ficv09dxj20cavyzijwdc2vk41smdsm9gg9i"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
+  Haplin = derive2 { name="Haplin"; version="6.2.0"; sha256="1r1qmald48xl1cxk2ynvh8p15958x52dlp3bdb303q2v8w66nfjm"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.6"; sha256="1zpba8l8fjc7ncrw0virfv1s9zaa4xsyn63jiay8ivik98siqhkb"; depends=[mice]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
@@ -1299,7 +1307,7 @@ in with self; {
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
   ICtest = derive2 { name="ICtest"; version="0.2"; sha256="0pd16cafhx7cfwasbdli0kin83wayn7hil8allpacv9yiinj2bq3"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
-  IDPSurvival = derive2 { name="IDPSurvival"; version="1.1"; sha256="0vd2dkspsq8aqihjs7dqpfb1xk5ydnwqwzhhg142mywgf0zg2fkh"; depends=[gtools Rsolnp survival]; };
+  IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; };
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
@@ -1344,11 +1352,13 @@ in with self; {
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
+  ImputeRobust = derive2 { name="ImputeRobust"; version="1.1-1"; sha256="1rc22p1wy9y20swv40z9f1yjswhzyifymbgrdlf1ycxm9dzn4nyk"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
   InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.4"; sha256="16978c1bdxbp3xxrcnx8yyar1dd292a5i43qhcymdp7nnprd6gc7"; depends=[coda ggplot2 rJava]; };
   IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
   IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
+  IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.1"; sha256="0phl0p6k4jsznvg7wn2vr4id5y5p0x81s7mj4sss9pjz49kj0laj"; depends=[]; };
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
   InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; };
@@ -1373,6 +1383,7 @@ in with self; {
   Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
   InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="0.83"; sha256="1iwhgfb7z9pbnwzn626v0w0ycfjlhpaiv1yzm062samvr0lqiyrh"; depends=[enviPat plyr Rdisop]; };
   InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.6-1"; sha256="16qlskxszpi24qsdl821n72pzdvmf1gg7lnlwyhyzhzzkh9az1pd"; depends=[glmnet mboost]; };
+  InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
   IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.1.0"; sha256="0741093vq1cqs9zh95fc6kwpd4a4r4yxvmcnp7f7j5xxyqy1h3xz"; depends=[]; };
   IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; };
@@ -1496,7 +1507,7 @@ in with self; {
   LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
-  LTRCtrees = derive2 { name="LTRCtrees"; version="0.1.5"; sha256="08g6bb2fbjw7xssav1n2hgr3x7wdpczvbdz2kgrgv8bhl1f4k9yx"; depends=[partykit rpart survival]; };
+  LTRCtrees = derive2 { name="LTRCtrees"; version="0.5.0"; sha256="18awxiln2ilr0jjyvkv47a3xy7v8rjlaksklb4pcn1kdlvb1nqf0"; depends=[interval partykit rpart survival]; };
   LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
   LW1949 = derive2 { name="LW1949"; version="1.0.0"; sha256="0icfgsh93f4i73p7wpacb6dsg4cdfh71l7rwhqknnifvb5nvp8sv"; depends=[MASS mgcv plotrix]; };
   LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; };
@@ -1559,7 +1570,7 @@ in with self; {
   MALDIquant = derive2 { name="MALDIquant"; version="1.16.1"; sha256="0058i0nc81qp7sj7j9bcy7s2vkmbacj5ycwdnvsfmsr172adxdar"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
   MAMA = derive2 { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; };
-  MAMS = derive2 { name="MAMS"; version="1.0"; sha256="1y322is7c60naaz4cb090wpavw71y7hvx6n3k41ig8rfh096f60b"; depends=[mvtnorm]; };
+  MAMS = derive2 { name="MAMS"; version="1.01"; sha256="0vm1pnh5bcggsip4cpbfif2j2glvbsscpnpjsycbd2y0m05asccz"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
   MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.4"; sha256="1xw0wk2a14xwgay3vw7s1sxpwrmm01lqnfphcnhf1iyhdsxqnnnc"; depends=[magic MASS Matrix plotrix plyr]; };
@@ -1611,7 +1622,7 @@ in with self; {
   MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[linprog Matrix]; };
   MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
-  MDplot = derive2 { name="MDplot"; version="0.3.1"; sha256="1d5gv47zaal6vsfi10vfjvawdm911pnhjradhkrd647w54iykl59"; depends=[gplots gtools MASS RColorBrewer]; };
+  MDplot = derive2 { name="MDplot"; version="1.0.0"; sha256="18q25qxwqd8jwn8y781xqisd15k9p81nmxkx41pyi703njav1fm1"; depends=[gplots gtools MASS RColorBrewer]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
@@ -1645,13 +1656,14 @@ in with self; {
   MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
+  MLID = derive2 { name="MLID"; version="1.0.0"; sha256="1zbydvw4sv5q0lh2d4z0alrlc28dy6xnxd67iq8qd0k28gpwnzd1"; depends=[lme4 nlme]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
   MLRMPA = derive2 { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
   MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; };
   MM = derive2 { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; };
   MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; };
   MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
-  MMDai = derive2 { name="MMDai"; version="1.0.0"; sha256="0xrdynns2w3rgpf2hliyn80x3an17kpisbkpfhwsak87pbfamk9i"; depends=[DirichletReg]; };
+  MMDai = derive2 { name="MMDai"; version="1.0.1"; sha256="0bh25yhdyk5i4gh4h6f5i8gkwympy3i2xwlkgrj18jzghyy02rx2"; depends=[DirichletReg]; };
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
   MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
   MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; };
@@ -1704,7 +1716,7 @@ in with self; {
   MVN = derive2 { name="MVN"; version="4.0.2"; sha256="0k8fbhnw2lbjgafab4m6j7nkzclj1226fdiv8bmv5vcm6g82nb19"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
   MVR = derive2 { name="MVR"; version="1.31.0"; sha256="114qv235dmbmdlg2dssbgn0bj78r6khg58xswvv98d58kfypw581"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
-  MVar_pt = derive2 { name="MVar.pt"; version="1.9.6"; sha256="0gwprgf22lna4d8bifq381p5hv7ws3nnj08m6rrjnisgl158459w"; depends=[]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="1.9.7"; sha256="1d5xgq3ydzv69v5dazkmmbxgag530cx5m1a3566kxkdk02rd8i71"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
   MXM = derive2 { name="MXM"; version="0.9.8"; sha256="1bi8lkw3dx5m2p6r8yr60ysxs0ijkaahjvh7c8q7vlg8116fdvbp"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; };
@@ -1737,7 +1749,7 @@ in with self; {
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-2"; sha256="0mk5h9bafy1ndi1h6vcjh285xfj38gjpiz6n8xcmp8zh6vi6gx70"; depends=[ggplot2 raster]; };
   MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.8"; sha256="007i1zmklcmj76kmyl60wvcgb9vzrn677k81n5mmfz36vr0zkp8f"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
-  Mcomp = derive2 { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
+  Mcomp = derive2 { name="Mcomp"; version="2.6"; sha256="01m2kawkxs9k7va3bvv7bknl4y13rhy8zczc093f10msgy6nqncl"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
@@ -1752,6 +1764,7 @@ in with self; {
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
   MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
+  MetaComp = derive2 { name="MetaComp"; version="1.0.1"; sha256="11h0b62c54vgvdnxfjg233ripyfpi4b1d9lkpkc09d8jifhbga7q"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
@@ -1833,6 +1846,7 @@ in with self; {
   MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; };
   MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
+  MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.1"; sha256="0x13q2kckw7c7bl35vdxyhhr7ij62wf0qbkxa40fi6aq2gjh89m6"; depends=[lme4 Matrix statmod]; };
   MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.2"; sha256="1xp1bdkp87kvgsg4q5b91r712l6sdvmlcvaychi72pvgv33a8x11"; depends=[bootstrap Rcpp]; };
   MvBinary = derive2 { name="MvBinary"; version="1.1"; sha256="1lrrxvphxv4gmlazx67q4bck9373nqylqgkwcjzwb52291a3zyiv"; depends=[mgcv]; };
   Myrrix = derive2 { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
@@ -1932,6 +1946,7 @@ in with self; {
   OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
   ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; };
+  OOBCurve = derive2 { name="OOBCurve"; version="0.1"; sha256="1dx2lfdpfl0aq1wshjrwa58wz20s57q03pzfj5rv6xyfmm8qhrzw"; depends=[mlr randomForest ranger]; };
   OOR = derive2 { name="OOR"; version="0.1.1"; sha256="09c7c2inpnag3kckrg9lfzxd3giqkj9xm91ibjkgpfv68nf733qc"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
@@ -1963,7 +1978,7 @@ in with self; {
   OpenML = derive2 { name="OpenML"; version="1.2"; sha256="16zvxr45jcw4z30jmg9l6xdlkq76wbi89xj8c328qkwlghik17sy"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
   OpenMx = derive2 { name="OpenMx"; version="2.7.4"; sha256="18zgypwjd37fcmsc3gzsa3ww6b7l9y9sm7jgj5x79hzqn0mfknfv"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
-  OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
+  OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; };
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
@@ -2038,7 +2053,7 @@ in with self; {
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
-  PKNCA = derive2 { name="PKNCA"; version="0.7.1"; sha256="170chkdh78xmcw2p1xm23x4q5kj0637i0nbrwz73cxg0yni4h3qa"; depends=[digest doBy lattice nlme plyr tidyr]; };
+  PKNCA = derive2 { name="PKNCA"; version="0.8.1"; sha256="1by2yp1ngqv06w7dfl7lbb80gnmpid4xg1yhk4zvx8bwss0ggzph"; depends=[digest dplyr lattice nlme plyr tidyr]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
@@ -2055,7 +2070,7 @@ in with self; {
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; };
-  PRISMA = derive2 { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
+  PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
   PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -2078,7 +2093,7 @@ in with self; {
   Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
   PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
   PairedData = derive2 { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
-  PanJen = derive2 { name="PanJen"; version="0.1"; sha256="09jl3ny4wcz7kd9kvqp5rscl8amxhpibzhny9lnakck3jrwa20hr"; depends=[Formula lasso2 mgcv RColorBrewer]; };
+  PanJen = derive2 { name="PanJen"; version="1.1"; sha256="00bvmwskawmi4x89wcn6k37nrdxfil7j1n6kc368yxvrfwvxgssy"; depends=[Formula lasso2 mgcv RColorBrewer]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
@@ -2184,6 +2199,7 @@ in with self; {
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
   Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; };
   PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; };
+  Pstat = derive2 { name="Pstat"; version="1.0"; sha256="13mm5jk3frl74sm988q8yazm790wlx2npf2cav6h5rb8ck637ffb"; depends=[]; };
   PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
   PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
@@ -2223,15 +2239,15 @@ in with self; {
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
   Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
-  QuantTools = derive2 { name="QuantTools"; version="0.5.3"; sha256="01q71n9q9fqg6yn8mxnmd3j0mwp7ryxrkfw5cvpjwd1i9ld5d7jd"; depends=[data_table fasttime Rcpp RCurl readxl]; };
+  QuantTools = derive2 { name="QuantTools"; version="0.5.4"; sha256="01xn9ksb2v3glqpxhdizp8b0786azkm8kv6xxdqk3q7ysm44lac1"; depends=[data_table fasttime Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
-  QuantumClone = derive2 { name="QuantumClone"; version="0.16.8.19"; sha256="019rhpvc4by3pizy3i6sw04230hzhmq79mkhjin3777mn9gdnzfm"; depends=[doParallel foreach fpc ggplot2 gridExtra optimx]; };
+  QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.3"; sha256="1j7v6cg3rafs9a8qmlmqk1an39kd6h6pbspd7zalmnq1v1a10m91"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; };
   Quor = derive2 { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
   R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
-  R_filesets = derive2 { name="R.filesets"; version="2.10.0"; sha256="0wdqxskmamqygvxh9jmvkhkgm906yrqci6vivczr9la0j4zwnn0b"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; };
+  R_filesets = derive2 { name="R.filesets"; version="2.11.0"; sha256="0hjmd86zqsd9v17ma9r734pk9b0k53ayb52w5mm19d9hnl3wnv08"; depends=[digest future R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; };
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; };
@@ -2253,7 +2269,7 @@ in with self; {
   R2admb = derive2 { name="R2admb"; version="0.7.15"; sha256="1v01fbcc7hx6mswn4gkwpm6k171956wk51ls6sgca1i6ia6ckmli"; depends=[coda lattice]; };
   R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
-  R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
+  R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
   R6 = derive2 { name="R6"; version="2.2.0"; sha256="1ir51pb0y6yj05qaxsflk4a6hv8n73cwlb0qajcskbrz632dsyvx"; depends=[]; };
   R6Frame = derive2 { name="R6Frame"; version="0.1.0"; sha256="0ib0van2qk0p89qmii8naj1jx56i6j7srvydzm41pyq2xdg0bmga"; depends=[data_table lazyeval R6]; };
@@ -2350,6 +2366,7 @@ in with self; {
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
   RImpala = derive2 { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
   RInSp = derive2 { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
+  RInno = derive2 { name="RInno"; version="0.0.1"; sha256="15rbd757am55kr1jkm1vh3ida5h4wbfcj0brj6ddjbpfivybg8wr"; depends=[curl httr jsonlite stringr]; };
   RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
@@ -2430,7 +2447,7 @@ in with self; {
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   RPEnsemble = derive2 { name="RPEnsemble"; version="0.3"; sha256="052c9cnsrjxbk2yxj08psy3nw0mq3mdr75fhnxpz64n4cqzxbr2q"; depends=[class distr MASS]; };
   RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; };
-  RPMM = derive2 { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
+  RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.3"; sha256="0qgvr671zir8d1q5rzdy0gkljsfr7bz1aj47xpkbbpkjr5hqgihj"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.4-1"; sha256="0ydz206ir797rv435if3653fnnyihgmhr5d0n4zhlrs1m1zy74k2"; depends=[DBI]; };
@@ -2472,7 +2489,7 @@ in with self; {
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
   RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; };
-  RSentiment = derive2 { name="RSentiment"; version="2.1"; sha256="0gcmgnczqhz8vzwj8img32z95si1ywbg2mvfd3rwlxzxqdkxg98v"; depends=[NLP openNLP plyr stringr]; };
+  RSentiment = derive2 { name="RSentiment"; version="2.1.1"; sha256="1p8bffsngk0s91y4f7prnlr7w9bxh460mf5ibi7v4md7jbbvhcsf"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
   RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.10"; sha256="1wi2rv5wwibw8m0xd37f284b14irg2gnm31yz73c3wpic2sbf3wf"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.1"; sha256="1xxs5q25v3i0qf829xl8n90n2fx1anfgfrzvwzff4dm252y7b2gw"; depends=[RCurl]; };
@@ -2485,7 +2502,7 @@ in with self; {
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; };
-  RSurvey = derive2 { name="RSurvey"; version="0.9.0"; sha256="09ivilmwvjjbs3451cyxhcgq2w9rx6b8b5dsgg6y7l478k5bffrw"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
+  RSurvey = derive2 { name="RSurvey"; version="0.9.1"; sha256="0q0iyljdrg6avskqmsczda3008nrzg0lf1bmp4x188vx4dm0cs11"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
   RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
   RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
@@ -2494,7 +2511,7 @@ in with self; {
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.8"; sha256="0mngwi7ybcg6lsk3f7faljwnzsfvyxln4jd2s2hiirr303ml4wzg"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-62"; sha256="0b4g0ia5kawamm6mpzw04365j1cgf8py5dp18kdsqwgisxxm699f"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman statmod vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-63"; sha256="0ckpwblflvz48745rp46sx14lvkqpb3csrpapk22ihryr9zn17mh"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
   RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
@@ -2639,7 +2656,7 @@ in with self; {
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
-  RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.0"; sha256="1mli7h3d4vw0sds6pav74fzpw4c3lmy7jrlp0dw47cmfxg2rhslg"; depends=[isva quadprog]; };
+  RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.1"; sha256="1w0cx988ixl10d8ylfsblmk1mdd9dhzxdhp9z4n1643dkd2xzr02"; depends=[isva quadprog]; };
   RefManageR = derive2 { name="RefManageR"; version="0.13.1"; sha256="1yw3fbiis1gl7ih66b4vjr299xy3w164irmmdfsqr79n9h3p5kv7"; depends=[bibtex httr lubridate plyr RCurl RJSONIO stringr XML]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
@@ -2656,11 +2673,11 @@ in with self; {
   ReporteRs = derive2 { name="ReporteRs"; version="0.8.8"; sha256="1pw3hy3g0nc6amga59sb1nnwqc9asdpn6lh2zfh87y8nazrf1hf0"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
   ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
-  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-1"; sha256="1x7kc0zh22pqi7dw4iav9dac8wpj491lpqbnaqfncyhswpdkimvi"; depends=[MASS Matrix pbapply]; };
+  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; };
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.11"; sha256="1si21in7ykv4532xsz12v9nwzfj142bnbf14qc74fbp1p087k6c0"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.7.4"; sha256="1yrg3iflppbpjmw8rah4jdgwksnqplc0l3ds492s9zrw51vxz38c"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.7.5"; sha256="09nxyv2cb7z79nkcnb5wm58930yfhk6ndvznlqfg6xlihx0yjyq6"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
@@ -2765,7 +2782,7 @@ in with self; {
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; };
-  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.6"; sha256="0mm3dls9w9q060pylrkl3zwzix9zprpljajfm6z8k5bbhha1qsbc"; depends=[]; };
+  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.7"; sha256="0xs2zjr3r3a39szip53qkcja3n89vr1hq46a2zcwl6s5gdbb1vyj"; depends=[]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
@@ -2888,7 +2905,7 @@ in with self; {
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.1"; sha256="1mysmigksrgkgzz7cng5vn8i7q4marq144dpwww30lisw2jgraiq"; depends=[maptools reshape2 sp spacetime zoo]; };
-  STPGA = derive2 { name="STPGA"; version="3.0"; sha256="093van0k48x7i7r6g2kzn59x58rpqizkkw99l67agndnij13kck9"; depends=[]; };
+  STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
@@ -3010,16 +3027,17 @@ in with self; {
   SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.1"; sha256="06l2ayjwawjp1kap76jqbnbjhx7x27z7vfn5jd0pz4g764krpfdr"; depends=[fields Rcpp RcppArmadillo RcppParallel]; };
   SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.1"; sha256="0yk6sisl07wqrl16mzk6ch7567l87qrqlnzg976zq2s58cd6y3vh"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
+  SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.1"; sha256="0bx31z91hf6vf22knf7bcn2j72jf123v8lvsfc7fjf0ssimqhpzz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.1.1"; sha256="1fbch16qmp8xnlkl7crydn1rh5gj49zlii6c9va5l7zp5wf8cl87"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.6"; sha256="1zjjdhfancjliz0pa0rdfbf26wdci1v3krb42bd99kb4crrk9291"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.6-1"; sha256="1yscz5w6ydh87qh4ncgn6br49pzg08nqgx95m5bmydqx2r74h9jg"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.2"; sha256="1hwlyjpgzf2wgigbc49xcqhf6rzrjzkbriwa4i9gwpa0bnrs4wp1"; depends=[gsubfn splancs]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
-  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-0"; sha256="02mwl7kv784wdf3v6f15vbjd8sa1mh8ms11k19bjj3qci9xnx4jw"; depends=[Rcpp RcppArmadillo]; };
+  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-1"; sha256="18l2dpyks6vay4vh24jmv81br9fblhm0rb1m6jpfj1qzpa974010"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
   SpherWave = derive2 { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.3"; sha256="195is72nj1vbhdx3yqmklmc9hqaaxvipgmcxszgvnqdv5bsiypgw"; depends=[abind cubature mvmesh SimplicialCubature]; };
@@ -3059,6 +3077,7 @@ in with self; {
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
   SubVis = derive2 { name="SubVis"; version="2.0.1"; sha256="1r9i27hx8xj8f3mhbm8ygcxwpq1lzxm26vay5mqk4q9swskg1vbh"; depends=[Biostrings shiny]; };
+  SubgrpID = derive2 { name="SubgrpID"; version="0.10"; sha256="1gvlvsvc9v20l24zxy9i57bzj1gjplzk14fpjrhallsnp23h8zn5"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
   SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; };
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
@@ -3085,10 +3104,11 @@ in with self; {
   SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="1.99993-0"; sha256="1n5xs7s1rkn4y0317pkzg1dwdf7r5fm8wkaf0d3jvrz80g6cqbin"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+  TAM = derive2 { name="TAM"; version="1.99999-31"; sha256="0h2545b7hc417g5k9g482gk74mz15d0vqxviw60fqizxinxghlwv"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.0"; sha256="1zrx5zbfz0zrw46iziqnb11m75ri75dw1x88fd2dhw22am3q2940"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
+  TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
@@ -3206,7 +3226,7 @@ in with self; {
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="0.1"; sha256="1477zp8jzq1p22q8484vkrdx5nxwq4i44mxg4zhj9fixiw4shpx9"; depends=[ape]; };
   TraMineR = derive2 { name="TraMineR"; version="1.8-13"; sha256="058fj2jkr9hzpigmawzfv20c7dzdf70lwwxng46x0b1r34pdgrfr"; depends=[boot Hmisc RColorBrewer]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.5"; sha256="198yvnvw8yq321p2cdan1s47dy9vy4yxhqsnlp391lzykvan1qpc"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.6"; sha256="1ih2d02p8dnpcvsxqqi6mcnac36i93g4fkq1pdpl7p2i1hl15hyr"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
@@ -3222,7 +3242,7 @@ in with self; {
   TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
-  TropFishR = derive2 { name="TropFishR"; version="1.0.2"; sha256="0rkgjx3nnjyy46fbn4szvbsiz8awf6238h7br9kjwc06aaj935dp"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.1"; sha256="0iv7v2wl899mw4c9nwgn530spc9vz0klhbrkc9ssazzrpxn3lq21"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
   TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; };
   Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   TukeyC = derive2 { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; };
@@ -3311,6 +3331,7 @@ in with self; {
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
+  WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.9-1"; sha256="0w7qnqf289p5jnfr9l83bcplxg1rvbhc90iz7wwnphx7246nkdvv"; depends=[MASS mc2d plyr reshape]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.0.1"; sha256="14xi1wksyj07nch678dd4rbaa3q1in4nbsarv5bijl2b11dhfi7j"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate quantreg RColorBrewer survival tidyr]; };
   WVPlots = derive2 { name="WVPlots"; version="0.2.2"; sha256="11zbmsq2nbvb9m7wkybwcmk1lj6n8w1v355qwsp41j9pd7r3ccw8"; depends=[ggplot2 gridExtra mgcv replyr reshape2 sigr wrapr]; };
@@ -3322,12 +3343,13 @@ in with self; {
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.0"; sha256="1qfh5ca8389b3zimqfrlhjyzkrvvj3dixhbab1a0wrnbcc55dcq1"; depends=[fracdiff wmtsa]; };
   WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
+  WebGestaltR = derive2 { name="WebGestaltR"; version="0.0.5"; sha256="17h7gq14mnwfjgiyf8gwvy7z60rwd13bqgbx6pkxqf95j48k0bsg"; depends=[data_table doParallel foreach pkgmaker rjson rPython]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
   WhatIf = derive2 { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
   WhiteStripe = derive2 { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
-  WhopGenome = derive2 { name="WhopGenome"; version="0.9.4"; sha256="085jzpgd1wgbsj68n5cixq6q4hw2sz485d9lpmch9qakhbpm7849"; depends=[]; };
+  WhopGenome = derive2 { name="WhopGenome"; version="0.9.6"; sha256="038bg8c3y9h5hbkicikdqcjli5cf1bpmsc021zi00bgsk8z4i1iq"; depends=[]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
   WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; };
   WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.0"; sha256="17vnfarnqf5cqdldgwg505vcj2l0hji409zdyncks7xcq8myvswz"; depends=[dplyr httr jsonlite]; };
@@ -3364,8 +3386,8 @@ in with self; {
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
   ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
-  Zelig = derive2 { name="Zelig"; version="5.0-15"; sha256="1a55v03znczpbwlxd70dy73lzq75ifmqfkhwmwn7vdz8pdcsmiqx"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
-  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-3"; sha256="0wh10mzasl2mzn0afas2k9dqjsmdgnbjci9i9s1fqxgdil0jp09q"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
+  Zelig = derive2 { name="Zelig"; version="5.0-16"; sha256="1myj1a6y69rmjrgaax2n26qa7cprclszg1s9xdzw6s6kqaw5b969"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
+  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-4"; sha256="02wbgzrp0jxkzz1bj5s6zk6m0w7l26jncml91mwhb2w5hzhjnbaj"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-0"; sha256="1vkni4p1b0aq63l4nqg16f6a28c6ccm8nyg67z45x0yfq7xgcsi6"; depends=[dplyr ei eiPack jsonlite MASS MCMCpack Zelig]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
@@ -3442,7 +3464,6 @@ in with self; {
   adwave = derive2 { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; };
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
   afex = derive2 { name="afex"; version="0.16-1"; sha256="0y0q7lbdraw8sn4l9qazvdawqpsyjzhfzddp9gii8w72a69s90dq"; depends=[car coin lme4 lsmeans Matrix pbkrtest reshape2 stringr]; };
-  after = derive2 { name="after"; version="1.0.0"; sha256="0r0cdb0jspqi5vmaighwwqc0636wc5m297nq1j3n84w7z2aglg2w"; depends=[]; };
   aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
   agRee = derive2 { name="agRee"; version="0.5-0"; sha256="16ijw02x5qvc8rppf0yn35aljd35alnvjkjyi6725nywjib2xy5x"; depends=[coda lme4 miscF R2jags]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
@@ -3511,7 +3532,7 @@ in with self; {
   aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; };
   aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
   apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
-  apa = derive2 { name="apa"; version="0.1.0"; sha256="1a5xhybx43xgwf68fkxrqwj6azj70jpsrp2fwi1m7gvn4klcv3wh"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
+  apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
   apaStyle = derive2 { name="apaStyle"; version="0.4"; sha256="0ckxp37p1aizvs5sql54xvpimhq4m4944x18ihqffhpzb3dxw1ba"; depends=[ReporteRs]; };
   apaTables = derive2 { name="apaTables"; version="1.0.4"; sha256="1ncs79n0jvr6m9gmaazi5d9g2c6c6hf8alrb45z8fy8sj9bj51hn"; depends=[car MBESS rockchalk]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
@@ -3536,7 +3557,7 @@ in with self; {
   aqp = derive2 { name="aqp"; version="1.10"; sha256="1c8vj10mygsrlixx4pwfs1xk69bvhdi37hl4p1v6g3nwvsr8f7ac"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
-  arc = derive2 { name="arc"; version="1.0"; sha256="1arms8crr198i4niq1wvp8ig474hlgjx63q0m96f8w6fsz63knqy"; depends=[arules discretization Matrix R_utils]; };
+  arc = derive2 { name="arc"; version="1.1"; sha256="1ms0ibvsdjqgdramd4nxy5dcnw019yfpd5xryjficmkfxs6jl9pf"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="1.4"; sha256="1ymk56w07jj51p2r4g7qa4a3nyhnjrbn6igxgn6644mm0v118b8h"; depends=[XML]; };
@@ -3618,16 +3639,18 @@ in with self; {
   attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
-  aucm = derive2 { name="aucm"; version="2016.1-2"; sha256="1nyxxyivs6inq8r18x7fl3zkpn75sczwnbzsv672nzdlqj5d2b5f"; depends=[kyotil]; };
+  aucm = derive2 { name="aucm"; version="2017.3-2"; sha256="124rb1lhssvmlzkzb5h6hc5plv0hk7wkid53cbd28nxx1grp2wwm"; depends=[kyotil]; };
   audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
   autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
-  autoimage = derive2 { name="autoimage"; version="1.1"; sha256="0yi6n60b72qw20bp2hchxn653c3a9x2yvgawkqs31xbkq0s50rbc"; depends=[fields ggplot2 mapproj maps viridis]; };
+  autoimage = derive2 { name="autoimage"; version="1.2"; sha256="1dzxdz7wpmhl5p1jcab2i7k9fd7idm3dflsyj8clpp203wr4kz56"; depends=[fields ggplot2 mapproj maps viridis]; };
+  automagic = derive2 { name="automagic"; version="0.3"; sha256="0yzv0ianfq217jvz7rba86bcmxh09p513khvq6jk5k7isblvn0qd"; depends=[devtools dplyr formatR githubinstall knitr magrittr pacman purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
   automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="0.2.0"; sha256="18a41nrh5ll1i4gqh58iwbyg8wl9w4969mx24knldaf6c303c8ss"; depends=[EBImage magrittr rJava RSAGA]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
   averisk = derive2 { name="averisk"; version="1.0.2"; sha256="0k7f0l7bx76q5x8cam2z0q6akc9a6zj0pj0644v8gbr40n2y5snz"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
@@ -3670,7 +3693,7 @@ in with self; {
   base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; };
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
   base64url = derive2 { name="base64url"; version="1.1"; sha256="1f0asnf5ri55q6mhjkv7lfhr2hncs65vrykmr80r5sxsha6bqndz"; depends=[backports]; };
-  basefun = derive2 { name="basefun"; version="0.0-35"; sha256="12sakwz9g3w0w4di2i0l12nk5lmdniqhiq2nvmzbdy3vs4n06m3i"; depends=[Matrix orthopolynom polynom variables]; };
+  basefun = derive2 { name="basefun"; version="0.0-36"; sha256="1y2pvs5gffifvchyqahsnqg6zw00yargajvryrb96labh9c5dqyl"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
   basicspace = derive2 { name="basicspace"; version="0.18"; sha256="1jnylqaxgmdj9ld9q7hkmi4af8yzswaqgykbw96qzzxp9cvini1y"; depends=[]; };
   bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; };
@@ -3748,7 +3771,8 @@ in with self; {
   bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
   berryFunctions = derive2 { name="berryFunctions"; version="1.14.0"; sha256="16332811v3ivddklif5n3mwjp02c2hzysbj4vc6z6v6sxd1jvjq2"; depends=[abind]; };
-  bestglm = derive2 { name="bestglm"; version="0.35"; sha256="047gb82hgivgafx5b267gpgq9y11m74rag5j05rprmv9nz43hdqj"; depends=[lattice leaps]; };
+  bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; };
+  betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
   betapart = derive2 { name="betapart"; version="1.4-1"; sha256="1ldz6hr08vsgvz0h9ilsm5ab5fyppjpnz215lhri80x7biym3c0q"; depends=[ape geometry picante rcdd]; };
@@ -3766,7 +3790,7 @@ in with self; {
   bgeva = derive2 { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; };
   bglm = derive2 { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; };
   bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; };
-  bgmm = derive2 { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[car combinat lattice mvtnorm]; };
+  bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.1"; sha256="00xnqppq95qvdbiklsz4af4f0f4p61b7c7v0l1k1isxqr3mgcgia"; depends=[coda survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
@@ -3776,7 +3800,7 @@ in with self; {
   bibtex = derive2 { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
   biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
   bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
-  bife = derive2 { name="bife"; version="0.1"; sha256="09pv4xll609y4nfgalssyfgqd8c74zc75bbyq4d8h94yyhw1d8d0"; depends=[Formula Rcpp RcppArmadillo]; };
+  bife = derive2 { name="bife"; version="0.2"; sha256="00hfnd916aya48dn9n27igljav5v9xmac3bj5mhv9vggyccrim48"; depends=[Formula Rcpp RcppArmadillo]; };
   bigFastlm = derive2 { name="bigFastlm"; version="0.0.1"; sha256="00i5hq3i837hj5kszm9rqax86g273aklxwikrabzwnyai9ziz8qa"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.2.0"; sha256="1z9a725jd9nparid0df7fyvsa5mvz92krj0q7mq75x6cprr44f29"; depends=[googleAuthR googleCloudStorageR]; };
@@ -3826,7 +3850,7 @@ in with self; {
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
   bio3d = derive2 { name="bio3d"; version="2.3-1"; sha256="0dm582jam4ll5q82vfxf1gjrmv1qzl60kws6vmxjx91d5jwf1fqy"; depends=[Rcpp]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  biogas = derive2 { name="biogas"; version="1.6.0"; sha256="100593ddrsl82hhpq289vs0gdasrm9fmwf6vhd530rp8k7y07j4a"; depends=[]; };
+  biogas = derive2 { name="biogas"; version="1.7.0"; sha256="1c0w78x2jjgsxffcz61lfs5m72kkds55c73z970nbxvhqk8n15j6"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
   bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; };
@@ -3858,7 +3882,7 @@ in with self; {
   bizdays = derive2 { name="bizdays"; version="1.0.1"; sha256="1nig6nfxw7vrvq20p49l2b5z8cnjihljivir3lgj99djb5w8i6lk"; depends=[]; };
   bkmr = derive2 { name="bkmr"; version="0.1.0"; sha256="0pw82sd8x82nk5c5c6lr7yqr767nrkgk1rvbpwy5vwdpvwwj5ibl"; depends=[dplyr fields magrittr MASS nlme tidyr truncnorm]; };
   blackbox = derive2 { name="blackbox"; version="1.0.18"; sha256="1sgq6i8p066li9lr3241zplygv7yc7mp7k13c6nih0289v3l7jg7"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
-  blavaan = derive2 { name="blavaan"; version="0.2-2"; sha256="1jiicy21zhrnk04b74nxs4yp3g0mzcxxb6zn5wks12b1791ykrm6"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
+  blavaan = derive2 { name="blavaan"; version="0.2-3"; sha256="1hbcvjgkf0hcajg12dmf0zpyf4nhp938gbqk511vz1033iaamha2"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
@@ -3869,7 +3893,7 @@ in with self; {
   blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
   blob = derive2 { name="blob"; version="1.0.0"; sha256="0zjb3sbx4q36d69p2164im1nvpsdjz5mqa5rmncjziipgz6aix38"; depends=[tibble]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
-  blockcluster = derive2 { name="blockcluster"; version="4.2.1"; sha256="05fy6l0q0q0jmvyfph3wmlkniz4njkrzmhyy14hamzsiwn23cpiw"; depends=[Rcpp rtkore]; };
+  blockcluster = derive2 { name="blockcluster"; version="4.2.3"; sha256="1b3rqpg3i5bplz85lxfspb1vv8l7qsxwkalnn0h5pwy9ppqdbcb7"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
@@ -3913,7 +3937,7 @@ in with self; {
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
   bootsPLS = derive2 { name="bootsPLS"; version="1.0.3"; sha256="0jkpci97chbvlfkcbbj3gm2dnj5aiwfrh739kd4fa0zra4ac1adh"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
-  bootstrap = derive2 { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
+  bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
   boral = derive2 { name="boral"; version="1.2"; sha256="1xd9g3ll6ax363ip0wh5zpk8yw23pcv4wxlm2xxshmxyx0k9gqfk"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
@@ -3945,7 +3969,7 @@ in with self; {
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
   briskaR = derive2 { name="briskaR"; version="0.1.0"; sha256="0fx254pc250jv53kmd6miw8blcp43c72myah9g5ns2s84pcdmx6h"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="1.5.0"; sha256="1rjrf88wfbq1zzyxkrrajis6mrsv3zi4kdf7y8992bwfx53pwpph"; depends=[abind bayesplot coda evd ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan statmod]; };
+  brms = derive2 { name="brms"; version="1.5.1"; sha256="1qh72qfkpg2226ckjraca9lc5waaajnmv729w52c04b2vmxzsr0x"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.65-1"; sha256="1zfcrkky4a71zq4mgnc0xcy0m8c9srwq850s97qry9a69f6j5c42"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
   broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
@@ -4031,7 +4055,7 @@ in with self; {
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
   cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
-  catlearn = derive2 { name="catlearn"; version="0.3"; sha256="1bqcv58g4111yjschzdikb130as4wv08pxppzwpjh4k2pg929jmk"; depends=[Rcpp]; };
+  catlearn = derive2 { name="catlearn"; version="0.4"; sha256="1bpmvbpa6qab40ajmy64hg6f3zh3yifqj0rfqyk0b9f9jpdqxz9h"; depends=[Rcpp]; };
   catnet = derive2 { name="catnet"; version="1.15.0"; sha256="0z2ps2wb33hc0dg08v70gvpy2zibr6kqjjv90g07hkmrhp6zjk5n"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
@@ -4042,6 +4066,7 @@ in with self; {
   cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
+  ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; };
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
   cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
   cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
@@ -4185,7 +4210,7 @@ in with self; {
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
   clustrd = derive2 { name="clustrd"; version="1.1.0"; sha256="0l1mllgqqlkywhhp1a24hlvsiwkk26k58c9rg9m5pagb623w73p4"; depends=[cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.2"; sha256="1b38y9zn4xbiddm5m5ki307i5yih2nadhnpnsizz91jkcqdnjhw1"; depends=[BMA foreach iterators mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3"; sha256="1f7qyffm4jrlg4bh3mg550igs7wib8y9pksx0h6gn0n9pkv1s8rc"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
@@ -4213,7 +4238,7 @@ in with self; {
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
   codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
-  codingMatrices = derive2 { name="codingMatrices"; version="0.2.1"; sha256="00kvvsz1l603v36clsz7jm1yiwl07vcyhv4ghy0pjlz8hcfaqmna"; depends=[fractional Matrix]; };
+  codingMatrices = derive2 { name="codingMatrices"; version="0.2.2"; sha256="1x1h5jdnfx6l8ry7nmn3f1qyzv96vf8axzjxcxqrlylh6z1zc068"; depends=[fractional Matrix]; };
   codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
   coefplot = derive2 { name="coefplot"; version="1.2.4"; sha256="0phpz4fvvxvpaybp4q1s69qxcpdzj8qxambivncps101mz7jj3sq"; depends=[ggplot2 plyr reshape2 useful]; };
@@ -4251,7 +4276,7 @@ in with self; {
   comf = derive2 { name="comf"; version="0.1.6"; sha256="1dfba8i08gc319ybqhfs96wa2mp0ndh4rrkv9i432gc56p4kgapr"; depends=[plyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="1.1"; sha256="0dh56cspy8wkvbz0602vp050qxd70wm063lqflfk2zddcrv9lhc2"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="1.2"; sha256="12q5mncxvkwdxc35is6y5idx8a1h99hyz5x6ri0arni6k25krchk"; depends=[]; };
   compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
@@ -4312,7 +4337,7 @@ in with self; {
   cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; };
   coop = derive2 { name="coop"; version="0.6-0"; sha256="1q38kawck0625fyxmh7a0cya5yyhv9ds53q1l0h03vrappq5amxv"; depends=[]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.0.4"; sha256="0vc1rk0njcmd501jpsrpgqzrcqyplnycfaidn9qwns84cswx0hxs"; depends=[lmomco randtoolbox]; };
+  copBasic = derive2 { name="copBasic"; version="2.0.5"; sha256="0xijw9abqkljacwnblyncjkpaj178s9kq8jazxb39v4qk8pmvq6c"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-1"; sha256="1mvbarzq409lkf7sd6s4adf2cgvmby7f1yg35x83bp1sc8529kz8"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
   coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; };
@@ -4372,6 +4397,7 @@ in with self; {
   cplexAPI = derive2 { name="cplexAPI"; version="1.3.3"; sha256="1li5sbakkq8hrgwsa4i1qa5bdjj6vm6s9sq23ccknbb8bxp4zmwv"; depends=[]; };
   cplm = derive2 { name="cplm"; version="0.7-5"; sha256="16li79x2zyydi7gi4n8k09g9x2n1dgd9av3nqjnb0by3v31c44n0"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
+  cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
   cquad = derive2 { name="cquad"; version="1.3"; sha256="1r6g3yp3vvm8d5351lan4im1bmir38d4l9cf8bw0ay7as33ny3x9"; depends=[MASS plm]; };
   crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
@@ -4394,6 +4420,7 @@ in with self; {
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
+  cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
   crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
   crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
@@ -4409,7 +4436,7 @@ in with self; {
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
   crul = derive2 { name="crul"; version="0.3.0"; sha256="1a59zb2ifxg59yzjyf1gq4fk0vqvc0alvifpn2rssis8jyr6g7wr"; depends=[curl httpcode mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.14.4"; sha256="11pj3pbb9hs7bwdmgr10jlir95rq4xdn4qmyklqjls2kgh9r9sfn"; depends=[curl httpcache httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.15.0"; sha256="0ylkp861dy8qa03pjl6znf2mgknhnf3wfyby01zjzrwak2pixi5n"; depends=[curl httpcache httr jsonlite]; };
   cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
@@ -4471,7 +4498,7 @@ in with self; {
   cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; };
-  d3r = derive2 { name="d3r"; version="0.6.1"; sha256="1j69rm37j4q6dwhqprr9cmcl2x9qlmjas025kzl5fagb554dkgy8"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.6.2"; sha256="0abxv8ld6zzkajqkiz0dv61axw3yak4arpw8ar43dypg1ar5cbmm"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.0"; sha256="0b8n2kkpyqia6kpmgdi93917xf23r9aya33030iyk2wn18642qdj"; depends=[ALL Biobase genefilter MLInterfaces]; };
@@ -4545,7 +4572,7 @@ in with self; {
   deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-  debugme = derive2 { name="debugme"; version="1.0.1"; sha256="14yhkvh05748jfn2dsdllflsjnjljhjm8kkzzqb7zcp6qjylwcys"; depends=[crayon]; };
+  debugme = derive2 { name="debugme"; version="1.0.2"; sha256="0ayqai6a5zv8mmhv2pcj6yzlpkkhjh7fa3l4pjljgi37ma3pi38z"; depends=[crayon]; };
   decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
   decisionSupport = derive2 { name="decisionSupport"; version="1.101.2"; sha256="0zmf87wjrpkg12ix8dz3asrwldwvclj1ifvzff46zgipdm3viqr0"; depends=[msm mvtnorm]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
@@ -4603,7 +4630,7 @@ in with self; {
   detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  detzrcr = derive2 { name="detzrcr"; version="0.1.2"; sha256="0hw88kizz0kcz4i1lqz30gixiq7im91875p2wpvbnzyxhs3n04vi"; depends=[ggplot2 MASS shiny]; };
+  detzrcr = derive2 { name="detzrcr"; version="0.1.3"; sha256="1j0x3175d0fllf0f4csgdi86p69ichk5wvhr5nbyzga3f034c87h"; depends=[ggplot2 MASS shiny]; };
   devEMF = derive2 { name="devEMF"; version="3.3-1"; sha256="1s0rmw3gsyj28ywlkfdjr98fr7cjhmzb0fq5qn9s91dw9a3fx8zf"; depends=[]; };
   devRate = derive2 { name="devRate"; version="0.1.1"; sha256="088i9m9ys59p2a961183ac2w6wa0idb4xvyfnxqz9rpiins8d0bg"; depends=[]; };
   devtools = derive2 { name="devtools"; version="1.12.0"; sha256="1m5g6xnq7r4s3a0nlpa88fp5x6c8nl5icnp4869y5zwdk2ijqgla"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
@@ -4618,7 +4645,7 @@ in with self; {
   dfpk = derive2 { name="dfpk"; version="2.0.0"; sha256="0nn0m4kvjsyv48xribkab0jnbv0db17aan9flnkg5jh4s03pg9sc"; depends=[BH dfcrm ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
   dggridR = derive2 { name="dggridR"; version="0.1.11"; sha256="179pi20rs0mp5aqydhw34wczrkyavndaaccjr017gp456gza1a83"; depends=[dplyr ggplot2 rgdal]; };
-  dglars = derive2 { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
+  dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
   dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
@@ -4641,7 +4668,7 @@ in with self; {
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
   diffobj = derive2 { name="diffobj"; version="0.1.6"; sha256="0f6wskh3nl8ngh195x8wiv1g0fc690r4zh4ypkraqd2c6x1iskg7"; depends=[crayon]; };
-  diffr = derive2 { name="diffr"; version="0.0.1"; sha256="0lhk9vm9gp0pwzsniy49dgq9vd4c1bxf8c8w8ib4b4fg5jq3hfwj"; depends=[htmlwidgets]; };
+  diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
@@ -4657,6 +4684,7 @@ in with self; {
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
   directlabels = derive2 { name="directlabels"; version="2015.12.16"; sha256="0vi9zbc2sa8fpi2n2ax1ni9f8s9w1hc0f6gahk8fcrmnagj4g089"; depends=[quadprog]; };
+  dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
   discSurv = derive2 { name="discSurv"; version="1.1.5"; sha256="0lbzaalh1jack49px47sqsmpwmv14w4h1y2r9k294921d02zl0w5"; depends=[functional mgcv mvtnorm]; };
   discgolf = derive2 { name="discgolf"; version="0.1.0"; sha256="15bk2k7glahcbz4kyl3fiayi7ck6z3wabl9y25fg6cnxkbyh6dbn"; depends=[httr jsonlite xml2]; };
@@ -4677,7 +4705,7 @@ in with self; {
   disposables = derive2 { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
-  distcomp = derive2 { name="distcomp"; version="0.25.4"; sha256="0drh7a79nvc6l6c0q2k9hva6kpb8ik6q2aiynp8ab8pf0dh84h6d"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+  distcomp = derive2 { name="distcomp"; version="0.25.6"; sha256="0qp9lsi1mb9amcs8wfhzrsqv92lrl3k3glskmvvj75cqy5kwi3az"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.2"; sha256="1i1rkkic3kz2cs7fq4sb7zfr6s4wini8g1851yxzs9bjgqpsch1d"; depends=[]; };
   distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
   distillery = derive2 { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; };
@@ -4693,7 +4721,7 @@ in with self; {
   distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; };
   distrom = derive2 { name="distrom"; version="0.3-3"; sha256="1kpbrsa7ml72zvmdcpbbz2rsv4lpqd5i2w3v488ji6nbi44v1gp6"; depends=[gamlr Matrix]; };
   divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
-  diveMove = derive2 { name="diveMove"; version="1.4.1"; sha256="13vgnjifvjsrhh3ns5l2gxwf80bg3a3j3n9ycblzjyjpl7i1960i"; depends=[caTools geosphere KernSmooth quantreg]; };
+  diveMove = derive2 { name="diveMove"; version="1.4.2"; sha256="0j761js14ip6spxm6xz9lwyc6zv094bylp1lq487pkgwwcakqs0k"; depends=[caTools geosphere KernSmooth quantreg uniReg]; };
   diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; };
   diverse = derive2 { name="diverse"; version="0.1.4"; sha256="0c5a2ippnygyny9bkqk8s9vywq5207nss0ikywgji8ld0zvxsmi6"; depends=[foreign proxy reshape2]; };
   diversitree = derive2 { name="diversitree"; version="0.9-9"; sha256="00dzw9fpcdgfvf7jl3lr2a2gpfd8pr17myih04v5hkxpjmsydawp"; depends=[ape deSolve Rcpp subplex]; };
@@ -4733,7 +4761,7 @@ in with self; {
   dosresmeta = derive2 { name="dosresmeta"; version="1.3.3"; sha256="0j0718mlzwnnxc7rm9yqm9izsa7c2kbwfx9ai2ygj3xki9wr70jm"; depends=[aod Matrix mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; };
-  dotenv = derive2 { name="dotenv"; version="1.0.1"; sha256="1xvzsnb6v904829lqxmypn56jkm98lw4wpcvljn8620w2wipark5"; depends=[]; };
+  dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
   dotwhisker = derive2 { name="dotwhisker"; version="0.2.3"; sha256="0q5l7vkypnh1rxlh5yd8jq4kql62wqf60gdpf7cds437w8fs8c01"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="1.2-4"; sha256="080zlfz0yhznymr7icc2m7w5c0pqiak1qp22ywcfcb6d0mri3k8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
@@ -4749,6 +4777,7 @@ in with self; {
   dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
+  drake = derive2 { name="drake"; version="1.0.1"; sha256="14r1qa6nf1g0gixnyx7b60xga37gic99ma7mr2fzgqa7i89bz2hc"; depends=[crayon digest eply formatR igraph magrittr plyr pryr R6 storr stringi stringr]; };
   drat = derive2 { name="drat"; version="0.1.2"; sha256="14nmbxy2y51bi258fmx24pkwmga791hnwzbx6jy2sl55g3vrxjpz"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
@@ -4796,7 +4825,8 @@ in with self; {
   dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; };
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
-  dynr = derive2 { name="dynr"; version="0.1.8-17"; sha256="1q2rag00haniv2ffp6k7kr00zy11rpksa55sp8wymcb96x8m64mw"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; };
+  dynr = derive2 { name="dynr"; version="0.1.9-20"; sha256="0pdlbnrxj4jzfy1ycm7k2jdwckgzdjmgkrkhak43d0bgcp1wh8qv"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; };
+  dynsbm = derive2 { name="dynsbm"; version="0.3"; sha256="0wgpcilqfy5jjqw5sk0jwgi5ryf4d52308fgcx133059n9i1k3rz"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.3-5"; sha256="0rvwnssg876sng53viiqfcm7mxvilpds9yahj6bwgs90chnkjz4g"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
   e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
@@ -4811,7 +4841,7 @@ in with self; {
   earth = derive2 { name="earth"; version="4.4.9"; sha256="1dyz2ac754scg474x9ksrwrqflmh9wi7qwgm494fpfi9ndd9ycig"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
   easyDes = derive2 { name="easyDes"; version="1.0"; sha256="17wjsvy9hnrp6s50ivrvahd6p147ibcn3wrlj1hx95qckqjk2b06"; depends=[multcomp PMCMR]; };
-  easyPubMed = derive2 { name="easyPubMed"; version="1.7"; sha256="1gkd95ady6wqm3v89rf5k3axz3g4gv67bvr2kgci3zf3xvqzva7a"; depends=[XML]; };
+  easyPubMed = derive2 { name="easyPubMed"; version="2.3"; sha256="148ga6flgv74sfzz5kvvnqhfdkx6zhpl6ydzcd32lz3cq24ckli9"; depends=[XML]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.2.1"; sha256="0a7779xvsqzcsva9jxa10wz8bdbfp49r0w7c2dqwi9md04bv1qg1"; depends=[sdcTable SSBtools]; };
   easyVerification = derive2 { name="easyVerification"; version="0.4.0"; sha256="0jllrrp0abqkij7iq4z5paca4lgxh4lbrj5ifhrakrxdpncrg9wd"; depends=[pbapply Rcpp SpecsVerification]; };
   easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
@@ -4833,7 +4863,7 @@ in with self; {
   echogram = derive2 { name="echogram"; version="0.1.0"; sha256="0v0fiy2fflk7pxn8wqr75wym0m6snggvvgxpa2b35alpmqch9k18"; depends=[geosphere readHAC]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
-  ecm = derive2 { name="ecm"; version="0.6.0"; sha256="0swkaimm1nfrnb5niiihwx5i0b5l4cg8b6bmy0aipawpgpphn1yh"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="0.8.0"; sha256="0y9whfr75mc54ip1vc0zrbxsjslz86adqrqdvpbbva81c2x1b0ir"; depends=[car]; };
   eco = derive2 { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
   ecodist = derive2 { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
   ecoengine = derive2 { name="ecoengine"; version="1.10.0"; sha256="0k24m03qpqbcdwsf6xawrh0x43b97w2pba3h4pcwl7j2p0ls91pi"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
@@ -4883,7 +4913,7 @@ in with self; {
   egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
   eha = derive2 { name="eha"; version="2.4-4"; sha256="1sp1v3jmidj4ynjq7q7y28j9f483yhbzaz1jnxjc4hqk8398cxii"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
-  eiCompare = derive2 { name="eiCompare"; version="1.7"; sha256="128wvfsvzf84rkvk3bnailn2k4qf5iq5r7hnrxlamajia526ky31"; depends=[cubature data_table eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils tidyr tmvtnorm ucminf]; };
+  eiCompare = derive2 { name="eiCompare"; version="1.8"; sha256="12ga90nnxzy08ajgx9yavasbx5j4nrqkqinbi9w7yp4r5f27pqg8"; depends=[cubature data_table eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
   eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
@@ -4972,7 +5002,7 @@ in with self; {
   epxToR = derive2 { name="epxToR"; version="0.1-0"; sha256="1nvm9cr12lvh877xxiyii0gbfs6r0px76f5qlpn3pdlgj59msn3s"; depends=[httr XML]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
-  equSA = derive2 { name="equSA"; version="1.0.0"; sha256="1yq8f1svh8cg9pgharnb5ijxf692rm2avjvd6xabsv8jid25618l"; depends=[huge igraph mvtnorm XMRF ZIM]; };
+  equSA = derive2 { name="equSA"; version="1.0.1"; sha256="0sy1wfdr9p5m8hx0wbf4kzcfxmak2q6snaasp224agammslgyqyp"; depends=[huge igraph mvtnorm XMRF ZIM]; };
   equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; };
   equateIRT = derive2 { name="equateIRT"; version="2.0-1"; sha256="07kyy0adg42vzg26ssfwy5hiwggymbkkpvyczhzch4113lipz6pd"; depends=[mirt statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
@@ -4986,7 +5016,7 @@ in with self; {
   ergm_rank = derive2 { name="ergm.rank"; version="1.0.1"; sha256="0k5ffqxn9fspbg82j2cmrcyav3nqjk7cnsq48xwy9i3z3vaq704k"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
-  erp_easy = derive2 { name="erp.easy"; version="1.0.0"; sha256="0md4l48qb2z6c527ir1dwc51z8yw1jq7yx85fxzzg0wh1vzafp1z"; depends=[plyr signal]; };
+  erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
@@ -5008,11 +5038,12 @@ in with self; {
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
   eulerr = derive2 { name="eulerr"; version="1.1.0"; sha256="00pblvyfhqcvbjwjkq237b7kj99vvkyclam9mpmgrd72wx6ryzr7"; depends=[assertthat lattice latticeExtra Rcpp RcppArmadillo]; };
   euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; };
-  europepmc = derive2 { name="europepmc"; version="0.1.2"; sha256="1wdxmhcq7zz0x9rrddp7pswj6pbsfdgwrrlm6lgsv7cvs6cmh1na"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
-  europop = derive2 { name="europop"; version="0.3"; sha256="01c31p82r1paxqq209078av9fzkvrl3wp9hz8s79iwf4hlqxbiw6"; depends=[]; };
+  europepmc = derive2 { name="europepmc"; version="0.1.3"; sha256="1mjrrz8xjizxvkmzidbwxs82ijaa70l39anaba8bi7vj8l2k64bm"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
+  europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
   eurostat = derive2 { name="eurostat"; version="2.2.43"; sha256="1h3vx0lf6kqvvhcj1ichzsvqhjmskcpvxd37hym6cwwgkkmxrzk3"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
   eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.10"; sha256="0mwna7rjyrmc76651a1fm7c76ippdsc2wsp3sj3iwb1c73mvlqv1"; depends=[stringr]; };
+  evaluator = derive2 { name="evaluator"; version="0.1.0"; sha256="00811idj3vx7x627dyw0i8qlbkscrdkxknwph4d4j8m49flh9j36"; depends=[dplyr extrafont ggalt ggplot2 magrittr mc2d pander psych purrr readr readxl scales stringi tibble tidyr viridis]; };
   evclass = derive2 { name="evclass"; version="1.1.0"; sha256="1h0lqf6wixsbcs4hnpzsjhsj8fifh9z5r90zcwscj1vk7aqf9cwg"; depends=[FNN]; };
   evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; };
   evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; };
@@ -5033,7 +5064,7 @@ in with self; {
   exCon = derive2 { name="exCon"; version="0.2.1"; sha256="0rblghg29azzbf8wq7wsypf9jprcy9a2063fhwn0lpxqqgbyzw8v"; depends=[jsonlite]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
-  exactRankTests = derive2 { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
+  exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
   exams = derive2 { name="exams"; version="2.2-0"; sha256="14w0m8jnnpbg153l0gq5lixw68ml3qvnnjyl4dbaiccm2as9spbn"; depends=[]; };
@@ -5061,6 +5092,7 @@ in with self; {
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
   extRemes = derive2 { name="extRemes"; version="2.0-8"; sha256="0pnpib3g2r9x8hfqhvq23j8m3jh62lp28ipnqir5yadnzv850gfm"; depends=[car distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
+  extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; };
   exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; };
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
@@ -5117,7 +5149,7 @@ in with self; {
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
   fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; };
   falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; };
-  falconx = derive2 { name="falconx"; version="0.1"; sha256="0sxsvx6nppys9sgmrxi79f709kfhafckd22nmn4ql7vf7p0z1fs7"; depends=[]; };
+  falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; };
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
   fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
   fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
@@ -5147,7 +5179,7 @@ in with self; {
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
   fasteraster = derive2 { name="fasteraster"; version="1.0.4"; sha256="0xxfwgzf6xbk4sajchaz7wjppg6cs1vkb00wiwsqmjm2yr48yp0m"; depends=[Rcpp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
-  fastnet = derive2 { name="fastnet"; version="0.1.1"; sha256="1rqr9cc5xnz3pqjhakp52xk0m8c8dld50vm29blr8s6gw0spp7j8"; depends=[doParallel foreach igraph]; };
+  fastnet = derive2 { name="fastnet"; version="0.1.2"; sha256="124nbvxhrx2nnyzcbr602fpay1zq9fibg1k33f2pkl8pwk87s14q"; depends=[doParallel foreach igraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; };
@@ -5205,6 +5237,7 @@ in with self; {
   filenamer = derive2 { name="filenamer"; version="0.2.1"; sha256="0xahzjgwfpyln6i2szr985csw11w8wwk644sgclwly9l2yqzsi3i"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
+  filesstrings = derive2 { name="filesstrings"; version="0.3.1"; sha256="1vzvs43wzlivgyazinavxbhzca5ffz7a1q7hnbcl8mp1y9vnwski"; depends=[dplyr magrittr matrixStats ore Rcpp readr stringr tibble]; };
   financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
   finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; };
   findpython = derive2 { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
@@ -5225,14 +5258,14 @@ in with self; {
   fitcoach = derive2 { name="fitcoach"; version="1.0"; sha256="1nnd7g093qjlbyrdai78gpbs0xjqlfdjn1v786v7966rzp83xfkg"; depends=[caret dplyr gbm ggplot2 httr jsonlite plyr R6 reshape2]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
   fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-8"; sha256="0h6b5zp5z2g87vz1zv4k7b0rl8rh17vs2ca0i2v583v0b4si7hz4"; depends=[MASS survival]; };
-  fitplc = derive2 { name="fitplc"; version="1.1-3"; sha256="1l7s5adzindq24slbygmkyk17jh37hgv1pwa7bphsb997k5qk4fm"; depends=[car nlme]; };
+  fitplc = derive2 { name="fitplc"; version="1.1-7"; sha256="1dffgqsml6cj6ayqdpr0330kj8v57jwi3pgchb8v98rainygsyfw"; depends=[car nlme]; };
   fitur = derive2 { name="fitur"; version="0.1.0"; sha256="1k4c6n36s324akscm0mkyw68hxmh52kh0l01kyw18mxlbr3d0rhq"; depends=[fitdistrplus]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.1.0"; sha256="0fcc8rq745nsghp27dk0lgih90y4zx8hrzcvsn6ih786yv7qxhvl"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
-  flacco = derive2 { name="flacco"; version="1.3"; sha256="1kqr8a311d2kh4rgy176813vcai63qkz4x7snynj82jgmqfz2llq"; depends=[BBmisc checkmate]; };
+  flacco = derive2 { name="flacco"; version="1.4"; sha256="1hfh71s1qb0v7ip1v5gibgdpqq4sa3cz22kwszj1pprlfp711vvg"; depends=[BBmisc checkmate mlr]; };
   flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; };
-  flan = derive2 { name="flan"; version="0.3"; sha256="1ayba6gifxmvwn5mfh0zqgl1hbp5d9spl1bxc8w8zxvih4khw7w4"; depends=[lbfgsb3 Rcpp]; };
+  flan = derive2 { name="flan"; version="0.4"; sha256="1h1i0gvq29gl0xla77vwd09vj5szrvxw2fmmzg5y2ys9lhjjjifw"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
   flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
@@ -5266,7 +5299,9 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   foghorn = derive2 { name="foghorn"; version="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
+  fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
+  fontMPlus = derive2 { name="fontMPlus"; version="0.1.1"; sha256="1hvviawbfs3m7mr46y2sjdxkksi10vpbnjic11rjaxqcy9a43f4y"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontcm = derive2 { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
   fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; };
   foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
@@ -5274,7 +5309,7 @@ in with self; {
   forcats = derive2 { name="forcats"; version="0.2.0"; sha256="1mvwkynvvgz2vi8dyz11x7xrp53kadjawjcja34hwk1d89qf7g5m"; depends=[magrittr tibble]; };
   foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="7.3"; sha256="02zckbxwb4b83kadk7nd5ybxanswq1ws4z5xzdyiss626pgzljp1"; depends=[colorspace fracdiff ggplot2 nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
+  forecast = derive2 { name="forecast"; version="8.0"; sha256="0hmdas2vybv2057d33vqqsb4w9npn15a5kqcg2rvy0m2p0c66ibm"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
   forecastHybrid = derive2 { name="forecastHybrid"; version="0.3.0"; sha256="1j5mfmdi6ky6ssai3lv2x7n09i93hpl5r1068qlm32mijf4yylbs"; depends=[forecast ggplot2 reshape2]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.1-1"; sha256="1rmar6qfiw9hszwqp988csvwsq8q72d39a2xmr9yq36llnbg6i5p"; depends=[Rcpp]; };
   forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; };
@@ -5287,7 +5322,7 @@ in with self; {
   forestplot = derive2 { name="forestplot"; version="1.7"; sha256="0sxbh7chmy3aixvwks2mzzx0n6h9zkk6c4nsw3ihll213x8pph4q"; depends=[checkmate magrittr]; };
   formatR = derive2 { name="formatR"; version="1.4"; sha256="1fvynq0fj1r9grg9vvfdh5fl2riv6qki9f2rfpyvbvqq3xxpmi3f"; depends=[]; };
   formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; };
-  formula_tools = derive2 { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
+  formula_tools = derive2 { name="formula.tools"; version="1.6.1"; sha256="14n89fljl5x24fka2jab41hwqmjq3a2yl02n58n1li20wrl3zagj"; depends=[operator_tools]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
@@ -5299,6 +5334,7 @@ in with self; {
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
+  fpp2 = derive2 { name="fpp2"; version="2.0"; sha256="1fpph63rzchy98v4skc396swbmmnpjmfkfidk9xs5mfibs66594b"; depends=[expsmooth fma forecast ggplot2]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
@@ -5346,7 +5382,7 @@ in with self; {
   funData = derive2 { name="funData"; version="1.0"; sha256="13f6jlw3g7glz5anlwmj7g64kia18ldm3nfj55qybjfh4b6rh7v3"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
-  funModeling = derive2 { name="funModeling"; version="1.6"; sha256="1h0qzdx6yk10snhx6apriz3al52wqrisffqvanhpznsvk8yg3wvd"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.6.1"; sha256="18lhvp0i7lfbhyg4ry24qk06nfmsqlgb8qr1ag7hwwsxxssjhmxb"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander RColorBrewer reshape2 ROCR scales]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
@@ -5354,7 +5390,7 @@ in with self; {
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   funrar = derive2 { name="funrar"; version="1.0.2"; sha256="0qxhlqc1i0w91xmqawbsqk7gh8fdxq165qrjkbprsw548p5jbdbn"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
-  funtimes = derive2 { name="funtimes"; version="3.0"; sha256="017qad38q5zpbzpsln0cns7y1wf5q5xm7kll4knqrfa6zwaijl92"; depends=[Jmisc]; };
+  funtimes = derive2 { name="funtimes"; version="4.0"; sha256="0a0xpybalk38p3n0fd5f3g4yav99j6ck03d1pkx0w2yqqxnviqhw"; depends=[dbscan Jmisc Kendall]; };
   furniture = derive2 { name="furniture"; version="1.4.1"; sha256="1bziqav2y7h7fkv84ci3p483zbn2rw0wr0cz6jc5a9h8g1gz80cl"; depends=[knitr]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
   futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; };
@@ -5401,6 +5437,7 @@ in with self; {
   gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
+  gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; };
   gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
   galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
   gam = derive2 { name="gam"; version="1.14"; sha256="1z31anm8c4aly7wd9j4zl34pfc0i8cr3p2yjhhf4x3850a1sjlv6"; depends=[foreach]; };
@@ -5446,7 +5483,7 @@ in with self; {
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
   gbs2ploidy = derive2 { name="gbs2ploidy"; version="1.0"; sha256="0gdjfqs9ccyaw7vi22wbyc742n1badr5ypr08g6rvi8ka5lmx836"; depends=[MASS rjags]; };
-  gbts = derive2 { name="gbts"; version="1.0.1"; sha256="1n6180sfr5m7vms8rk8pwsg7nxyw3pmq05bh72462ygyfykivifm"; depends=[doParallel doRNG earth foreach gbm xgboost]; };
+  gbts = derive2 { name="gbts"; version="1.2.0"; sha256="1v8x4dnja8va28rjznyqa6js9wazndijasb95lfj2qwhxhgf5h65"; depends=[doParallel doRNG earth foreach gbm]; };
   gbutils = derive2 { name="gbutils"; version="0.2-0"; sha256="1hi2kq4m7lrhd9yikf4qb0xccr6v1pp7kmly5j68xd3m95fi86rc"; depends=[]; };
   gcKrig = derive2 { name="gcKrig"; version="1.0.1"; sha256="1iqbhfw4ib3lgjbaspjdh2qxif1inwly9fi8hyf4x6a153f20502"; depends=[Rcpp RcppArmadillo]; };
   gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; };
@@ -5459,8 +5496,8 @@ in with self; {
   gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.7"; sha256="0n8c72m7dapy8agqcglagb8bwf0rpajdq9qsli3qyrrp7fh3h4ck"; depends=[foreach R_utils raster rgdal sp]; };
   gdata = derive2 { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
-  gdistance = derive2 { name="gdistance"; version="1.1-9"; sha256="174ngm0xg993gkmf70yaln98d2rpjvdx5ngf2aga1jzph6xxdj6d"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.3.0"; sha256="185vsf8cvazk3865ds1vxwaaf3y8g7x52r5kp8rxkmnjavw6x24q"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
+  gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; };
+  gdm = derive2 { name="gdm"; version="1.3.1"; sha256="10lb4lk4gx26ksr1njfqg13by1mam609ysi5k44pfj55mwna7k9r"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; };
   gdns = derive2 { name="gdns"; version="0.2.0"; sha256="0cyyqmbdd520h8q6b9dficgh1vc8zf47bih72zdqbz2hrkjm4yc4"; depends=[httr jsonlite purrr stringi]; };
   gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
@@ -5518,7 +5555,7 @@ in with self; {
   geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
   geohash = derive2 { name="geohash"; version="0.1.2"; sha256="1vwalnf5cbpbq5b68zc6qa8mm84v5zlb8s2pwg7j2f7s43y0mgwz"; depends=[Rcpp]; };
-  geojson = derive2 { name="geojson"; version="0.1.0"; sha256="0br2vp9lzqmz84scscclcd3d7ysvrdk68fxbc05ywnlsimdp5fxd"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
+  geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
   geojsonio = derive2 { name="geojsonio"; version="0.3.2"; sha256="10rnp4ws3465p8jv6b15zbl662swd373nmlbxxk3n8dy7049qwpj"; depends=[httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
   geoknife = derive2 { name="geoknife"; version="1.5.2"; sha256="19adj5v14cxi32iadi4xlbg8f94vx4ail7454i4jj61i9a426ag1"; depends=[curl httr sp XML]; };
@@ -5588,6 +5625,7 @@ in with self; {
   ggpmisc = derive2 { name="ggpmisc"; version="0.2.14"; sha256="0747jmf8zvqc6zzglbpr2vizcy905zgc9hgdabgdkg4zhhmlcqys"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
   ggpubr = derive2 { name="ggpubr"; version="0.1.1"; sha256="1r1hhlw2zz1n1grwddd45sssdgrv43wf4dj9vjdryssz44rvxs85"; depends=[ggplot2 ggrepel ggsci plyr]; };
+  ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
   ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; };
   ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; };
   ggsci = derive2 { name="ggsci"; version="2.0"; sha256="1045yi825lynw074cqi7r596ldbn7snj0rzdqcb5iwl5cn2s7gcw"; depends=[ggplot2 scales]; };
@@ -5599,7 +5637,7 @@ in with self; {
   ggtern = derive2 { name="ggtern"; version="2.2.0"; sha256="0ddcbbgp8ni3zbz4ailqx79i16aa2x4z4gvz55f0b731bilczw86"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; };
   ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
-  ghit = derive2 { name="ghit"; version="0.2.15"; sha256="07f7bz0n2bzs3m3q1hsld15n10nkk7ziwl37lxsf2gh9yv7xvfb3"; depends=[git2r]; };
+  ghit = derive2 { name="ghit"; version="0.2.17"; sha256="16vhfv0j8f07p8dzqh93gws2zpb86h1glh062l8riar0gfpc34ia"; depends=[git2r]; };
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
   giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
@@ -5624,7 +5662,7 @@ in with self; {
   gldist = derive2 { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.3"; sha256="1f3c4c8jjfslp5wc4mc3sc64qpin8bswz1fnv5zqg8dr4j8afq10"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
-  glm_ddR = derive2 { name="glm.ddR"; version="0.1.0"; sha256="0siwy8jx0r0135sm8gyf8g7w05r3zlq6bns5f2s348njk19da9mn"; depends=[ddR Matrix]; };
+  glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
   glm_predict = derive2 { name="glm.predict"; version="2.4-0"; sha256="10cpbl25csfs2ng7jj7hcfwl58akbx5dsdv1qlgbnvhf9rmlblww"; depends=[iterpc MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-48"; sha256="1r8mc55v717g4666f07hkc13v9vhj96n7xvn2r3crjndq3w5x3yn"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
@@ -5683,7 +5721,7 @@ in with self; {
   gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
   goldi = derive2 { name="goldi"; version="1.0.0"; sha256="1asn5r8klmpizmp8bfapfy5vraf7sxswm3fky6473hxajz4hyfvw"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; };
   googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.3.0"; sha256="1zjldi93g5871dw1vdxriw08rz5hrmpx530r76s6r0rlijs9lwal"; depends=[bigQueryR dplyr googleAuthR googleCloudStorageR jsonlite magrittr shiny tidyjson]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.4.0"; sha256="00dm7ccfm2sk3qmgffs3dx809ihwfhw49f6fsgnllm19qyxf5hl0"; depends=[devtools formatR httr jsonlite miniUI R6 roxygen2 shiny testthat]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.5.0"; sha256="0fk0rijn3529v918chpygvlkigj31dpimdfnkmhsgcznfarkc598"; depends=[devtools formatR httr jsonlite miniUI R6 shiny testthat]; };
   googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.2.0"; sha256="02l3jml2sqw4m7fralr3dzyk06h8jinn6bi54gwc02f1y84j8qfh"; depends=[googleAuthR httr jsonlite readr testthat]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.1.0"; sha256="173y7m2j6iw848djjawkiy22fg56hnpx0m0q1halzwycqx6z08vc"; depends=[future googleAuthR jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; };
@@ -5693,7 +5731,7 @@ in with self; {
   googleway = derive2 { name="googleway"; version="1.0.0"; sha256="01gzpb48iffir57cqw9hs2s4rxdllvdjf5hkmrf5zkjxhbzw7w14"; depends=[curl jsonlite Rcpp]; };
   goric = derive2 { name="goric"; version="0.0-95"; sha256="05sbsnjjlpy1z0mfbsrihrp2gp4d66cvprhgzxy76lipgm5mmvqi"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
-  gower = derive2 { name="gower"; version="0.1.1"; sha256="04k1c9h27wknp5bvzxq6gzv3yccmfhs3whnaic1phz4f9vx5g6bz"; depends=[]; };
+  gower = derive2 { name="gower"; version="0.1.2"; sha256="1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"; depends=[]; };
   gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
   gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
@@ -5706,7 +5744,7 @@ in with self; {
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gpuR = derive2 { name="gpuR"; version="1.2.1"; sha256="1k9nxsz4grjl8lyf9108vj94g2gpi6h0pbf5l63y2h5rn0lmpw8s"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
   gputools = derive2 { name="gputools"; version="1.1"; sha256="0np1lndvppdi409a1kfbbl0z5hr8wg2q473jch58zd16d2ickwkb"; depends=[]; };
-  gquad = derive2 { name="gquad"; version="2.0-0"; sha256="0d2mg21ix1a08lk43mz0r84q49yhgh7w9jyxa89lmx9ihzl42nhx"; depends=[ape seqinr]; };
+  gquad = derive2 { name="gquad"; version="2.1-0"; sha256="0s7crpirscbij2y25scwzb9fyp9ych1n80fij2ajda9zaqcyyin8"; depends=[ape seqinr]; };
   grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
   gradDescent = derive2 { name="gradDescent"; version="2.0"; sha256="0qfm9vzi8j083na5ziwjypycbw6ncwk75xsaam2vc4xhfarw8fjs"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
@@ -5767,7 +5805,7 @@ in with self; {
   gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
   gsrc = derive2 { name="gsrc"; version="1.1"; sha256="12rrp9v0r5qzxcs1l29238nkc1haql1c4vva3vdm26kglpg7qj18"; depends=[Ckmeans_1d_dp dbscan DNAcopy illuminaio limma openxlsx preprocessCore R6]; };
-  gss = derive2 { name="gss"; version="2.1-6"; sha256="1vkdhji8xpnq9j2ah3vnfvhyjnkgk406grws4q3gj4csbpkkzh86"; depends=[]; };
+  gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
   gstat = derive2 { name="gstat"; version="1.1-4"; sha256="138v8accqwf95a3i980x57wd2j8vmdg1ga44rx9nbjcpyxc5x6mf"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
@@ -5815,7 +5853,7 @@ in with self; {
   hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; };
   hashmap = derive2 { name="hashmap"; version="0.1.0"; sha256="1pp62py2n8ajv90fmv4zkga3hshk9cj1qfzagnp8jnfym0jp9rlc"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
-  hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.2"; sha256="0rh5kl9ivv9ckv5j5fqwdcflbfzkjicmqrddgxnzbv1iwyph4c0w"; depends=[graph Rgraphviz]; };
+  hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
   haven = derive2 { name="haven"; version="1.0.0"; sha256="15ynk1qm4g9m6ng4lc1x3hwjb2xak6b795ifh5q1k4mmx07xz6dl"; depends=[BH hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
@@ -5828,7 +5866,6 @@ in with self; {
   hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
   hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; };
   hddplot = derive2 { name="hddplot"; version="0.57-2"; sha256="1mckgd99wvxbqvpyx231r97kysppnn1xggy8jvnc31sxq8m9gfr7"; depends=[MASS multtest]; };
-  hddtools = derive2 { name="hddtools"; version="0.5"; sha256="1cihc3kn8nvcj0z314b7md02xb108xkrnz1j4svr6hcxwxvv97c5"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr XML zoo]; };
   hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
   hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
@@ -5927,6 +5964,7 @@ in with self; {
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
+  hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; };
   hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
   hsdar = derive2 { name="hsdar"; version="0.5.1"; sha256="0n5d05f7bh9zsjipfzf07yx71ccqdkarmmm4a1ryah7sjlg0zpil"; depends=[caret raster rgdal rootSolve signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
@@ -5957,7 +5995,6 @@ in with self; {
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
-  hwriterPlus = derive2 { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
@@ -6024,7 +6061,7 @@ in with self; {
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icenReg = derive2 { name="icenReg"; version="1.3.6"; sha256="024iwpwbn3g2lsq9kn6p86m1qdj1ndlfakk6hsijc8akg0cmmzcg"; depends=[foreach MLEcens RcppEigen survival]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
-  icesAdvice = derive2 { name="icesAdvice"; version="1.2-0"; sha256="0z3b31qj0wggd2yayvgivrpg9435bi8pmsp11rg2vwz4vfsqvlkb"; depends=[]; };
+  icesAdvice = derive2 { name="icesAdvice"; version="1.3-0"; sha256="1csyw7sav56vkgwjllixjbgpy3ka9xivhr9pgb26iihgwwpnhdds"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
   icesSAG = derive2 { name="icesSAG"; version="1.2-0"; sha256="05fj1sx9fbpyhmng7llmayc2m0gvfyak6ispjkwrx55hms17i5p9"; depends=[png]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
@@ -6106,7 +6143,7 @@ in with self; {
   inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
   inlmisc = derive2 { name="inlmisc"; version="0.2.4"; sha256="1j2wxzm45zzykm29swvqj6hdscgxq6094s4wwj6rr7nwpp9v3qni"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; };
-  inpdfr = derive2 { name="inpdfr"; version="0.1.3"; sha256="1qdnh4bcwhg587y4s1r27vqmx3i4fsg8gvnrl4gx1nk7r2fhsqxc"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
+  inpdfr = derive2 { name="inpdfr"; version="0.1.5"; sha256="161p45hj5h6yxn9w140gkcsj2y90lqc8avsj2dsg3gnzyks07as1"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
   inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
@@ -6121,6 +6158,7 @@ in with self; {
   interactionTest = derive2 { name="interactionTest"; version="1.0"; sha256="1ppc476glwf0bsr1wgzircvnhgn9kkbhy3rskfz671ma6fv3p67b"; depends=[]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
+  interflex = derive2 { name="interflex"; version="1.0.2"; sha256="0ybfk9jxfc98jd97pg469wrddllhm43hgg4lwg1i1gmz34y84yf2"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; };
@@ -6133,7 +6171,7 @@ in with self; {
   intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
   intsvy = derive2 { name="intsvy"; version="1.9"; sha256="080vklwfrnm5gfcympwi1llipkk5a3qh2xw6m91k9p6xyvnl3rrz"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
-  inum = derive2 { name="inum"; version="0.9-1"; sha256="11aks7y41298rqdbawg016akam99qxf2f6rwwkkvzp62syp2ip6g"; depends=[]; };
+  inum = derive2 { name="inum"; version="0.9-2"; sha256="0bqk9hh3ps0ria52fh3xfpis9wazh04fj9bbdd3ydj7inwj2lxxs"; depends=[]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
@@ -6150,9 +6188,9 @@ in with self; {
   ipdw = derive2 { name="ipdw"; version="0.2-5"; sha256="1a0xlhzmnc3l3fvn1v3rgxwg0va0418yq62i2dlq0l5djcfbxyc3"; depends=[gdistance raster sp]; };
   ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
-  ipft = derive2 { name="ipft"; version="0.2.2"; sha256="1wncz4plz8gziv33yvwkdiw7shpbhs357ag0i9350yn5h9zhhp9b"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
+  ipft = derive2 { name="ipft"; version="0.2.8"; sha256="0jyg69bj32j1xgnwrl233s6bi85drhry94midsrjqn3g2ik6xafz"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
   iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
-  ipred = derive2 { name="ipred"; version="0.9-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
+  ipred = derive2 { name="ipred"; version="0.9-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; };
   iprior = derive2 { name="iprior"; version="0.6.4"; sha256="1cpp0cp6cfdrh23wjjqvng9dszjmp5a90bgd6sbgcfckn2si0ly1"; depends=[RColorBrewer Rcpp RcppEigen]; };
   ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
   iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
@@ -6166,7 +6204,7 @@ in with self; {
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.0"; sha256="1rjw7f8r7kg4yrlkv6cwiiggm6hgx3gqc4jzcmvvmv0ycyi2w3pw"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
-  isa2 = derive2 { name="isa2"; version="0.3.4"; sha256="12qbfvcj8whhy7d68l7ra5wnkpx87ldl6mir7r5n8afb3fkww0kp"; depends=[lattice]; };
+  isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
@@ -6231,15 +6269,17 @@ in with self; {
   jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; };
   js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
   jsonld = derive2 { name="jsonld"; version="1.1"; sha256="1bmfdcyjcz3cgy0vkliwvd97kww8djdib08bsq99v485gspl2x87"; depends=[curl jsonlite V8]; };
-  jsonlite = derive2 { name="jsonlite"; version="1.2"; sha256="0k966hzp3qnwck7fgd76w49zrz39s7pqyywws17bhbcd8rh4csyb"; depends=[]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.3"; sha256="0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw"; depends=[]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5"; sha256="01f1wrbgj7v6pzrx5vd8pgpm78fanyx59s84m5a5732q5g39shlk"; depends=[Rcpp]; };
+  jtools = derive2 { name="jtools"; version="0.4.2"; sha256="0jzp284ac43s89p9cl5f3x8jcsw09ywjwi5b72zlwbx2a6x6bbq4"; depends=[]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
-  jug = derive2 { name="jug"; version="0.1.4"; sha256="1rf3akm9w5sbp59w1070ygqz1b9krq6lilbxp9r4w234c8k81a27"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
+  jug = derive2 { name="jug"; version="0.1.6"; sha256="19n6fi26yssid1xlixwmvqd6720rvn2jcnw7347izsmlxxyip6hv"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
   junr = derive2 { name="junr"; version="0.1.1"; sha256="1rkr6kyf2p3rr39w0nqfvcrcd2b0r411if7812zijnn20vrmsmda"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
   kSamples = derive2 { name="kSamples"; version="1.2-4"; sha256="1k026wbzcrzzr3ji3gdnhbj13nrmbp6ybbcki3v3gk6s0xk6f2rx"; depends=[SuppDists]; };
+  kableExtra = derive2 { name="kableExtra"; version="0.1.0"; sha256="0sgk2sdjnlip9pl2wd2gn53hwz60wyc0926iy69swnv48vhaa6c6"; depends=[knitr magrittr rmarkdown rvest stringr xml2]; };
   kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
   kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
   kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
@@ -6263,7 +6303,7 @@ in with self; {
   kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
   kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
-  keypress = derive2 { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
+  keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
   keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; };
@@ -6272,6 +6312,9 @@ in with self; {
   kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
   kinn = derive2 { name="kinn"; version="0.2"; sha256="14vckrk3sppxswccy4qiyc7pbzkwncwag4acbkbqfnm84pxblh3m"; depends=[caret caTools igraph KRLS mclust stringr]; };
   kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
+  kirby21_base = derive2 { name="kirby21.base"; version="1.5.1.1"; sha256="0gvxvwqwn5bhmwr632gbvh2ikkygqw4vqyn6jbwgnkaxqq127p11"; depends=[git2r]; };
+  kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.5.1"; sha256="1hifxp6ilzgakbdz067lmpz1wrq8ah9a8kv542717z1pn6bmw69w"; depends=[kirby21_base kirby21_t1]; };
+  kirby21_t1 = derive2 { name="kirby21.t1"; version="1.5.1"; sha256="0gs39fy8wxrilgfyz1dlkaar4gf9qifcdxc4vzy2vha0z2ci46sy"; depends=[kirby21_base]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
   kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
@@ -6298,7 +6341,7 @@ in with self; {
   knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
   knotR = derive2 { name="knotR"; version="1.0-1"; sha256="02mr950150m2gzagxf5yzps8fnwspagh3k8prh9zww2jss0471rm"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.0"; sha256="0vcmm4vjawmyaqpqv0g6y5dfcixn0rjhcfr3nfc2781a4w7ydnc9"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr]; };
-  koRpus = derive2 { name="koRpus"; version="0.06-5"; sha256="0anip3m7shp8lj2xd2gks7cbwxfkhp3pz9hn7ijf7b5q5r4gvl15"; depends=[]; };
+  koRpus = derive2 { name="koRpus"; version="0.10-1"; sha256="1f7mspq7iiahpqfj57n63i8b0qs73qgmvpgm1yxi0ax5zjdnspqb"; depends=[data_table]; };
   kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
   kohonen = derive2 { name="kohonen"; version="2.0.19"; sha256="0fi94m2gpknzk31q3mjkplrq9qwac8bjc8hdlb3zxvz6rabbhxrr"; depends=[class MASS]; };
@@ -6367,7 +6410,7 @@ in with self; {
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
   lava = derive2 { name="lava"; version="1.4.7"; sha256="1gzla8ns3n899vfz80yjx8bb2pcnrvp52c5rxxw591clba1x9jym"; depends=[numDeriv survival]; };
   lava_tobit = derive2 { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
-  lavaan = derive2 { name="lavaan"; version="0.5-22"; sha256="1z6b4xf9zymyikmi8q4kj0cn6xy8m2p31yc6zah539jk9cxpi304"; depends=[MASS mnormt pbivnorm quadprog]; };
+  lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.1"; sha256="06k9myq33p9jz7rz6ffansgi27ang4gq0s179vgsrdi10krxxg1b"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
   lawn = derive2 { name="lawn"; version="0.3.0"; sha256="0rws76dzpi2gpn90la663r1g9ywvpvjicjmgb6z7k5xg1gspgs5c"; depends=[jsonlite magrittr V8]; };
@@ -6398,7 +6441,7 @@ in with self; {
   ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.0"; sha256="1phz9hwhfw7lcvz5gg0l3w3j3jig0bw4wxbx6j4z7dlr4bisyng8"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix RBGL robustbase VGAM]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
   leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
-  leafletCN = derive2 { name="leafletCN"; version="0.2"; sha256="10kkclna64jwfmmn5rw91rb4f0cxqr62027vp1699iqm553dvhhd"; depends=[htmltools jsonlite leaflet magrittr sp]; };
+  leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
@@ -6412,7 +6455,7 @@ in with self; {
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="2.6"; sha256="19gs0xlbjvx95047pzzl36x42898qkc61qgr1isavf7hph41ak46"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
-  lexRankr = derive2 { name="lexRankr"; version="0.3.0"; sha256="0afgjzcmhnrq30n1mkzx51f0yk369ds5sh47a4z8z56w2w5sb8ik"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; };
+  lexRankr = derive2 { name="lexRankr"; version="0.4.0"; sha256="149q96yyag375ggflrginim9phbmqaap3hpgjx02rqmbdf38dywg"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; };
   lexicon = derive2 { name="lexicon"; version="0.1.1"; sha256="0iibyzmgmkkmw0x7n9j1hklf7ff0r0aayb7khg9wbgsa7x1z20im"; depends=[]; };
   lfactors = derive2 { name="lfactors"; version="1.0.0"; sha256="0j2sq3kh9qgc8z7q8j6fl2n4zih8b7y1yapswsw928b1glava8p7"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
@@ -6445,15 +6488,16 @@ in with self; {
   linbin = derive2 { name="linbin"; version="0.1.1"; sha256="0i99j7n1hxvnm2605b2xr4mxpib64abr10wp03nxii16nssvv66m"; depends=[]; };
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
   lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.1"; sha256="1k56x651c84sc60fmz1yf0x5436dnh6v3vxh8yq9hk5qpmkgz8h9"; depends=[leaflet magrittr rowr stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.2"; sha256="1m0szmlraqvqvqcj5nlfkpcwckiagc31qkd834m00w47kggmzlhb"; depends=[leaflet magrittr rowr stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
-  lintools = derive2 { name="lintools"; version="0.1.1.1"; sha256="1rsya48abvr5zijd10bh5g03hjviyack2gh0waawqhv29lhiy9f1"; depends=[]; };
+  lintools = derive2 { name="lintools"; version="0.1.1.3"; sha256="0jxy7wp7jg02d59fb3cdhpmnqzdxrdvs858g3yfamx6fjgb6bd8i"; depends=[]; };
   lintr = derive2 { name="lintr"; version="1.0.0"; sha256="0d03lwr96pdvkdxgjlrzj591dkaxm2rbdk2n3jgr1k428v6jkzy0"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
+  liquidSVM = derive2 { name="liquidSVM"; version="1.0.1"; sha256="1440zkna0l79q1klfl91gif90q9fp0g05lyrvbbslhvcynwkgj7y"; depends=[]; };
   lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; };
   liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
@@ -6556,6 +6600,7 @@ in with self; {
   lrgs = derive2 { name="lrgs"; version="0.5.1"; sha256="1hzcmrvax03bzrljnqskmnnpsw6amnwcfygnls727369h0dbzc4a"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
+  lsasim = derive2 { name="lsasim"; version="1.0.0"; sha256="05b4ddrqs7kpz8nqgarydh9har9v2k0fx8njwzaj3gnih8jzdn84"; depends=[]; };
   lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
   lsei = derive2 { name="lsei"; version="1.1-1"; sha256="1akvkccf2cq331agcsi24x3cw73cc8vdl7kw3zjyg8q6lmvq78am"; depends=[]; };
@@ -6579,7 +6624,7 @@ in with self; {
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
   ludic = derive2 { name="ludic"; version="0.1.5"; sha256="03ywna9fd2ypwchwx58ccmlxjdnx7zav7pqxwrc5bh3hrfbsxl13"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
   lulcc = derive2 { name="lulcc"; version="1.0.1"; sha256="1xq4rjsds9vwj4prkjxfcp9sv53ha9pj65ns0frpbh8grvrjwimv"; depends=[lattice raster rasterVis ROCR]; };
-  lumendb = derive2 { name="lumendb"; version="0.2.1"; sha256="0cmbiiixvf6c33vxzcn4q48asinlsplmc5xpj5h84xnysa6zs3xv"; depends=[httr xml2]; };
+  lumendb = derive2 { name="lumendb"; version="0.2.2"; sha256="0x1k90h6aw7fpvmgbbdmkqvgxfnn4w5xxfck7f4r7zhaxfqbzp2s"; depends=[httr xml2]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
@@ -6639,7 +6684,7 @@ in with self; {
   mapproj = derive2 { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; };
   mapr = derive2 { name="mapr"; version="0.3.0"; sha256="0xgbc4zpjdd6lncccdd85ar909z7bv8yqrv5s1xrp2j2j1gv97z1"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; };
   maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; };
-  maptools = derive2 { name="maptools"; version="0.8-41"; sha256="0niz4qssvd8g43z4a85mq5p7cs3s169sgc3p3rzviqqgcc0i6z7n"; depends=[foreign lattice sp]; };
+  maptools = derive2 { name="maptools"; version="0.9-1"; sha256="0ma1diflrkq9wa6qjli6ncjn17b3rqrgjwq984dx5djy9f5bjf3f"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
   mapview = derive2 { name="mapview"; version="1.2.0"; sha256="0785jzs3kr6rcxz5p1mwpz7maq3z2mwxskl6whyzizbrkmxj2ikw"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet png raster Rcpp rgdal satellite scales sp viridisLite webshot]; };
@@ -6679,7 +6724,7 @@ in with self; {
   maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
   maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; };
-  maxstat = derive2 { name="maxstat"; version="0.7-24"; sha256="1l7q83233jbxsly081mnc7lf20nn894hcynq3sm3hjxkvrplzsm9"; depends=[exactRankTests mvtnorm]; };
+  maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; };
   mazeGen = derive2 { name="mazeGen"; version="0.1.1"; sha256="1vqhcypxbw15prc77i1jl8vnb1q3lr9bb9s6ql2pcadv3i02ybnb"; depends=[igraph]; };
   mbbefd = derive2 { name="mbbefd"; version="0.8.8"; sha256="17f2y4xi5fxc6mms519xjb9qg94qqlxv0mhdbhjyyfg3x6bj7bsq"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
@@ -6762,7 +6807,7 @@ in with self; {
   metaSEM = derive2 { name="metaSEM"; version="0.9.12"; sha256="1lmsqpfb1yxdlwb2qhcsm7111w25qlz6794i2pwf5wmaixwyw0nj"; depends=[ellipse MASS Matrix OpenMx]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
   metacoder = derive2 { name="metacoder"; version="0.1.2"; sha256="0srrmmn86jpxdx463qngd1fj8ssnly18kb74csa9957n1lr0l9xf"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; };
-  metacom = derive2 { name="metacom"; version="1.4.4"; sha256="14snpgdl8lwfh3fy63728jpxp6yjchq7i5sqfhzkfmrmy3kwgl22"; depends=[vegan]; };
+  metacom = derive2 { name="metacom"; version="1.4.5"; sha256="1c79sm0b00mm723g3h9llxlk33zk6f9yv6z10jx1la6kk1cgs7a2"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="1.9-9"; sha256="14287z65ffm013787wfnyb9842zcv63i97g445xa4j8075p8sp7p"; depends=[Matrix]; };
@@ -6777,7 +6822,7 @@ in with self; {
   metaplus = derive2 { name="metaplus"; version="0.7-9"; sha256="1hrczccszx9jcgifwg6wsigsbm8ih4xjr00knb0rxyygijk38c82"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.3-1"; sha256="0nxvllfa2x6v2hpgind5xr0i40wi7cpdd18lwgy9s4jpgbn0n17p"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
-  metavcov = derive2 { name="metavcov"; version="0.1"; sha256="0d57gn802cnpmvyxkczmqafllglzgw17jn4rpj659s16qh0fz4j2"; depends=[corpcor]; };
+  metavcov = derive2 { name="metavcov"; version="1.0"; sha256="183xrrdz8agwcxgn8i4jg28f8gqskim9wcz193524fjhcm4bklxr"; depends=[corpcor]; };
   metaviz = derive2 { name="metaviz"; version="0.1.0"; sha256="1cl44dvd625sfz906cggrj092bxy35vsiglalsay9frsi440d82p"; depends=[ggplot2 plyr RColorBrewer]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
@@ -6786,7 +6831,7 @@ in with self; {
   meteoland = derive2 { name="meteoland"; version="0.5.2"; sha256="17sfi14q5cp74cmlvhbyg6xlpiw9ssqc4kp48r41allk38dfk1zd"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.2"; sha256="1n64l69w5skbymizm5ghq50gwhpasyk9zmywib6hkd9k5ijgayv5"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
-  mets = derive2 { name="mets"; version="1.2"; sha256="078g04bj3ipwz3cw5wkz0gvj1dmd5vxygkwpz4pymg0r9svy2yf2"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.1"; sha256="0wmycy87v0hry7vzyz3vjpjq8cx7nraigihwch04nfhpg6x4zal8"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
   mev = derive2 { name="mev"; version="1.10"; sha256="0kidgghwjc81rx2vb8y1iiwvlfxafv7r11n3zz1gb7705w6ynw1m"; depends=[boot evd gmm ismev nleqslv numDeriv Rcpp RcppArmadillo rootSolve]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mexhaz = derive2 { name="mexhaz"; version="1.1"; sha256="168a8b3y17nh2dalqanph384laf2awv3jdk8dm9cl5jbkh7ah4lb"; depends=[MASS statmod survival]; };
@@ -6850,17 +6895,17 @@ in with self; {
   minval = derive2 { name="minval"; version="0.5"; sha256="1pbcfcaysaicppkzvnllvvx2jykc17nk3331n0rl41x56jxcjsgd"; depends=[gdata XML]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
   mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.22"; sha256="0jzxmj2a0kq0xylsxrkd6j9rzvy3y0qkl823pb84mc3zv2jwnjrx"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="1.3"; sha256="00zmli79ll313qjjl0j28ibxdjn41zfgwx43cg9mzzm6ayiz26ci"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  mirt = derive2 { name="mirt"; version="1.23"; sha256="13dx1ir09lmvapjv6igya71w5yp6r41yzpcdnbdk5jqyyqidnian"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
+  mirtCAT = derive2 { name="mirtCAT"; version="1.4"; sha256="1gfpbx0zay8bkr116fnvcwxgrm6vpcvf25k3advnaj54ad8vw4b4"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-3"; sha256="1djmsffwkicj25ndg07dnid6qj66b1rdw0yrv79jakjfbv71c13i"; depends=[BayesBridge BRugs MASS MCMCpack mvtnorm R2jags Rcpp RcppArmadillo]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
   miscTools = derive2 { name="miscTools"; version="0.6-22"; sha256="1sngkl5rwg1vp2xx9a5g2nz2nhwxwv7ni21ww7hyjc8x5mhb42yh"; depends=[]; };
   misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; };
   miscor = derive2 { name="miscor"; version="0.1-0"; sha256="0kgdsqcqdfi7976qc2f2r6z68z6znrgwgcr801cfkqql8s0wksfj"; depends=[PoisNonNor]; };
-  miscset = derive2 { name="miscset"; version="1.0.0"; sha256="0m6gv2w8fj1604wrmcdgz6dpmpkz7j3sppda11klsx0hv1xqr2af"; depends=[ggplot2 gridExtra Rcpp xtable]; };
+  miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; };
   mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; };
-  misreport = derive2 { name="misreport"; version="0.1.0"; sha256="1nys59bik6cnrpdh1azp2y9k201y326hbf5jzv2kilh34p57ilfs"; depends=[mvtnorm numDeriv VGAM]; };
+  misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; };
   missDeaths = derive2 { name="missDeaths"; version="2.2"; sha256="0gkzq7jpqkfcvc40i0xdjxmwmn1mpd7p4hik4fqz22q3pvmhmmwn"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
   missMDA = derive2 { name="missMDA"; version="1.10"; sha256="1wqb5badqcs6yj2c7llbhbssdzg0irjzfcjasfrq1zg0lk82zafj"; depends=[FactoMineR mice mvtnorm]; };
@@ -6870,8 +6915,9 @@ in with self; {
   mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
   mix = derive2 { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
   mixAK = derive2 { name="mixAK"; version="4.4"; sha256="0aj1x80kxwksn7as6lfncl6ar218hnbcs8vbxwiqp1lh4il74iiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
-  mixOmics = derive2 { name="mixOmics"; version="6.1.1"; sha256="0wdl5g0455whlf331j77c0d9vk6qyb03basy5b7svz3zrg15q2qa"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.1.2"; sha256="1f5053xpp674g2dn54rl1yz3knb5i1824dj5v213y6i82m2vygc6"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
+  mixR = derive2 { name="mixR"; version="0.1.0"; sha256="16rl1ggavs1qfq4i3jm85acd0w2zbiacnvnnim3vi3kqa9i09byy"; depends=[ggplot2 Rcpp]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
@@ -6965,7 +7011,7 @@ in with self; {
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-  mongolite = derive2 { name="mongolite"; version="0.9.1"; sha256="1hy36bh9klhdj2yxr3b2rl101lsgfgw61l5zn08brvvh04zvfv31"; depends=[jsonlite openssl]; };
+  mongolite = derive2 { name="mongolite"; version="1.0"; sha256="02m9909wkwbyc0w1jhvlib7jmwslq16n49a22bq9pdriaq4rmb8m"; depends=[jsonlite openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.5"; sha256="1rqcdg4gha5vh3dvxqzr2albi2capm18rkgf79rd769hrk3z09l5"; depends=[tuneR]; };
   monkeylearn = derive2 { name="monkeylearn"; version="0.1.1"; sha256="1w0d4cvd1y3wal8r0hg8w08x1zqzkv7ag8nyplmkqv9vwc15qd26"; depends=[digest httr jsonlite tibble]; };
   monmlp = derive2 { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; };
@@ -7019,7 +7065,7 @@ in with self; {
   msBP = derive2 { name="msBP"; version="1.2"; sha256="1sp8njnvv42q8fkcsjzpfg9p9dzz0hjsn2a6b9kfaymx7zvks2sq"; depends=[DPpackage]; };
   msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
   msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; };
-  msaR = derive2 { name="msaR"; version="0.1.0"; sha256="0krfass51686ki4wv8nj3kipgsv1v3rs5n6wcdyyqyd1ni8j7mr2"; depends=[ape htmlwidgets]; };
+  msaR = derive2 { name="msaR"; version="0.2.0"; sha256="1yj70wxpqbjiwfskb68nx2criz3v426b1wnc9bnsl9cr417zhn9s"; depends=[ape htmlwidgets]; };
   msaenet = derive2 { name="msaenet"; version="2.4"; sha256="045f38fzlxsawsssyvp7122dc44hvzyha05js7xzb5zg1pq0i1qv"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
   msarc = derive2 { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[AnnotationDbi gplots RColorBrewer wordcloud XLConnect]; };
@@ -7030,7 +7076,7 @@ in with self; {
   msgl = derive2 { name="msgl"; version="2.3.5"; sha256="0lihvgh86r3swfma6msjbsmfc14b1p1h16v6pkd53v5q3dp4asld"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
-  msgtools = derive2 { name="msgtools"; version="0.2.4"; sha256="1m0a6f2q23jm4nl6sp1ympqkiv478q8hgdn5wjfg6gx0nij29jmk"; depends=[devtools digest hunspell poio tibble]; };
+  msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; };
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.4"; sha256="0h0h9cgavpylbj9692750if1hw7qylhsad549fqjx5l0zqbh3zhy"; depends=[expm mvtnorm survival]; };
@@ -7046,6 +7092,7 @@ in with self; {
   muRL = derive2 { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
+  mudata = derive2 { name="mudata"; version="0.1"; sha256="1906g4mmv3k2pkzq0y2dr1ahlrdvprw8qyxfkmmkll22qn9pmaqa"; depends=[dplyr ggplot2 jsonlite plyr reshape2]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
   multcomp = derive2 { name="multcomp"; version="1.4-6"; sha256="18pd5v288g4d3kyp1wg0fv6ypyhqq9y17fdxkj0ljsj1f7kgp7py"; depends=[codetools mvtnorm sandwich survival TH_data]; };
@@ -7094,7 +7141,7 @@ in with self; {
   mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvLSW = derive2 { name="mvLSW"; version="1.0"; sha256="0sbiq7ynilbnwggfl4n9s43cvzgavxq9vi4q09cz3v8wf8xjj3kf"; depends=[fields wavethresh]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.1"; sha256="0nh3myycz8kagk1sks71i20602r82mh6nxczjnlnal5qwgp6zg80"; depends=[fields wavethresh xts zoo]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.0.8"; sha256="1psjlqx7xb5zlrwcd2q2by8y8ykffxdcskbzb12f643iimlp1l4m"; depends=[ape corpcor phytools spam subplex]; };
   mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
@@ -7107,7 +7154,7 @@ in with self; {
   mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; };
   mvctm = derive2 { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
-  mvdalab = derive2 { name="mvdalab"; version="1.1"; sha256="18lwhplwp87dcvxzvyah3g98b5jrs91ifwk2hwn5a1gs733va989"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
+  mvdalab = derive2 { name="mvdalab"; version="1.2"; sha256="0jgvpspvfj4m79rn8bfb7rihh6w948b7z66qisckdmv6wyxwwr4i"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
   mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; };
   mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.4"; sha256="14yk09s1ym4p9nijxqasd3060hncmr1br7lv9rk9vm96bgi6l1rc"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
@@ -7126,7 +7173,7 @@ in with self; {
   mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; };
   mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-  mvtnorm = derive2 { name="mvtnorm"; version="1.0-5"; sha256="1pc1mi2h063gh4a40009xk5j6pf5bm4274i5kycln38dixsry3yh"; depends=[]; };
+  mvtnorm = derive2 { name="mvtnorm"; version="1.0-6"; sha256="0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.4"; sha256="09v3cx2scp8fjcjzsdf7k2xl5y2491hbp25mnbjvm6v16hi2g180"; depends=[Rcpp shiny]; };
@@ -7147,7 +7194,7 @@ in with self; {
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanotime = derive2 { name="nanotime"; version="0.1.1"; sha256="1jir0hhksa4shfn7paln9s3ccsmmyl70hlsk9q5glwi87j6mhlnn"; depends=[bit64 RcppCCTZ zoo]; };
-  naptime = derive2 { name="naptime"; version="1.2.2"; sha256="0jzzs7iphcan6vf1bc3h82gpplnlkw9vhg6366izr2b7vycxafi5"; depends=[anytime lubridate]; };
+  naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
   narray = derive2 { name="narray"; version="0.1.1"; sha256="0n620wzhmlyjkbbwr0py2xfk0vj59a5zyr4d93iyplcrjg91n6zg"; depends=[abind pryr reshape2 stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -7178,6 +7225,7 @@ in with self; {
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; };
+  neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
   neotoma = derive2 { name="neotoma"; version="1.6.2"; sha256="023dpcrhhq8daa0c4viccqs9y19gi05srz4d985diaq7yxjs9vhz"; depends=[analogue httr jsonlite plyr reshape2 xml2]; };
   nephro = derive2 { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
@@ -7232,7 +7280,7 @@ in with self; {
   nlsem = derive2 { name="nlsem"; version="0.7"; sha256="1g5vnqmqq4swnid3601f1cm0q9w9k802394jd3yac95n8sm05i5g"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
   nlshrink = derive2 { name="nlshrink"; version="1.0.1"; sha256="0adnr7g3n3brwlvyix8wa7h59gj036l5anv8abqy80ysmfcmsp0y"; depends=[MASS nloptr]; };
   nlsmsn = derive2 { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
-  nlsr = derive2 { name="nlsr"; version="2017.2.12"; sha256="1fzyfqi6nfzxg0vjlqcvrf6p7qjgvg9qvf4icy13vqs1k70y5v4x"; depends=[digest]; };
+  nlsr = derive2 { name="nlsr"; version="2017.2.19"; sha256="0y1qfg042yk855v6i45w00mbmwic1ravlkrd0fbnr8zrvq74iy1s"; depends=[digest]; };
   nlstimedist = derive2 { name="nlstimedist"; version="1.0.4"; sha256="10wbkngcx02cjyv188ascrw7aaqg8vvwbr7rgy6q87ch5g7ih35g"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
   nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
@@ -7244,7 +7292,7 @@ in with self; {
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.1.4"; sha256="0m12pw4l7lmqn796ac6yn3f9h5h59cv84swb8fk559aw258kpr4s"; depends=[ape picante raster sp vegan]; };
+  nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
   nomclust = derive2 { name="nomclust"; version="1.00.1011"; sha256="1mzz1bc8gg9lw5aacmicfzjak212hrbq2wchblljcxxjvkkn87w5"; depends=[cluster dummies]; };
@@ -7273,7 +7321,6 @@ in with self; {
   nortestARMA = derive2 { name="nortestARMA"; version="1.0"; sha256="170dqxaln51snqzqjwagd16f2x4aarqg3xsim0gbvfqlv43sksb7"; depends=[astsa]; };
   nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
   not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
-  notifier = derive2 { name="notifier"; version="1.0.0"; sha256="1yi99ja8xdg771fn0brz5qz5p9kcbspwjx272lvjvw26lw7gaw3f"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
@@ -7341,7 +7388,6 @@ in with self; {
   oc = derive2 { name="oc"; version="0.96"; sha256="110pf3rqcab0671djx25jwwl8rbaskcd2lrcv56d786j693y2ash"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
   oce = derive2 { name="oce"; version="0.9-20"; sha256="1pckxrkkgb22rrm1q9j2xijnbhk6j260rq8pvmi02l8mdx6l99l5"; depends=[gsw]; };
-  ocean = derive2 { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
   oceanmap = derive2 { name="oceanmap"; version="0.0.2"; sha256="0pbwja7m0ng2j2147sgc07v3q80xmj3bwidvqksigklka4zx822q"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
@@ -7354,6 +7400,7 @@ in with self; {
   odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
   oec = derive2 { name="oec"; version="2.2"; sha256="11ldy303xkl7qaqvlzfwr7qxwnz06n39mkjvrj0sca6xzw12lq5d"; depends=[curl data_table jsonlite plyr servr]; };
   oem = derive2 { name="oem"; version="2.0.4"; sha256="1n9b8zw4d3ydirrrl4n14as5x8jc10bzfza4zs4gn6ljk5p3lsci"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
+  officer = derive2 { name="officer"; version="0.1.0"; sha256="155vzgxrprsnk11m3d8wmvr40pkw1sp99p82g07d6l9d5ix1s28r"; depends=[base64enc digest dplyr gdtools lazyeval magrittr purrr R_utils R6 Rcpp tibble xml2]; };
   oglmx = derive2 { name="oglmx"; version="2.0.0.1"; sha256="03lsgdz2pjykzcv7k9r940rgh7qh7vn651nrshx1r0b63mh9cqsj"; depends=[maxLik]; };
   oii = derive2 { name="oii"; version="1.0.1"; sha256="0w1afajkr5vly9qi1r2iz1ikbvyvy6hcbc10g8s7g6zi8db5dgf4"; depends=[Deducer gmodels rapportools]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
@@ -7384,7 +7431,7 @@ in with self; {
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
   openxlsx = derive2 { name="openxlsx"; version="4.0.0"; sha256="1jz75kxpbbdw3bf9a49fih4wlk36nki3nr8yq7v9n31qzyb5k3qy"; depends=[Rcpp]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
-  operator_tools = derive2 { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
+  operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
   ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
   optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
@@ -7396,7 +7443,7 @@ in with self; {
   optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; };
   optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; };
   optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
-  optiSel = derive2 { name="optiSel"; version="0.1"; sha256="0jr1gi31la8lnz1s7xyk4bc650kf374v2bha638fzg2cx2zqkiif"; depends=[alabama cccp GENLIB kinship2 MASS Matrix nadiv nloptr pedigree pspline Rcsdp stringr]; };
+  optiSel = derive2 { name="optiSel"; version="0.3"; sha256="1b4yrijkdxd78wyjjskawahrzj1k3cgh5d7mpcyr2li1hg86k7m1"; depends=[alabama cccp data_table kinship2 MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; };
   opticut = derive2 { name="opticut"; version="0.1-0"; sha256="0dh7zw8yrzxw3vfzfm776rdhfczmlwfs3fw568s5cc60xsn8fa93"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
@@ -7455,7 +7502,7 @@ in with self; {
   outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; };
   outbreaks = derive2 { name="outbreaks"; version="1.2.0"; sha256="1snycxcllc5vq93ay7xyjw6g4130dvcmja56wvdxixvc5bbv4z1d"; depends=[]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
-  overlap = derive2 { name="overlap"; version="0.2.6"; sha256="066zf4i6anklqqmxf06lyfr9w4scw0djqgp8rabgpzwkvk9xgxmb"; depends=[]; };
+  overlap = derive2 { name="overlap"; version="0.2.7"; sha256="1v7i3p8mmhvnxd9h1g6zprphjgs2nfh7ffkyj7vjbkhfsixp9fpz"; depends=[]; };
   overlapping = derive2 { name="overlapping"; version="1.4.0"; sha256="00rn55wvcj32qgjbjplaq32k2vxzrdlbp8dh7scyw78wyn8bdv2c"; depends=[ggplot2]; };
   owmr = derive2 { name="owmr"; version="0.7.2"; sha256="0206i5zzmfjdd43qziis6kqc0zsvn0l7v5sspjrywjxw2gyjfmwb"; depends=[httr jsonlite magrittr]; };
   oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
@@ -7493,7 +7540,7 @@ in with self; {
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
-  pairwise = derive2 { name="pairwise"; version="0.3.1"; sha256="1p6cclq9dm8zqs6m1r1mlq80cgasrmrv5sjnqj6yw5wwn4rxry6w"; depends=[]; };
+  pairwise = derive2 { name="pairwise"; version="0.4.1"; sha256="06g6ma8wfn3zxyxhbj3bi851aflddsdisw4rwvg0w6l3w2q9mvnf"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-25"; sha256="0wpv22db63xkgjw0nwa39clgrr2finxvl0a510hkc54ijqjx9ksh"; depends=[binMto boot coin MASS MCPAN mcprofile mratios]; };
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
@@ -7536,7 +7583,7 @@ in with self; {
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
   parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; };
-  parsedate = derive2 { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
+  parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.0"; sha256="0ijnnajcr7zyh0c1k6bz9qa4fkcly1fd44x3qj7mhlx58gnq4sa4"; depends=[dplyr lazyeval RSQLite stringr tidyr]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
   partialAR = derive2 { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
@@ -7546,7 +7593,7 @@ in with self; {
   partitions = derive2 { name="partitions"; version="1.9-18"; sha256="1brzvk2zbrh0s4vbaiib6zkpcyx7ghc6ws36h3diz5nxbx3g95ik"; depends=[gmp polynom]; };
   partools = derive2 { name="partools"; version="1.1.5"; sha256="062rnq35cbzyr6mdpq4w88bxd6c2pzbghxan6j11pipyzvv7qsj3"; depends=[data_table pdist]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.2-1"; sha256="1vi0hisph0xscj80ch8gcdp9vrh2k8z5msd2j9p5mvr0f5i5hr7d"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+  party = derive2 { name="party"; version="1.2-2"; sha256="0rmvscgmbligg23djyph54cz5r8xkmmrn04vd3r7pwy1qarah9fi"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
   partykit = derive2 { name="partykit"; version="1.1-1"; sha256="0cl3ir54pafjhk1cvyzx1a8a244x0qa5lky47m7fx1fdj0k7dx6r"; depends=[Formula survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
@@ -7566,7 +7613,7 @@ in with self; {
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
   pavo = derive2 { name="pavo"; version="1.0.0"; sha256="0xi9sb36xc6h8j4h4b46imwy936wi8vlqsv4mfkjka34bn0q7afr"; depends=[geometry mapproj rcdd scatterplot3d]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
-  pbapply = derive2 { name="pbapply"; version="1.3-1"; sha256="053i92j0ch3msywapdia08mmk1w8bhcs6x7cl0han2r9sfliwkzw"; depends=[]; };
+  pbapply = derive2 { name="pbapply"; version="1.3-2"; sha256="1sdmjlnwxb99f95g5v8k8mirrkzw99yig377v0qi9lzwjgd6fqqr"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5"; sha256="0i7rav197787snhw2l5pyb2x0i9d1gl9d7lks2bk0dcxr0ndy9gm"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
@@ -7723,9 +7770,9 @@ in with self; {
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
   pim = derive2 { name="pim"; version="2.0.0.2"; sha256="1fjnll2lfgdfak9427rh343y80awjzwpy46v33kpd6niz41zmra8"; depends=[BB nleqslv]; };
-  pinbasic = derive2 { name="pinbasic"; version="1.0.1"; sha256="16sja6f8ivixrqj83xjgfxrvql6rzhkr0kd9li9spzhs20r4yshl"; depends=[doParallel fastcluster foreach ggplot2 iterators lubridate reshape2 scales]; };
+  pinbasic = derive2 { name="pinbasic"; version="1.1.0"; sha256="0ncbgkpgzp6w856y7ab0drci92rc9mx0j900vxd8ir69c00cm348"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
-  pingr = derive2 { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
+  pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
   pinnacle_API = derive2 { name="pinnacle.API"; version="1.92"; sha256="1a2s33sizg9q6iml56hbbs1c7hx5lz7v7hplhs0nv05vrh8cg9zm"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
   pipe_design = derive2 { name="pipe.design"; version="0.4"; sha256="00znnjqvppvn0qmrxkksiljgd51mf1x5zkmib43myckzwp5cap3i"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.1"; sha256="0ixfj52nd9785ny78wgsyq7srygsj3yg3p95pcb4lrrammchqygk"; depends=[]; };
@@ -7748,7 +7795,7 @@ in with self; {
   placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; };
   plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
-  planor = derive2 { name="planor"; version="1.0-1"; sha256="1wi1s41wwk4zi5sqzm5flaphrpffqv8bhsgzdpknmnhp1nn0hllv"; depends=[conf_design]; };
+  planor = derive2 { name="planor"; version="1.3-6"; sha256="0anli2nrsfq9wzk4vgn7lfr6mi01d70ffb631fxrgh45p36im7dw"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
   plantecophys = derive2 { name="plantecophys"; version="1.1-8"; sha256="02425j4pgwqadg2zn7vyl4741panif236m89zm36p580chp23wir"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="1.1"; sha256="0hkzfxph2lacrd4npqvf4pyaldr1z56hlfbj3gi7qjlflxqnv3xp"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.0"; sha256="0nbkfqrz78zgf06lsfzmwj50lfbq3dvi01j4rlbb6dwamx2cn3sf"; depends=[dplyr]; };
@@ -7790,7 +7837,8 @@ in with self; {
   plsgenomics = derive2 { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; };
   plspm = derive2 { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[amap diagram shape tester turner]; };
   plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; };
-  plspolychaos = derive2 { name="plspolychaos"; version="1.1-0"; sha256="1qq0f95ndpiykbizyivjcbjbbmqqns08i1dkjn3n7k2r9130z8rx"; depends=[lhs MASS]; };
+  plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; };
+  pltesim = derive2 { name="pltesim"; version="0.1.1"; sha256="0xqvs4lax8r2avwpdpf4p49dkwghiqbqc93brz7l1qma6ih0yfrs"; depends=[coreSim ggplot2]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
   plumber = derive2 { name="plumber"; version="0.3.1"; sha256="0li34ldwc8qi7jg37pqaa4b5ql6ybci9a3wh2a48gb8nyb380r2b"; depends=[httpuv jsonlite R6 stringi]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
@@ -7803,8 +7851,8 @@ in with self; {
   pmg = derive2 { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.0.0"; sha256="0r1yw65ixm3zjpiwg800rfwr1p26i6apv4332pgfl84hj5vvp3ws"; depends=[mvtnorm Quandl]; };
   pmlr = derive2 { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
-  pmml = derive2 { name="pmml"; version="1.5.1"; sha256="1w53lkzsgi8d3h89zpr4la3r52mhqxr6a7hazhsmvwhjfkz874ki"; depends=[survival XML]; };
-  pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
+  pmml = derive2 { name="pmml"; version="1.5.2"; sha256="0yp9xhgsdfbkxl5xxzw6n5v9zbpn5819lynj1glzi32bfzjfiwk3"; depends=[stringr XML]; };
+  pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
@@ -7825,14 +7873,14 @@ in with self; {
   poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
   pollen = derive2 { name="pollen"; version="0.50.0"; sha256="1f6bjh7vkwyma8jzigdcijazmzr2mhnmwmaf135lx81d044xj2zr"; depends=[dplyr lubridate purrr]; };
   pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.0"; sha256="13ncdqn1wh5rcad79l0d388qnyi3171djfbz3qjkzw05n3q8rk57"; depends=[data_table DT foreach Matrix R6 slam tm]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.1"; sha256="189zfqcw9w1i1z14l2rgkzqali0arkiq7k770xhzdrahw1whcsc7"; depends=[data_table DT foreach Matrix R6 slam tm]; };
   polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
   polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive2 { name="polyapost"; version="1.4-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; depends=[boot rcdd]; };
-  polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-0"; sha256="0yb119y0a2xjsijxbrxgksnhf3m997dgp9d57wghq68dsfjp3hf3"; depends=[lhs MASS]; };
+  polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
   polyclip = derive2 { name="polyclip"; version="1.5-6"; sha256="1ypwvgd5z61md539z7ndmpl8vaifsjbm231n08zsxskskj1fid7y"; depends=[]; };
   polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
@@ -7840,7 +7888,7 @@ in with self; {
   polysat = derive2 { name="polysat"; version="1.6-0"; sha256="180hf1m2pd9jcz02q0jq3s5sv5h73qc20w3b2sx1psdbyzdk9006"; depends=[]; };
   polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-  pomp = derive2 { name="pomp"; version="1.10"; sha256="1v4mkgn0vn83kgl2la94gnc5g1xxkk1h5gxvjyzkqgkakaigwmsx"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pomp = derive2 { name="pomp"; version="1.11"; sha256="1z66q3l1p7dmds0160w93q31hsxq4fj7bwfyd74d166yg0wfia8x"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
   pooh = derive2 { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
@@ -7851,7 +7899,7 @@ in with self; {
   popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; };
   popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; };
   popgraph = derive2 { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
-  poplite = derive2 { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
+  poplite = derive2 { name="poplite"; version="0.99.17.3"; sha256="0fqkwxlzj92rh187wns7zrygsgch1gw3l8kmnpvc59gdbk1wbbi7"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
   poppr = derive2 { name="poppr"; version="2.3.0"; sha256="0zhmsx23fjjl8zy7s0gyzd0br4imdl2hfgk0g9v9p2ff72xg046d"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; };
   popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="4.0.1"; sha256="1qw6b00mz9i842askixc0288i41v8dfjwc58pa3cbgf6fhfjva9z"; depends=[class fields som]; };
@@ -7894,10 +7942,11 @@ in with self; {
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precrec = derive2 { name="precrec"; version="0.6.2"; sha256="100zr5932vm1rs359nzq4cxbx924az5d8zl9h7720fd5sgy4av7f"; depends=[assertthat ggplot2 gridExtra Rcpp]; };
   predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; };
-  prediction = derive2 { name="prediction"; version="0.1.1"; sha256="0ys0pds2x8nhkf45dp5f0pmp64al670w7xgr5hbifmykn2ivdiqr"; depends=[]; };
+  prediction = derive2 { name="prediction"; version="0.1.10"; sha256="1za32spd6qg63mi5dvkw54k24f5s4a10p2rkfgzjzqxjb9rd265h"; depends=[]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
+  prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
   prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
   preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; };
@@ -7936,7 +7985,7 @@ in with self; {
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-  profileR = derive2 { name="profileR"; version="0.3-3"; sha256="0yc0bgcv8g4qm777l8czvwcw4gsrsgc1f2qgllyid6wsnvw25x6v"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
+  profileR = derive2 { name="profileR"; version="0.3-4"; sha256="1vinqddhd4jbncn37rbypja7ili3kwmj2sacgf491s94zil4ijik"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
   profmem = derive2 { name="profmem"; version="0.4.0"; sha256="1nnk145hzr447z9frk3c58xks3jp0cdl7cv8schqnyjxqlv967g9"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
@@ -7982,7 +8031,7 @@ in with self; {
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
   pspline = derive2 { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; };
-  pssm = derive2 { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[abind MASS MHadaptive numDeriv]; };
+  pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
   psych = derive2 { name="psych"; version="1.6.12"; sha256="0ijz9gcc52byzmrw4iz976lgayp1wmn5b9v36bras14fwlwri0ky"; depends=[foreign mnormt]; };
@@ -8025,7 +8074,7 @@ in with self; {
   qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
   qPCR_CT = derive2 { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
   qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
-  qap = derive2 { name="qap"; version="0.1-0"; sha256="0fc6c3pzlm79nqs9qkngs8m0y8y9syhgilfsav9bbi6ylfhlmdh0"; depends=[]; };
+  qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; };
   qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
   qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
@@ -8039,7 +8088,7 @@ in with self; {
   qgraph = derive2 { name="qgraph"; version="1.4.2"; sha256="1pp3dwrmp7j4rv0djbypnwjb26gji5fhqw4iwqbnxyi86m47z7z7"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
-  qicharts = derive2 { name="qicharts"; version="0.5.3"; sha256="1mqlj8350i7llp76qhpzzisd6vryrnx9wmdazj7xbdg5666qdz45"; depends=[ggplot2 ggrepel lattice latticeExtra scales]; };
+  qicharts = derive2 { name="qicharts"; version="0.5.4"; sha256="0lq9faksp18mgb6pa7qhbm9frd6f4675623d797snvnm67aiy8fa"; depends=[ggplot2 lattice latticeExtra scales]; };
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; };
@@ -8158,7 +8207,7 @@ in with self; {
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.0.4"; sha256="1md0xkl87qqylwh5zbx9awa5i4f573v4glgaf4k8h5ls4icaaav4"; depends=[biglm]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
-  rNOMADS = derive2 { name="rNOMADS"; version="2.3.2"; sha256="1dklyda8xagg643c67ii9hx2lvwkc9xaxlkvigs9dv1bkzbrw9gs"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.3.3"; sha256="186pcxdfkp24aff3qldkhbcxydifg092w3jadahfrd30d6gyfvp8"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
   rPlant = derive2 { name="rPlant"; version="2.16"; sha256="0bi7p8w6v8gys8rab5f0c11r0rsp14nsf4mmm2bsz8kxfprh6vdp"; depends=[RCurl rjson seqinr]; };
   rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; };
   rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
@@ -8201,14 +8250,14 @@ in with self; {
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-  randgeo = derive2 { name="randgeo"; version="0.1.0"; sha256="1jjblzqm45yxz5pvkg2mhv891vxlw0c3ii8y6gah680g09xgwjxx"; depends=[]; };
+  randgeo = derive2 { name="randgeo"; version="0.2.0"; sha256="056c522zw2x4ab7z2bpkw9byfn1gzsfavbjaxdgwi4n934f46h14"; depends=[]; };
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; };
   randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.1"; sha256="0q4xjh7qqmd4slxwd1z5mnpn4y3vx1vbn6v060zbd0afibpcw92b"; depends=[ddR Matrix randomForest]; };
   randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.1"; sha256="17a59jc8h7bfgz9gpisc144fyas7da1c1lab1x8wasfilgkg08z2"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
-  randomLCA = derive2 { name="randomLCA"; version="1.0-10"; sha256="1h1fxymdiycxn90lipzb190xakf7hlbn6nwxsbfwcz8278xkcn4g"; depends=[boot fastGHQuad lattice Matrix]; };
+  randomLCA = derive2 { name="randomLCA"; version="1.0-11"; sha256="076sjq74dhdr9vqlg8kns4apvkrv9qpvkixqkrkz2l7215k79fz7"; depends=[boot fastGHQuad lattice Matrix]; };
   randomNames = derive2 { name="randomNames"; version="0.4-0"; sha256="0419kjgin5yf58765rc6m8wcbp26yggkiarprzissqaf9sp0sh4p"; depends=[data_table]; };
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomcoloR = derive2 { name="randomcoloR"; version="1.0.0"; sha256="15qgfzwc2cli2gjwzj1pf4h16qciiinihd9ib6ph74jbkpimyh11"; depends=[colorspace stringr V8]; };
@@ -8264,6 +8313,7 @@ in with self; {
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.3"; sha256="0bksyjbxdllgaqkhpz29isslqkpp3y4xl3wqhpjy881lhlw40y1j"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; };
+  rcc = derive2 { name="rcc"; version="1.0.0"; sha256="0a77d54c9qahhsjzpa0436ddsj4j44013r7rbxm0fjz04c0d2921"; depends=[]; };
   rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; };
   rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; };
   rcdd = derive2 { name="rcdd"; version="1.1-10"; sha256="16j98x87dsjd7zj5pp9i5lc0a3ypr98zjwydpyhpl3zc0vnbbild"; depends=[]; };
@@ -8272,7 +8322,7 @@ in with self; {
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
-  rclimateca = derive2 { name="rclimateca"; version="0.1"; sha256="0pnmazi33lvmccb1x2rkac0cwp8rf1p0659dfx9718vkdlgkvlgz"; depends=[digest httr lubridate prettymapr reshape2]; };
+  rclimateca = derive2 { name="rclimateca"; version="0.2"; sha256="1haczzx0hbah4vzbp10rih2yqq1x1s6w9f66xgk485sgyvkg5855"; depends=[digest httr lubridate prettymapr reshape2]; };
   rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.7"; sha256="1y9naqi2bylihkasvfndkpwslnm393709645jwvwplzaaviy0hf7"; depends=[httr plyr XML]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
   rcompanion = derive2 { name="rcompanion"; version="1.4.0"; sha256="1brl9q421q8n5lab5wlp0hzgzdldwr2b9sa8qngkk3nfvzy1jdwx"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
@@ -8322,7 +8372,7 @@ in with self; {
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
   rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; };
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
-  recexcavAAR = derive2 { name="recexcavAAR"; version="0.2.2"; sha256="050klwldr8jzn0dwwh7yb0yzjckbdc4z7phd0rp8y8d5ah0n8bn2"; depends=[kriging Rcpp]; };
+  recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recmap = derive2 { name="recmap"; version="0.5.16"; sha256="0fq0l483mmb04n2qj2msngw6midwjrq5fjdh3sgzy5fhj5bcd288"; depends=[GA Rcpp sp]; };
@@ -8332,7 +8382,7 @@ in with self; {
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.4"; sha256="1h8147x9caxxprxpgzk7qj9nkafbi34zhcnaksdpv95k7vnhs4ps"; depends=[Rcpp]; };
-  red = derive2 { name="red"; version="0.2.0"; sha256="0vpwx8lv0jhddcw2cypdhvchgrrkxx8l70yhsp5415mgdkmpp5x2"; depends=[BAT dismo geosphere igraph maptools raster rgdal rgeos rJava sp]; };
+  red = derive2 { name="red"; version="1.0.0"; sha256="07m48znd0dm2fd4jagjrn2fqx2wr1hzvx2rljlkpl0hkkljcz8lj"; depends=[BAT dismo geosphere igraph jsonlite maptools raster rgdal rgeos rJava sp]; };
   reda = derive2 { name="reda"; version="0.3.1"; sha256="0313x4vm0jm0lgzspv0ldsblmjgy13dqbsafpikkh603k5pkq1js"; depends=[ggplot2 splines2]; };
   redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.3"; sha256="01dsgd28ps1f32l3ppz4fbzihs5i79zb1nqg9r3b21fsx1ly44d6"; depends=[snowfall]; };
@@ -8356,7 +8406,7 @@ in with self; {
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
-  regsem = derive2 { name="regsem"; version="0.5.0"; sha256="0ajva492a0z0q1ixdh24w10vbq7fknn66cyjzla5aqcmc5gggp7g"; depends=[lavaan Rcpp RcppArmadillo]; };
+  regsem = derive2 { name="regsem"; version="0.7.0"; sha256="1niwal7dn99kkjm1dj03jfa3lkj747ihy29ay7jcwzin7nnkw9c5"; depends=[lavaan Rcpp RcppArmadillo]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
@@ -8473,6 +8523,7 @@ in with self; {
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
   rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
+  ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; };
   ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; };
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
   rinat = derive2 { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
@@ -8516,7 +8567,7 @@ in with self; {
   rmapshaper = derive2 { name="rmapshaper"; version="0.2.0"; sha256="0s5av8hic3b61ch6skvcxkpn9s2r0ylfxilxg8i2dvg4dk13qkna"; depends=[geojsonio geojsonlint readr rgdal sp V8]; };
   rmarkdown = derive2 { name="rmarkdown"; version="1.3"; sha256="1vvxyf3zhyxx6k697lia299456hryp8nh3zr0fc27f3107a8mcjf"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.2"; sha256="1fx50z8pb5z1i1gzs4v194k9fdiq40ny5ridxym9ykgqf82ncvsa"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.3"; sha256="14brfil6s9hi0rnw13g8d9xvgnyblqbwvs3iwwwb38lzl8az5rqs"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.1.0"; sha256="0hrlamr527r02vj86xsip5n7gilrb8y33fy0xi1lkc66hf714vgw"; depends=[mnormt psych pwr RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
   rmdformats = derive2 { name="rmdformats"; version="0.3.1"; sha256="0x0vh1mdxb00k6c2m09szpbx4rqhch8p5zslb5jmbbacslicr1sq"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
@@ -8527,6 +8578,7 @@ in with self; {
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
   rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
+  rmpw = derive2 { name="rmpw"; version="0.0.1"; sha256="0h5h77hh6v6nfhivmrs5dyks9krwqyh32kmp0mlwialrpshs0hp3"; depends=[]; };
   rms = derive2 { name="rms"; version="5.1-0"; sha256="1ibbpdclxc5vayl7hz176xc03snklx6ymiqzmpvi09y3bv92qnrx"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
@@ -8561,6 +8613,7 @@ in with self; {
   robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; };
   robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; };
+  robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; };
   robustbase = derive2 { name="robustbase"; version="0.92-7"; sha256="13xz4am7y0s0kl5bmbcw3dlhl7ji8h9sjx56wsgmj6r9n35nrggw"; depends=[DEoptimR]; };
   robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
@@ -8591,7 +8644,7 @@ in with self; {
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.5.0"; sha256="1mwvqgfc6l1bqa8ik9nx6mk380hnrplbls8hc5yign8wqlw8rql5"; depends=[httr jsonlite]; };
   rosm = derive2 { name="rosm"; version="0.1.4"; sha256="1p15pmhv52fg8lc0c0yiadc7s0q9s0dz9q6d8544msaxsjwfkpxp"; depends=[abind digest foreach jpeg png rgdal rjson sp]; };
-  rospca = derive2 { name="rospca"; version="1.0.0"; sha256="09rlkzajgs7sqdj5lwb0bs0vx6676qwqcwx1wawvg40npfw40l0h"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
+  rospca = derive2 { name="rospca"; version="1.0.1"; sha256="16kd0nr76h4h64rz402k2pqz1qvczzga72wd7f16z713cwz2s2hn"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
   rotl = derive2 { name="rotl"; version="3.0.1"; sha256="18dzg3ysy6aphwbj1c4hzr1qn8q3vvr5r0qnpmidr5rwyhc78phb"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
@@ -8610,10 +8663,10 @@ in with self; {
   rpdo = derive2 { name="rpdo"; version="0.2.1"; sha256="0n2lpnphnb5h7y9jszq4m15wymwgv7v2pw5fwbflr0ihvx3i3iac"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; };
   rpf = derive2 { name="rpf"; version="0.53"; sha256="16d28i8s7f6ag1jvxw1ns8pi3s1rbxp9z9l13bxsm6cd6kq5jgrq"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.5"; sha256="0hjfzikaryr55xjfw7zjdby4ja59rxq9ikycgbpapvpy2q9py5yp"; depends=[getPass RApiSerialize Rcpp uuid]; };
+  rpgm = derive2 { name="rpgm"; version="0.1.3"; sha256="1d2q1g63w2vgq74aminllgsrzci224n1n9q0gw8230y0xgh3ih82"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.20"; sha256="1aqk0afw2vjb7d75n9imp0dc3nq1w94n3r9fd3k1zsmia8ds8dh3"; depends=[htmlwidgets]; };
-  rplexos = derive2 { name="rplexos"; version="1.1.11"; sha256="0i0yiiy84d6qgx70ib0rf0hr0jb6naw6d6w8lvsl104c3m23sf4q"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
   rplos = derive2 { name="rplos"; version="0.6.4"; sha256="0jqvm212clh02g9sk239l467xg0b83c1zbnhfwgzmvbvk630na1b"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
   rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; };
   rpms = derive2 { name="rpms"; version="0.2.0"; sha256="15l7n9qddzk71s0si0mxmpzvl2h0sdb2z2x058cif4i4kgly9h7d"; depends=[Rcpp RcppArmadillo]; };
@@ -8667,7 +8720,7 @@ in with self; {
   rsml = derive2 { name="rsml"; version="1.3"; sha256="0a1y41jq0yzr19mb2scwhlp9gx5vngm4q12yxp1fcwk2cqhnsda6"; depends=[rgl XML]; };
   rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; };
   rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.1.0"; sha256="15yz4z96hbl18l2n3vz7mcamwvh7zkqbhlhdmyi002bsc1jd97s9"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.1.1"; sha256="1mjlm4gv0551nz0n6qd0596jpn6yc5a4pdqn7h5087gg9cpay0sv"; depends=[h2o sparklyr]; };
   rsq = derive2 { name="rsq"; version="0.6"; sha256="0qc5mkz7b68al3iahsbv45imkzabbsykd95w1yd7gfcrw0qk592m"; depends=[]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
@@ -8777,7 +8830,7 @@ in with self; {
   samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-2"; sha256="182y1srz2cs6rn8kh6nns5v29q0ww2jmv0yfp8b110qq23wd5mnd"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.1"; sha256="0xjsmsqj3ik2ffih8f2cpq6m5rpk603y697mh5m42frg20cqa87w"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
-  sand = derive2 { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
+  sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; };
   sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; };
@@ -8840,7 +8893,7 @@ in with self; {
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; };
   sdcMicro = derive2 { name="sdcMicro"; version="5.0.0"; sha256="1ppqs47p4zha30axgwyvf0dhfrh2hjhi6cgwchikl9k9zwdh4byv"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.21.6"; sha256="17vi1mzr1kiq47dv1zskg63cpsqwxraj01g6sp6lx9vmw2cax74r"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.22.1"; sha256="0mcvymzabflhd0akczczv1cmxaakknqxjma5vdv75043rv151hqr"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
@@ -9034,7 +9087,7 @@ in with self; {
   sinaplot = derive2 { name="sinaplot"; version="1.0.0"; sha256="1s87ykgad56f7l7janxx1x0y98dycpwk7mflyqxncq46awrd1ai0"; depends=[plyr]; };
   siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
-  sirt = derive2 { name="sirt"; version="1.14-0"; sha256="1dbv1wg16hd34hhsah0bf4rk3jqrr31rmsysjsbhall6mqlkprxz"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
+  sirt = derive2 { name="sirt"; version="1.15-41"; sha256="00l8xv10isbk150gmp0b3rppzy0rnrhfn6w1j8whwdgws5fa3vl3"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.3"; sha256="17q6dl8wiwf01g6jm93w72jvp1madd0fww1yiazjcbkmz0j3kdbl"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
@@ -9088,7 +9141,7 @@ in with self; {
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1"; sha256="1jqcgm098kdsrgwrpjry0l6rg8ql7cigxk54svs3170x1fvxa3il"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.4"; sha256="18li9l62lmpsva0whw6d5wr46w90w3z70wywiy785sla00g06sp2"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo]; };
-  smooth = derive2 { name="smooth"; version="1.6.3"; sha256="0b7gdy0bjnaqn4djflxzkjx036jqn8izlc344yvsvybw5gysavl8"; depends=[nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="1.7.0"; sha256="16jhg9qn6rcgd64wx6f7b9a3p9kgkbms8vlygc1gmnkifnh60a0v"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.1"; sha256="06lpjp408ggj27yw6mw7f96kxly7r8kzikbsdp0y1gzig1qq8nbs"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
@@ -9137,12 +9190,12 @@ in with self; {
   solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; };
   solvebio = derive2 { name="solvebio"; version="0.3.0"; sha256="1y3raw38888jii2c4x1mvdwscyss8qc9fpyl96y0hpmxj4yg1d4l"; depends=[httr jsonlite]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
-  som_nn = derive2 { name="som.nn"; version="1.0.3"; sha256="1viyw7gyfglnpqxamzqxsph876006bx0hbkjb8psi3v71wi014i2"; depends=[class hexbin kohonen som]; };
+  som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="2.5"; sha256="02a2j43nppzpbh0zqkq79yqys79jsmwql7nsijxlz27b847wf3pz"; depends=[MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="2.6"; sha256="02y0iah34h9zjji0p5xllz76q3cdabkljsi6vvbdraf0rhi2x51f"; depends=[MASS Matrix]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -9239,13 +9292,13 @@ in with self; {
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="0.6-10"; sha256="0d94irvrpwlxsc7rw56lj8h72wigpxrsk3gsy6n37zr5l1yc2k5k"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; };
+  spdep = derive2 { name="spdep"; version="0.6-11"; sha256="15pv5ygaj924fjscm7wffjxyz9krbdh6f70f2vawq2m1w7qs2kd8"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.1.2"; sha256="056rdnz6qj24x8gl3aigcd84rk5c06r76wkcgn1rkaacs5b20qmq"; depends=[dplyr lazyeval sp spbabel tibble]; };
   spduration = derive2 { name="spduration"; version="0.15.1"; sha256="1kjr3vncns91ha1q3q1xp2ss12m80k5hixzccm1ggdc77ha3bjhv"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="1.2.2"; sha256="03f6w575n8c8whi2hcxwspfs65112ykbwyn5nhx3r7x3dyqpk9v1"; depends=[MassSpecWavelet]; };
+  speaq = derive2 { name="speaq"; version="1.2.3"; sha256="01xihbj9qx24ql0kn1hafkgbsjl9hw16jh8vxqygmv0lvxljlzvy"; depends=[MassSpecWavelet]; };
   speaq2 = derive2 { name="speaq2"; version="0.1.0"; sha256="0rrqh90vqi7l1nbwivzvygd292nnkgk26nyh2kw71pl3gfakmnml"; depends=[cluster data_table doSNOW foreach MassSpecWavelet mQTL]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
   speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; };
@@ -9289,6 +9342,7 @@ in with self; {
   spocc = derive2 { name="spocc"; version="0.6.0"; sha256="0xrwwac2d8j4c4qy6br9l6i9bqlqbmzmq34dp25xwhw1nla6mhvs"; depends=[data_table httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble V8 whisker]; };
   spongecake = derive2 { name="spongecake"; version="0.1.1"; sha256="1bf2106ik4dp9xl68s8wzj5w6yl3syx8i39zxpp24rywb6f2i8n0"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
+  sppmix = derive2 { name="sppmix"; version="1.0.0.0"; sha256="0g0c461ab7mshhbxd5qbskk1rxzlq1rl2cgg0xfq00hv6x9nhb8y"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; };
   spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
   sprint = derive2 { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; };
@@ -9355,7 +9409,7 @@ in with self; {
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statip = derive2 { name="statip"; version="0.1.4"; sha256="1vy3433rrifcix1m28lizbik3qrl2krdldbvmqfyp046xxf2inc1"; depends=[bazar dplyr]; };
   statisticalModeling = derive2 { name="statisticalModeling"; version="0.3.0"; sha256="018ap1hbv4m6y0c71f807apbb9bhr64kcfrn4w8ahhb2520l4mf8"; depends=[ggplot2 lazyeval magrittr mosaic rpart]; };
-  statmod = derive2 { name="statmod"; version="1.4.27"; sha256="14yilq9d3z20hig4rs8bjqyydw3dfx90mhmzvw9w8p16h0s595sn"; depends=[]; };
+  statmod = derive2 { name="statmod"; version="1.4.29"; sha256="1fgzkwriba39d7946lq892f0si2fjdy37pvxki6ix8xyj8qgnci4"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
   statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
@@ -9403,7 +9457,7 @@ in with self; {
   stratification = derive2 { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
   stratigraph = derive2 { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
   straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-  stream = derive2 { name="stream"; version="1.2-3"; sha256="0ngsbnm8zy2nzvsdbbqg1lyd9l0k537ql7y8ck85hmwxj7nxna4b"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
+  stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamMOA = derive2 { name="streamMOA"; version="1.1-2"; sha256="0mg113v8zy6kh67hm91xfd9kd1x8vvvx03svhz70nz9npw00pvlz"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
   stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; };
@@ -9458,7 +9512,7 @@ in with self; {
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; };
-  surrosurv = derive2 { name="surrosurv"; version="1.1.5"; sha256="1mga3xi41rhnpci7zb224j1jdzf4nli4mbr7jy8nibjyjw4ccdz9"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; };
+  surrosurv = derive2 { name="surrosurv"; version="1.1.10"; sha256="1sqwj90nvklrx0by185dlkjwaf9fxrlikf94irxih893vrqsihg8"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[flexsurv plotrix survC1 survival]; };
   survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
@@ -9513,7 +9567,7 @@ in with self; {
   swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
-  swirl = derive2 { name="swirl"; version="2.4.2"; sha256="1dmjpjyk1a76vyya2x47sakj7xspma0i20zhryraf52mavb5qnw9"; depends=[digest httr RCurl stringr testthat yaml]; };
+  swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.0"; sha256="1j5xrv9nbfxmwxr77qa545fcm0vg76zwv1l5msgykq2g6cc9vc4z"; depends=[base64enc rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.11.2"; sha256="0kwkadw1hfkjvlpgr8lfx9qknlml3alk8ka2yhbga019y7ifbm7y"; depends=[RCurl RJSONIO]; };
@@ -9611,6 +9665,7 @@ in with self; {
   textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   textshape = derive2 { name="textshape"; version="1.0.2"; sha256="0p9n003z98aqk272wcj02z0c5dzaw01iyfbd0fjyccgkidyaz49h"; depends=[data_table slam stringi]; };
+  textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; };
   textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
@@ -9634,6 +9689,7 @@ in with self; {
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.0"; sha256="1n8lbw3g9x1i6rjj3gsyzwnb0ailw9vb6vgr0s0h21c0g1z66a74"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
+  tidyRSS = derive2 { name="tidyRSS"; version="1.0.1"; sha256="0nm5kbwf8i03n2si81iwf55cmc7q9x1rvg2zlq8fw00kmp0amwzs"; depends=[dplyr httr lubridate magrittr purrr RCurl XML xml2]; };
   tidyjson = derive2 { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; };
   tidyquant = derive2 { name="tidyquant"; version="0.3.0"; sha256="1fn78ibi9c0a14kr54yca489xjac1j58w8g77il61czqq8bn5hdv"; depends=[curl devtools dplyr ggplot2 lubridate magrittr purrr quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; };
   tidyr = derive2 { name="tidyr"; version="0.6.1"; sha256="11hs3gqpbaw3w281as4m7j9n594ix5axfpwbyjsd0l62pwnzj217"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; };
@@ -9682,7 +9738,7 @@ in with self; {
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlm = derive2 { name="tlm"; version="0.1.4"; sha256="041ydlbsn0dxggrvfjfpg2jmns3c4z021f64cl2k1lwmxvqrp265"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
-  tm = derive2 { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
+  tm = derive2 { name="tm"; version="0.7-1"; sha256="1z76ryka8yd9xwcqgla8v7mgh6wc14mqpmygv958nfy5sf2w4k8q"; depends=[BH NLP Rcpp slam]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
@@ -9707,7 +9763,7 @@ in with self; {
   tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
   tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
-  topicmodels = derive2 { name="topicmodels"; version="0.2-4"; sha256="0hqgq8lkaj5p4lvjgyyw8vh8j85khqvvrm8vw172dbj997x2izi4"; depends=[modeltools slam tm]; };
+  topicmodels = derive2 { name="topicmodels"; version="0.2-5"; sha256="1kilkwfhs7295w410xv34np1cr1wdwqxq1776mg24z4f8a56ccrw"; depends=[modeltools slam tm]; };
   topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; };
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
@@ -9805,6 +9861,7 @@ in with self; {
   ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
   ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
   tuber = derive2 { name="tuber"; version="0.7.0"; sha256="1fcls8q4ihz50wnar87047i8il32a1nrxw67nv9wjqfi02z74c2p"; depends=[httr plyr]; };
+  tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.0"; sha256="0pxsnvzh5gy5dsdsqsmq8hkr597dnnv60b5dw7bqw493lavk2ccm"; depends=[]; };
   tufte = derive2 { name="tufte"; version="0.2"; sha256="0yh5xdxapqpf5hgdn8c2jkk63817l2w6bxavw8457r89rnj1022p"; depends=[htmltools knitr rmarkdown]; };
   tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
   tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
@@ -9894,7 +9951,7 @@ in with self; {
   varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; };
   varbvs = derive2 { name="varbvs"; version="2.0.0"; sha256="1bi11qcgnw263p1vv25nhcf9b0vf04bl6hpb9agw1rp1f7c9xsrb"; depends=[lattice latticeExtra]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.8.4"; sha256="1w2l3pz4qwsx376wd4vzkfs1xajsy10fkkhmn7gmvrvi899afmh3"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.8.6"; sha256="0jfwrpg85w10m6y4pk06wrbmnvzjby1fiarn3i14dgglba8jcrbl"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.1"; sha256="06n13dyq41dr0gsq2bzkqqraqqkab93n7gimln4ckkdnrv0a1crx"; depends=[]; };
   variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
@@ -9966,6 +10023,7 @@ in with self; {
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
   wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; };
+  walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="0.6.3"; sha256="1kv1svckdgb8rl51qdrn3cc367gklr89fy2lw92992vmsimafxhd"; depends=[devtools dismo dplyr DT ENMeval leaflet magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyBS shinyjs shinythemes spocc spThin]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
@@ -10018,6 +10076,7 @@ in with self; {
   wicket = derive2 { name="wicket"; version="0.2.0"; sha256="0wyd72w1l84kxzfy0hhrzr6ipxgzh2gfwldlmv0h79r5icjk17z3"; depends=[BH Rcpp]; };
   widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
   widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
+  widgetframe = derive2 { name="widgetframe"; version="0.1.0"; sha256="0v7mi7m97200dyq8n173gsyw16g75bdas12s38lvg0a09gcyn8z0"; depends=[htmltools htmlwidgets magrittr purrr]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
   wikilake = derive2 { name="wikilake"; version="0.1"; sha256="05fcdrv2splhxkr3xgp14mwn36z3sn5hjq4mjibkgh44x7av4rf8"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; };
@@ -10095,7 +10154,7 @@ in with self; {
   xtractomatic = derive2 { name="xtractomatic"; version="3.2.0"; sha256="04gng8y7606fvyj767f9vja33fh0xcwj2v2jy3nacybjwwr9yrx0"; depends=[httr ncdf4 sp]; };
   xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
   xxIRT = derive2 { name="xxIRT"; version="2.0.0"; sha256="140dp3chsd9mlnbysachck3547zgcpsbrgqhnrdxp348pny0l94b"; depends=[ggplot2 lpSolveAPI reshape2 shiny]; };
-  xyloplot = derive2 { name="xyloplot"; version="1.3"; sha256="1pgxsmghpy9am1smdfc0d8hi2l9gb15ssfpf4z84cc2chhaghc7w"; depends=[]; };
+  xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
   xyz = derive2 { name="xyz"; version="0.1"; sha256="0hynmrbi1f0ijv2g0va8bnr84ls2d8prl32f76mmfq6a3laqrj9i"; depends=[Rcpp]; };
   yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; };
@@ -10110,11 +10169,11 @@ in with self; {
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
   yuima = derive2 { name="yuima"; version="1.5.9"; sha256="04s96zkyccb2nkgzh07jxa8lpyrvzigyiynis2ifiql12yw5c960"; depends=[cubature expm mvtnorm Rcpp zoo]; };
-  yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.0"; sha256="12mr9icngrrghn0j1dpyx2njr7sn9zc5nm3imrqq3qxz7wv45fg8"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
+  yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.1"; sha256="14iyx7rp538l41s135qq5rcq2hbl7rpnhpigz0lzyzdyg6a2mn2n"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.0.3-1"; sha256="1408bb5nfipsxskgpjzixnxndg7hf48nq27k0pwrcxx16wykmlcy"; depends=[MASS NADA truncnorm]; };
   zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
-  zeallot = derive2 { name="zeallot"; version="0.0.2"; sha256="0rksacqasiq9xxxmkdqi5c844xhbnda6f6hr8mz37vg9zxqzfbdj"; depends=[]; };
+  zeallot = derive2 { name="zeallot"; version="0.0.3"; sha256="0cxrq9lf184szysccx7zhhgsimixhkpdybgj05asi5kbrlf03pn6"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.0"; sha256="1s9lm90yhyhflikvrwpbx94gysc7wazpi4v3vh3fibiyna0a9sgj"; depends=[ggplot2 pbapply plyr reshape2]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-1"; sha256="0agm81rrn4ip6sljrwm1a9i2q9rwdwamnxm0smz757kypgyll8c2"; depends=[graph MASS PairViz]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index adc842cf50b00..40d8e2b1b436a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -16,8 +16,6 @@ let
   # some packages, e.g. cncaGUI, require X running while installation,
   # so that we use xvfb-run if requireX is true.
   mkDerive = {mkHomepage, mkUrls}: args:
-      # XXX: not ideal ("2.2" would match "2.22") but sufficient
-      assert (!(args ? rVersion) || lib.hasPrefix args.rVersion (lib.getVersion R));
       lib.makeOverridable ({
         name, version, sha256,
         depends ? [],
@@ -40,7 +38,7 @@ let
     meta.broken = broken;
   });
 
-  # Templates for generating Bioconductor, CRAN and IRkernel packages
+  # Templates for generating Bioconductor and CRAN packages
   # from the name, version, sha256, and optional per-package arguments above
   #
   deriveBioc = mkDerive {
@@ -59,10 +57,6 @@ let
     mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/";
     mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ];
   };
-  deriveIRkernel = mkDerive {
-    mkHomepage = {name}: "https://irkernel.github.io/";
-    mkUrls = {name, version}: [ "http://irkernel.github.io/src/contrib/${name}_${version}.tar.gz" ];
-  };
 
   # Overrides package definitions with nativeBuildInputs.
   # For example,
@@ -224,8 +218,7 @@ let
   _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } //
           import ./bioc-annotation-packages.nix { inherit self; derive = deriveBiocAnn; } //
           import ./bioc-experiment-packages.nix { inherit self; derive = deriveBiocExp; } //
-          import ./cran-packages.nix { inherit self; derive = deriveCran; } //
-          import ./irkernel-packages.nix { inherit self; derive = deriveIRkernel; };
+          import ./cran-packages.nix { inherit self; derive = deriveCran; };
 
   # tweaks for the individual packages and "in self" follow
 
@@ -700,794 +693,508 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [
-    "TED" # depends on broken package animation
-    "streamMOA" # depends on broken package animation
-    "stream" # depends on broken package animation
-    "spdynmod" # depends on broken package animation
-    "treeplyr" # depends on broken package animation
-    "recluster" # depends on broken package animation
-    "geomorph" # depends on broken package animation
-    "phytools" # depends on broken package animation
-    "animation" # broken build
-    "srd" # broken build
-    "paleotree" # broken build
-    "ndtv" # broken build
-    "mvMORPH" # broken build
-    "mptools" # broken build
-    "monogeneaGM" # broken build
-    "molaR" # broken build
-    "idm" # broken build
-    "hisse" # broken build
-    "gfcanalysis" # broken build
-    "evolqg" # broken build
-    "evobiR" # broken build
-    "convevol" # broken build
-    "bayou" # broken build
-    "anim_plots" # broken build
-    "TKF" # broken build
-    "Rphylopars" # broken build
-    "RAM" # broken build
-    "PhySortR" # broken build
-    "MonoPhy" # broken build
-    "Momocs" # broken build
-    "Evomorph" # broken build
-    "PBD" # depends on broken package DDD
-    "DDD" # broken build
-    "BMhyd" # broken build
-    "rscala" # broken build
-    "rgpui" # depends on broken package rgp
-    "rgp" # broken build
-    "qcmetrics" # broken build
-    "lfe" # broken build
-    "interactiveDisplay" # depends on broken package interactiveDisplayBase
-    "RefNet" # depends on broken package interactiveDisplayBase
-    "pwOmics" # depends on broken package interactiveDisplayBase
-    "grasp2db" # depends on broken package interactiveDisplayBase
-    "gputools" # broken build
-    "EnsDb_Rnorvegicus_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Rnorvegicus_v75" # depends on broken package interactiveDisplayBase
-    "EnsDb_Mmusculus_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Mmusculus_v75" # depends on broken package interactiveDisplayBase
-    "EnsDb_Hsapiens_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Hsapiens_v75" # depends on broken package interactiveDisplayBase
-    "ensembldb" # depends on broken package interactiveDisplayBase
-    "AnnotationHubData" # depends on broken package interactiveDisplayBase
-    "AnnotationHub" # depends on broken package interactiveDisplayBase
-    "interactiveDisplayBase" # broken build
-    "h2o" # broken build
-    "funModeling" # broken build
-    "brr" # broken build
-    "bedr" # broken build
-    "Sabermetrics" # broken build
-    "RKEEL" # depends on broken package RKEELjars
-    "RKEELjars" # broken build
-    "RapidPolygonLookup" # depends on broken package PBSmapping
-    "PBSmapping" # broken build
-    "stagePop" # depends on broken package PBSddesolve
-    "PBSddesolve" # broken build
-    "Metab" # broken build
-    "Crossover" # broken build
-    "CardinalWorkflows" # broken build
-    "mapr" # depends on broken package spocc
-    "vmsbase" # broken build
-    "vcfR" # broken build
-    "strataG" # broken build
-    "SSDM" # broken build
-    "SimInf" # broken build
-    "shazam" # broken build
-    "rsvg" # broken build
-    "Rothermel" # broken build
-    "rfPermute" # broken build
-    "redland" # broken build
-    "RAppArmor" # broken build
-    "permGPU" # broken build
-    "pdftools" # broken build
-    "OceanView" # broken build
-    "MSeasyTkGUI" # broken build
-    "mrMLM" # broken build
-    "MonetDBLite" # broken build
-    "MixGHD" # broken build
-    "LCMCR" # broken build
-    "hunspell" # broken build
-    "googleformr" # broken build
-    "ggseas" # depends on broken package x13binary
-    "seasonal" # depends on broken package x13binary
-    "gunsales" # depends on broken package x13binary
-    "x13binary" # broken build
-    "fds" # broken build
-    "exifr" # broken build
-    "rite" # depends on broken package euroMix
-    "MBCB" # depends on broken package euroMix
-    "forensim" # depends on broken package euroMix
-    "dynBiplotGUI" # depends on broken package euroMix
-    "cncaGUI" # depends on broken package euroMix
-    "biplotbootGUI" # depends on broken package euroMix
-    "AnthropMMD" # depends on broken package euroMix
-    "ilc" # depends on broken package demography
-    "demography" # broken build
-    "TransView" # broken build
-    "Starr" # broken build
-    "SICtools" # broken build
-    "ReQON" # depends on broken package seqbias
-    "seqbias" # broken build
-    "Repitools" # broken build
-    "QuasR" # broken build
-    "qrqc" # broken build
-    "ProteomicsAnnotationHubData" # broken build
-    "podkat" # broken build
-    "PING" # depends on broken package PICS
-    "PICS" # broken build
-    "mcaGUI" # broken build
-    "deepSNV" # broken build
-    "motifbreakR" # depends on broken package MotIV
-    "LowMACA" # depends on broken package MotIV
-    "dagLogo" # depends on broken package MotIV
-    "motifStack" # depends on broken package MotIV
-    "MotIV" # broken build
-    "CNEr" # broken build
-    "canceR" # broken build
-    "BubbleTree" # broken build
-    "arrayQualityMetrics" # broken build
-    "ArrayExpressHTS" # broken build
-    "TargetSearchData" # depends on broken package TargetSearch
-    "TargetSearch" # broken build
-    "ptw" # depends on broken package nloptr
-    "gpuR" # broken build
-    "erma" # broken build
-    "MBmca" # depends on broken package chipPCR
-    "dpcR" # depends on broken package chipPCR
-    "chipPCR" # broken build
-    "alsace" # broken build
-    "rrlda" # depends on broken package VIM
-    "qrfactor" # depends on broken package VIM
-    "MVN" # depends on broken package VIM
-    "mvoutlier" # depends on broken package VIM
-    "robCompositions" # depends on broken package VIM
-    "DiagrammeRsvg" # depends on broken package V8
-    "dagitty" # depends on broken package V8
-    "remoter" # depends on broken package sodium
-    "Fletcher2013b" # depends on broken package RTN
-    "apaStyle" # depends on broken package ReporteRs
-    "categoryCompare" # depends on broken package RCytoscape
-    "preseqR" # depends on broken package polynom
-    "permutations" # depends on broken package partitions
-    "GLMMRR" # depends on broken package lme4
-    "replicationInterval" # depends on broken package lme4
-    "GWASdata" # depends on broken package GWASTools
-    "EnsemblePCReg" # depends on broken package EnsembleBase
-    "EnsembleCV" # depends on broken package EnsembleBase
-    "cpgen" # depends on broken package pedigreemm
-    "mitml" # depends on broken package jomo
-    "IlluminaHumanMethylation450k_db" # broken build
-    "gahgu95ecdf" # broken build
-    "gahgu95dcdf" # broken build
-    "gahgu95ccdf" # broken build
-    "gahgu95bcdf" # broken build
-    "gahgu95av2cdf" # broken build
-    "PREDAsampledata" # depends on broken package gahgu133plus2cdf
-    "gahgu133plus2cdf" # broken build
-    "gahgu133bcdf" # broken build
-    "gahgu133acdf" # broken build
-    "annmap" # depends on broken package RMySQL
-    "choroplethr" # depends on broken package acs
-    "acs" # broken build
-    "spray" # depends on broken package partitions
-    "CNVrd2" # broken build
-    "proteoQC" # depends on broken package rTANDEM
-    "PGA" # depends on broken package rTANDEM
-    "MBESS" # depends on broken package OpenMx
-    "DOQTL" # depends on broken package rhdf5
-    "DmelSGI" # depends on broken package rhdf5
-    "flowDiv" # depends on broken package ncdfFlow
-    "ChemmineDrugs" # depends on broken package ChemmineR
-    "stpm" # depends on broken package nloptr
-    "sjmisc" # depends on broken package nloptr
-    "rstanarm" # depends on broken package nloptr
-    "glmmsr" # depends on broken package nloptr
-    "FDboost" # depends on broken package nloptr
-    "faraway" # depends on broken package nloptr
-    "interplot" # depends on broken package nloptr
-    "VSE" # depends on broken package car
-    "VARSEDIG" # depends on broken package car
-    "translateSPSS2R" # depends on broken package car
-    "tadaatoolbox" # depends on broken package car
-    "lavaan_shiny" # depends on broken package car
-    "RcmdrPlugin_GWRM" # depends on broken package car
-    "pcaBootPlot" # depends on broken package car
-    "ClustGeo" # depends on broken package car
-    "preproviz" # depends on broken package car
-    "hsdar" # depends on broken package car
-    "DecisionCurve" # depends on broken package car
-    "CONDOP" # depends on broken package car
-    "EnsemblePenReg" # depends on broken package car
-    "EnsembleBase" # depends on broken package car
-    "fullfact" # depends on broken package car
-    "clusterSEs" # depends on broken package car
-    "ggiraph" # depends on broken package gdtools
-    "rvg" # depends on broken package gdtools
-    "ggpmisc" # depends on broken package polynom
-    "mlt_docreg" # depends on broken package polynom
-    "mlt" # depends on broken package polynom
-    "basefun" # depends on broken package polynom
-    "rtable" # depends on broken package ReporteRs
-    "Mediana" # depends on broken package ReporteRs
-    "ReporteRs" # broken build
-    "abd" # depends on broken package nlopt
-    "adabag" # depends on broken package nlopt
-    "adhoc" # broken build
-    "AER" # depends on broken package nlopt
-    "afex" # depends on broken package nlopt
-    "agRee" # depends on broken package nlopt
-    "aLFQ" # depends on broken package nlopt
-    "algstat" # broken build
-    "alr3" # depends on broken package nlopt
-    "alr4" # depends on broken package nlopt
-    "alsace" # depends on broken nloptr
-    "anacor" # depends on broken package nlopt
-    "aods3" # depends on broken package nlopt
-    "apaTables" # depends on broken package car
-    "apt" # depends on broken package nlopt
-    "ArfimaMLM" # depends on broken package nlopt
-    "arm" # depends on broken package nlopt
-    "ART" # depends on broken package car
-    "ARTool" # depends on broken package nlopt
-    "AssetPricing" # broken build
-    "AtelieR" # broken build
-    "auRoc" # depends on broken package MBESS
-    "AutoModel" # depends on broken package car
-    "bamdit" # broken build
-    "bapred" # depends on broken package lme4
-    "bartMachine" # depends on broken package nlopt
-    "bayesDem" # depends on broken package nlopt
-    "bayesLife" # depends on broken package nlopt
-    "BayesMed" # broken build
-    "bayesmix" # broken build
-    "bayesPop" # depends on broken package nlopt
-    "Bayesthresh" # depends on broken package nlopt
-    "BaySIC" # broken build
-    "BBRecapture" # depends on broken package nlopt
-    "BCA" # depends on broken package nlopt
-    "bdynsys" # depends on broken package car
-    "BEST" # broken build
-    "bgmm" # depends on broken package nlopt
-    "BIFIEsurvey" # depends on broken package nlopt
-    "BiGGR" # depends on broken package rsbml
-    "bioassayR" # broken build
-    "BiodiversityR" # depends on broken package nlopt
-    "biotools" # depends on broken package rpanel
-    "birte" # build is broken
-    "BLCOP" # depends on broken package Rsymphony
-    "blmeco" # depends on broken package nlopt
-    "blme" # depends on broken package nlopt
-    "bmd" # depends on broken package nlopt
-    "bmem" # depends on broken package nlopt
-    "bmeta" # depends on broken package R2jags
-    "bootnet" # depends on broken package nlopt
-    "boral" # broken build
-    "BradleyTerry2" # depends on broken package nlopt
-    "BrailleR" # broken build
-    "brainGraph" # build is broken
-    "brms" # build is broken
-    "BRugs" # build is broken
-    "BTSPAS" # broken build
-    "CADFtest" # depends on broken package nlopt
-    "cAIC4" # depends on broken package nlopt
-    "candisc" # depends on broken package nlopt
-    "carcass" # depends on broken package nlopt
-    "car" # depends on broken package nlopt
-    "caret" # depends on broken package nlopt
-    "caretEnsemble" # depends on broken package nlopt
-    "CARrampsOcl" # depends on broken package OpenCL
-    "Causata" # broken build
-    "CCpop" # depends on broken package nlopt
-    "CCTpack" # broken build
-    "ChainLadder" # depends on broken package nlopt
-    "ChemmineR" # Build Is Broken
-    "chipenrich" # build is broken
-    "chipPCR" # depends on broken nloptr
-    "classify" # broken build
-    "climwin" # depends on broken package nlopt
-    "CLME" # depends on broken package nlopt
-    "clpAPI" # build is broken
-    "clusterPower" # depends on broken package nlopt
-    "clusterSEs" # depends on broken AER
-    "ClustGeo" # depends on broken FactoMineR
-    "CNORfuzzy" # depends on broken package nlopt
-    "CNVPanelizer" # depends on broken cn.mops
-    "COHCAP" # build is broken
-    "colorscience" # broken build
-    "compendiumdb" # broken build
-    "conformal" # depends on broken package nlopt
-    "corHMM" # depends on broken package nlopt
-    "CosmoPhotoz" # depends on broken package nlopt
-    "covmat" # depends on broken package VIM
-    "cplexAPI" # build is broken
-    "cquad" # depends on broken package car
-    "CrypticIBDcheck" # depends on broken package nlopt
-    "ctsem" # depends on broken package OpenMx
-    "cudaBayesreg" # build is broken
-    "daff" # depends on broken package V8
-    "dagbag" # build is broken
-    "DAMisc" # depends on broken package nlopt
-    "dbConnect" # broken build
-    "DBKGrad" # depends on broken package rpanel
-    #"dcmle" # broken build
-    "ddst" # broken build
-    "Deducer" # depends on broken package nlopt
-    "DeducerExtras" # depends on broken package nlopt
-    "DeducerPlugInExample" # depends on broken package nlopt
-    "DeducerPlugInScaling" # depends on broken package nlopt
-    "DeducerSpatial" # depends on broken package nlopt
-    "DeducerSurvival" # depends on broken package nlopt
-    "DeducerText" # depends on broken package nlopt
-    "DEGraph" # depends on broken package RCytoscape
-    "destiny" # depends on broken package VIM
-    "DiagTest3Grp" # depends on broken package nlopt
-    "difR" # depends on broken package nlopt
-    "DirichletMultinomial" # Build Is Broken
-    "DistatisR" # depends on broken package nlopt
-    "diveRsity" # depends on broken package nlopt
-    "DJL" # depends on broken package car
-    "dpa" # depends on broken package nlopt
-    "dpcR" # depends on broken nloptr
-    "drc" # depends on broken package nlopt
-    "drfit" # depends on broken package nlopt
-    "drsmooth" # depends on broken package nlopt
-    "dynlm" # depends on broken package nlopt
-    "easyanova" # depends on broken package nlopt
-    "ecd" # depends on broken package polynom
-    "edge" # depends on broken package nlopt
-    "eeptools" # depends on broken package nlopt
-    "EffectLiteR" # depends on broken package nlopt
-    "effects" # depends on broken package nlopt
-    "eiR" # depends on broken package ChemmineR
-    "EMA" # depends on broken package nlopt
-    "embryogrowth" # broken build
-    "emg" # broken build
-    "EnQuireR" # depends on broken package nlopt
-    "episplineDensity" # depends on broken package nlopt
-    "epr" # depends on broken package nlopt
-    "erer" # depends on broken package nlopt
-    "erma" # depends on broken GenomicFiles
-    "erpR" # depends on broken package rpanel
-    "ESKNN" # depends on broken package caret
-    "euroMix" # build is broken
-    "extRemes" # depends on broken package nlopt
-    "ez" # depends on broken package nlopt
-    "ezec" # depends on broken package drc
-    "facopy" # depends on broken package nlopt
-    "FactoMineR" # depends on broken package nlopt
-    "Factoshiny" # depends on broken package nlopt
-    "faoutlier" # depends on broken package nlopt
-    "fastR" # depends on broken package nlopt
-    "FDRreg" # depends on broken package nlopt
-    "fishmethods" # depends on broken package lme4
-    "flipflop" # broken build
-    "flowDensity" # depends on broken package nlopt
-    "flowPeaks" # build is broken
-    "flowQ" # build is broken
-    "flowStats" # depends on broken package ncdfFlow
-    "flowVS" # depends on broken package ncdfFlow
-    "flowWorkspace" # depends on broken package ncdfFlow
-    "fmcsR" # depends on broken package ChemmineR
-    "fPortfolio" # depends on broken package Rsymphony
-    "fracprolif" # broken build
-    "FreeSortR" # broken build
-    "freqweights" # depends on broken package nlopt
-    "frmqa" # broken build
-    "FSA" # depends on broken package car
-    "fscaret" # depends on broken package nlopt
-    "funcy" # depends on broken package car
-    "fxregime" # depends on broken package nlopt
-    "gamclass" # depends on broken package nlopt
-    "gamlss_demo" # depends on broken package rpanel
-    "gamm4" # depends on broken package nlopt
-    "gaussquad" # broken build
-    "gcmr" # depends on broken package nlopt
-    "GDAtools" # depends on broken package nlopt
-    "gdtools" # broken build
-    "GENESIS" # broken build
-    "genridge" # depends on broken package nlopt
-    "geojsonio" # depends on broken package V8
-    "GEWIST" # depends on broken package nlopt
-    "ggtree" # broken build
-    "gimme" # depends on broken package nlopt
-    "gMCP" # build is broken
-    "gmum_r" # broken build
-    "GPC" # broken build
-    "gplm" # depends on broken package nlopt
-    "gpuR" # depends on GPU-specific header files
-    "granova" # depends on broken package nlopt
-    "graphicalVAR" # depends on broken package nlopt
-    "GraphPAC" # broken build
-    "gridGraphics" # build is broken
-    "GSCA" # depends on broken package rhdf5
-    "GUIDE" # depends on broken package rpanel
-    "GWAF" # depends on broken package nlopt
-    "GWASTools" # broken build
-    "hbsae" # depends on broken package nlopt
-    "heplots" # depends on broken package nlopt
-    "HiDimMaxStable" # broken build
-    "HierO" # Build Is Broken
-    "HilbertVisGUI" # Build Is Broken
-    "HiPLARM" # Build Is Broken
-    "HistDAWass" # depends on broken package nlopt
-    "HLMdiag" # depends on broken package nlopt
-    "homomorpheR" # broken build
-    "hpcwld" # broken build
-    "hwwntest" # broken build
-    "HydeNet" # broken build
-    "hysteresis" # depends on broken package nlopt
-    "IATscores" # depends on broken package nlopt
-    "ibd" # depends on broken package nlopt
-    "iccbeta" # depends on broken package nlopt
-    "iClick" # depends on broken package rugarch
-    "ifaTools" # depends on broken package OpenMx
-    "imager" # broken build
-    "immunoClust" # build is broken
-    "in2extRemes" # depends on broken package nlopt
-    "inferference" # depends on broken package nlopt
-    "influence_ME" # depends on broken package nlopt
-    "inSilicoMerging" # build is broken
-    "INSPEcT" # depends on broken GenomicFeatures
-    "interplot" # depends on broken arm
-    "IsingFit" # depends on broken package nlopt
-    "ITEMAN" # depends on broken package car
-    "iteRates" # broken build
-    "iterpc" # broken build
-    "IUPS" # broken build
-    "IVAS" # depends on broken package nlopt
-    "ivpack" # depends on broken package nlopt
-    "jagsUI" # broken build
-    "JAGUAR" # depends on broken package nlopt
-    "joda" # depends on broken package nlopt
-    "jomo" # build is broken
-    "js" # depends on broken package V8
-    "KoNLP" # broken build
-    "kzft" # broken build
-    "LaplaceDeconv" # depends on broken package orthopolynom
-    "lawn" # depends on broken package V8
-    "ldamatch" # broken build
-    "learnstats" # depends on broken package nlopt
-    "lefse" # build is broken
-    "lessR" # depends on broken package nlopt
-    "lgcp" # depends on broken package rpanel
-    "Libra" # broken build
-    "LinRegInteractive" # depends on broken package rpanel
-    "lira" # broken build
-    "littler" # broken build
-    "lme4" # depends on broken package nlopt
-    "LMERConvenienceFunctions" # depends on broken package nlopt
-    "lmerTest" # depends on broken package nlopt
-    "lmSupport" # depends on broken package nlopt
-    "LOGIT" # depends on broken package caret
-    "longpower" # depends on broken package nlopt
-    "LPTime" # broken build
-    "MAIT" # depends on broken package nlopt
-    "mAPKL" # build is broken
-    "maPredictDSC" # depends on broken package nlopt
-    "mar1s" # broken build
-    "marked" # depends on broken package nlopt
-    "matchingMarkets" # broken build
-    "MatrixRider" # depends on broken package DirichletMultinomial
-    "MaxPro" # depends on broken package nlopt
-    "mbest" # depends on broken package nlopt
-    "MBmca" # depends on broken nloptr
-    "mBvs" # build is broken
-    "meboot" # depends on broken package nlopt
-    "medflex" # depends on broken package car
-    "mediation" # depends on broken package lme4
-    "MEDME" # depends on broken package nlopt
-    "MEMSS" # depends on broken package nlopt
-    "merTools" # depends on broken package arm
-    "meta4diag" # broken build
-    "metagear" # build is broken
-    "metaheur" # depends on broken package preprocomb
-    "metamisc" # broken build
-    "metaplus" # depends on broken package nlopt
-    "metaSEM" # depends on broken package OpenMx
-    "Metatron" # depends on broken package nlopt
-    "miceadds" # depends on broken package nlopt
-    "micEconAids" # depends on broken package nlopt
-    "micEconCES" # depends on broken package nlopt
-    "micEconSNQP" # depends on broken package nlopt
-    "mi" # depends on broken package nlopt
-    "MigClim" # Build Is Broken
-    "migui" # depends on broken package nlopt
-    "minimist" # depends on broken package V8
-    "missMDA" # depends on broken package nlopt
-    "mitoODE" # build is broken
-    "mixAK" # depends on broken package nlopt
-    "MixedPoisson" # broken build
-    "mixlm" # depends on broken package nlopt
-    "MixMAP" # depends on broken package nlopt
-    "mlma" # depends on broken package lme4
-    "mlmRev" # depends on broken package nlopt
-    "MLSeq" # depends on broken package nlopt
-    "mlVAR" # depends on broken package nlopt
-    "MM" # broken build
-    "mongolite" # build is broken
-    "mosaic" # depends on broken package nlopt
-    "mpoly" # broken build
-    "mRMRe" # broken build
-    "msa" # broken build
-    "MSGFgui" # depends on broken package MSGFplus
-    "MSGFplus" # Build Is Broken
-    "MSstats" # depends on broken package nlopt
-    "MultiRR" # depends on broken package nlopt
-    "muma" # depends on broken package nlopt
-    "munsellinterpol" # broken build
-    "mutossGUI" # build is broken
-    "mvinfluence" # depends on broken package nlopt
-    "MXM" # broken build
-    "NanoStringDiff" # broken build
-    "NanoStringQCPro" # build is broken
-    "nCal" # depends on broken package nlopt
-    "ncdfFlow" # build is broken
-    "NCIgraph" # depends on broken package RCytoscape
-    "NHPoisson" # depends on broken package nlopt
-    "nloptr" # depends on broken package nlopt
-    "nlsem" # broken build
-    "nlts" # broken build
-    "nonrandom" # depends on broken package nlopt
-    "NORRRM" # build is broken
-    "npIntFactRep" # depends on broken package nlopt
-    "NSM3" # broken build
-    "omics" # depends on broken package lme4
-    "OmicsMarkeR" # depends on broken package nlopt
-    "OPDOE" # broken build
-    "OpenCL" # build is broken
-    "openCyto" # depends on broken package ncdfFlow
-    "OpenMx" # build is broken
-    "optBiomarker" # depends on broken package rpanel
-    "ora" # depends on broken package ROracle
-    "ordBTL" # depends on broken package nlopt
-    "ordPens" # depends on broken package lme4
-    "orthopolynom" # broken build
-    "OUwie" # depends on broken package nlopt
-    "oz" # broken build
-    "PAA" # broken build
-    "pamm" # depends on broken package nlopt
-    "panelAR" # depends on broken package nlopt
-    "papeR" # depends on broken package nlopt
-    "parboost" # depends on broken package nlopt
-    "parma" # depends on broken package nlopt
-    "partitions" # broken build
-    "PatternClass" # build is broken
-    "PBImisc" # depends on broken package nlopt
-    "pcaBootPlot" # depends on broken FactoMineR
-    "pcaL1" # build is broken
-    "pcnetmeta" # broken build
-    "PDQutils" # broken build
-    "pedigreemm" # depends on broken package nlopt
-    "pequod" # depends on broken package nlopt
-    "pglm" # depends on broken package car
-    "PhenStat" # depends on broken package nlopt
-    "phia" # depends on broken package nlopt
-    "phylocurve" # depends on broken package nlopt
-    "piecewiseSEM" # depends on broken package lme4
-    "plateCore" # depends on broken package ncdfFlow
-    "plfMA" # broken build
-    "plm" # depends on broken package car
-    "plsRbeta" # depends on broken package nlopt
-    "plsRcox" # depends on broken package nlopt
-    "plsRglm" # depends on broken package nlopt
-    "pmm" # depends on broken package nlopt
-    "polynom" # broken build
-    "pomp" # depends on broken package nlopt
-    "predictmeans" # depends on broken package nlopt
-    "preprocomb" # depends on broken package caret
-    "prevalence" # broken build
-    "prLogistic" # depends on broken package nlopt
-    "pRoloc" # depends on broken package nlopt
-    "pRolocGUI" # depends on broken package nlopt
-    "PSAboot" # depends on broken package nlopt
-    "ptw" # depends on broken nloptr
-    "PurBayes" # broken build
-    "pvca" # depends on broken package nlopt
-    "PythonInR" # broken build
-    "QFRM" # broken build
-    "qgraph" # depends on broken package nlopt
-    "qtbase" # build is broken
-    "qtlnet" # depends on broken package nlopt
-    "qtpaint" # depends on broken package qtbase
-    "qtutils" # depends on broken package qtbase
-    "QUALIFIER" # depends on broken package ncdfFlow
-    "quantification" # depends on broken package nlopt
-    "QuartPAC" # broken build
-    "R2jags" # broken build
-    "R2STATS" # depends on broken package nlopt
-    "rain" # broken build
-    "raincpc" # build is broken
-    "rainfreq" # build is broken
-    "RamiGO" # depends on broken package RCytoscape
-    "RareVariantVis" # depends on broken VariantAnnotation
-    "rasclass" # depends on broken package nlopt
-    "rationalfun" # broken build
-    "RBerkeley" # broken build
-    "RbioRXN" # depends on broken package ChemmineR
-    "Rblpapi" # broken build
-    "Rchemcpp" # depends on broken package ChemmineR
-    "rchess" # depends on broken package V8
-    "Rchoice" # depends on broken package car
-    "Rcmdr" # depends on broken package nlopt
-    "RcmdrMisc" # depends on broken package nlopt
-    "RcmdrPlugin_BCA" # depends on broken package nlopt
-    "RcmdrPlugin_coin" # depends on broken package nlopt
-    "RcmdrPlugin_depthTools" # depends on broken package nlopt
-    "RcmdrPlugin_DoE" # depends on broken package nlopt
-    "RcmdrPlugin_doex" # depends on broken package nlopt
-    "RcmdrPlugin_EACSPIR" # depends on broken package nlopt
-    "RcmdrPlugin_EBM" # depends on broken package nlopt
-    "RcmdrPlugin_EcoVirtual" # depends on broken package nlopt
-    "RcmdrPlugin_epack" # depends on broken package nlopt
-    "RcmdrPlugin_Export" # depends on broken package Rcmdr
-    "RcmdrPlugin_EZR" # depends on broken package nlopt
-    "RcmdrPlugin_FactoMineR" # depends on broken package nlopt
-    "RcmdrPlugin_HH" # depends on broken package nlopt
-    "RcmdrPlugin_IPSUR" # depends on broken package nlopt
-    "RcmdrPlugin_KMggplot2" # depends on broken package nlopt
-    "RcmdrPlugin_lfstat" # depends on broken package nlopt
-    "RcmdrPlugin_MA" # depends on broken package nlopt
-    "RcmdrPlugin_mosaic" # depends on broken package nlopt
-    "RcmdrPlugin_MPAStats" # depends on broken package nlopt
-    "RcmdrPlugin_NMBU" # depends on broken package nlopt
-    "RcmdrPlugin_orloca" # depends on broken package nlopt
-    "RcmdrPlugin_plotByGroup" # depends on broken package nlopt
-    "RcmdrPlugin_pointG" # depends on broken package nlopt
-    "RcmdrPlugin_qual" # depends on broken package nlopt
-    "RcmdrPlugin_RMTCJags" # depends on broken package nlopt
-    "RcmdrPlugin_ROC" # depends on broken package nlopt
-    "RcmdrPlugin_sampling" # depends on broken package nlopt
-    "RcmdrPlugin_SCDA" # depends on broken package nlopt
-    "RcmdrPlugin_seeg" # depends on broken package nlopt
-    "RcmdrPlugin_SLC" # depends on broken package nlopt
-    "RcmdrPlugin_SM" # depends on broken package nlopt
-    "RcmdrPlugin_sos" # depends on broken package nlopt
-    "RcmdrPlugin_steepness" # depends on broken package nlopt
-    "RcmdrPlugin_survival" # depends on broken package nlopt
-    "RcmdrPlugin_TeachingDemos" # depends on broken package nlopt
-    "RcmdrPlugin_temis" # depends on broken package nlopt
-    "RcmdrPlugin_UCA" # depends on broken package nlopt
-    "Rcpi" # depends on broken package ChemmineR
-    "Rcplex" # Build Is Broken
-    "RcppAPT" # Build Is Broken
-    "RcppRedis" # build is broken
-    "rcrypt" # broken build
-    "RCytoscape" # Build Is Broken
-    "rdd" # depends on broken package nlopt
-    "rddtools" # depends on broken package AER
-    "rDEA" # build is broken
-    "RDieHarder" # build is broken
-    "REBayes" # depends on broken package Rmosek
-    "referenceIntervals" # depends on broken package nlopt
-    "refund" # depends on broken package nlopt
-    "refund_shiny" # depends on broken package refund
-    "REndo" # depends on broken package AER
-    "repijson" # depends on broken package V8
-    "REST" # depends on broken package nlopt
-    "rgbif" # depends on broken package V8
-    "Rgnuplot" # broken build
-    "rjade" # depends on broken package V8
-    "rJPSGCS" # build is broken
-    "rLindo" # build is broken
-    "RLRsim" # depends on broken package lme4
-    "RMallow" # broken build
-    "rMAT" # build is broken
-    "rmgarch" # depends on broken package nlopt
-    "rminer" # depends on broken package nlopt
-    "Rmosek" # build is broken
-    "RMySQL" # broken build
-    "RNAither" # depends on broken package nlopt
-    "RnavGraph" # build is broken
-    "rnetcarto" # broken build
-    "robustlmm" # depends on broken package nlopt
-    "rockchalk" # depends on broken package nlopt
-    "ROI_plugin_symphony" # depends on broken package Rsymphony
-    "rols" # build is broken
-    "ROracle" # Build Is Broken
-    "rpanel" # build is broken
-    "Rpoppler" # broken build
-    "rpubchem" # depends on broken package nlopt
-    "RQuantLib" # build is broken
-    "rr" # depends on broken package nlopt
-    "RRreg" # depends on broken package lme4
-    "RSAP" # build is broken
-    "rsbml" # build is broken
-    "RSDA" # depends on broken package nlopt
-    "Rsomoclu" # broken build
-    "RStoolbox" # depends on broken package caret
-    "Rsymphony" # build is broken
-    "rTableICC" # broken build
-    "rTANDEM" # build is broken
-    "RTN" # depends on broken package nlopt
-    "rugarch" # depends on broken package nlopt
-    "rUnemploymentData" # broken build
-    "RVAideMemoire" # depends on broken package nlopt
-    "RVFam" # depends on broken package nlopt
-    "RVideoPoker" # depends on broken package rpanel
-    "RWebServices" # broken build
-    "ryouready" # depends on broken package nlopt
-    "sadists" # broken build
-    "sampleSelection" # depends on broken package nlopt
-    "sapFinder" # depends on broken package rTANDEM
-    "sdcMicro" # depends on broken package nlopt
-    "SDD" # depends on broken package rpanel
-    "seeg" # depends on broken package nlopt
-    "Sejong" # broken build
-    "sem" # depends on broken package nlopt
-    "semdiag" # depends on broken package nlopt
-    "semGOF" # depends on broken package nlopt
-    "semPlot" # depends on broken package nlopt
-    "SensMixed" # depends on broken package lme4
-    "SensoMineR" # depends on broken package nlopt
-    "seqCNA" # build is broken
-    "SeqFeatR" # broken build
-    "SeqGrapheR" # Build Is Broken
-    "seqHMM" # depends on broken package nloptr
-    "seqTools" # build is broken
-    "SharpeR" # broken build
-    "shinyTANDEM" # depends on broken package rTANDEM
-    "SIBER" # broken build
-    "simPop" # depends on broken package VIM
-    "simr" # depends on broken package lme4
-    "SJava" # broken build
-    "sjPlot" # depends on broken package nlopt
-    "smacof" # broken build
-    "SNAGEE" # build is broken
-    "snm" # depends on broken package nlopt
-    "sodium" # broken build
-    "soilphysics" # depends on broken package rpanel
-    "sortinghat" # broken build
-    "SoyNAM" # depends on broken package lme4
-    "spacom" # depends on broken package nlopt
-    "SparseLearner" # depends on broken package qgraph
-    "specificity" # depends on broken package nlopt
-    "specmine" # depends on broken package caret
-    "splm" # depends on broken package car
-    "spocc" # depends on broken package V8
-    "ssmrob" # depends on broken package nlopt
-    "StatMethRank" # broken build
-    "stepp" # depends on broken package nlopt
-    "stringgaussnet" # build is broken
-    "Surrogate" # depends on broken package nlopt
-    "svglite" # depends on broken package gdtools
-    "sybilSBML" # build is broken
-    "systemfit" # depends on broken package nlopt
-    "TcGSA" # depends on broken package nlopt
-    "TDMR" # depends on broken package nlopt
-    "TFBSTools" # depends on broken package DirichletMultinomial
-    "tigerstats" # depends on broken package nlopt
-    "TLBC" # depends on broken package caret
-    "tmle" # broken build
-    "tnam" # depends on broken package lme4
-    "tolBasis" # depends on broken package polynom
-    "translateSPSS2R" # depends on broken car
-    "TriMatch" # depends on broken package nlopt
-    "TSMySQL" # broken build
-    "tsoutliers" # broken build
-    "UBCRM" # broken build
-    "umx" # depends on broken package OpenMx
-    "uniftest" # broken build
-    "untb" # broken build
-    "userfriendlyscience" # depends on broken package nlopt
-    "V8" # build is broken
-    "varComp" # depends on broken package lme4
-    "varian" # build is broken
-    "variancePartition" # depends on broken package lme4
-    "VBmix" # broken build
-    "VIM" # depends on broken package nlopt
-    "VIMGUI" # depends on broken package nlopt
-    "vows" # depends on broken package nlopt
-    "webp" # build is broken
-    "wfe" # depends on broken package nlopt
-    "wordbankr" # depends on broken package RMySQL
-    "xergm" # depends on broken package nlopt
-    "xps" # build is broken
-    "ZeligChoice" # depends on broken package AER
-    "Zelig" # depends on broken package AER
-    "zetadiv" # depends on broken package nlopt
-    "zoib" # broken build
+    "acs"                             # build is broken
+    "AffyTiling"                      # build is broken
+    "agRee"                           # depends on broken package BRugs-0.8-6
+    "aLFQ"                            # depends on broken package bio3d-2.3-1
+    "animation"                       # build is broken
+    "anim_plots"                      # depends on broken package animation-2.4
+    "annmap"                          # depends on broken package RMySQL-0.10.9
+    "apaStyle"                        # depends on broken package gdtools-0.1.3
+    "apaTables"                       # depends on broken package OpenMx-2.7.4
+    "ArrayExpressHTS"                 # build is broken
+    "arrayQualityMetrics"             # build is broken
+    "auRoc"                           # depends on broken package OpenMx-2.7.4
+    "BatchQC"                         # build is broken
+    "bayou"                           # depends on broken package animation-2.4
+    "bedr"                            # build is broken
+    "BETS"                            # build is broken
+    "BiGGR"                           # depends on broken package rsbml-2.30.0
+    "bio3d"                           # build is broken
+    "bioassayR"                       # depends on broken package ChemmineR-2.24.2
+    "biomformat"                      # depends on broken package r-rhdf5-2.16.0
+    "biotools"                        # depends on broken package rpanel-1.1-3
+    "birte"                           # build is broken
+    "BiSEp"                           # build is broken
+    "BLCOP"                           # depends on broken package Rsymphony-0.1-26
+    "BMhyd"                           # depends on broken package animation-2.4
+    "BNSP"                            # build is broken
+    "BPEC"                            # depends on broken package animation-2.4
+    "BrailleR"                        # depends on broken package gridGraphics-0.1-5
+    "brainGraph"                      # build is broken
+    "brranching"                      # depends on broken package animation-2.4
+    "brr"                             # build is broken
+    "BRugs"                           # build is broken
+    "CADStat"                         # build is broken
+    "CampaR1"                         # depends on broken package r-bio3d-2.3-1
+    "canceR"                          # build is broken
+    "CardinalWorkflows"               # build is broken
+    "CARrampsOcl"                     # depends on broken package OpenCL-0.1-3
+    "categoryCompare"                 # depends on broken package RCytoscape-1.21.1
+    "Causata"                         # depends on broken package RMySQL-0.10.9
+    "cdcfluview"                      # depends on broken package V8-1.2
+    "ChemmineDrugs"                   # depends on broken package ChemmineR-2.24.2
+    "ChemmineR"                       # build is broken
+    "chinese_misc"                    # build is broken
+    "ChIPQC"                          # depends on broken package r-DiffBind-2.0.9
+    "ChIPXpress"                      # build is broken
+    "ChIPXpressData"                  # build is broken
+    "choroplethr"                     # depends on broken package acs-2.0
+    "CHRONOS"                         # build is broken
+    "cleanEHR"                        # build is broken
+    "clickR"                          # depends on broken package gdtools-0.1.3
+    "clpAPI"                          # build is broken
+    "CNEr"                            # build is broken
+    "colormap"                        # depends on broken package V8-1.2
+    "colorscience"                    # build is broken
+    "compendiumdb"                    # depends on broken package RMySQL-0.10.9
+    "CONFESS"                         # depends on broken package r-flowCore-1.38.2
+    "CONS"                            # build is broken
+    "convevol"                        # depends on broken package animation-2.4
+    "CountClust"                      # build is broken
+    "CountsEPPM"                      # build is broken
+    "COUSCOus"                        # depends on broken package r-bio3d-2.3-1
+    "covr"                            # build is broken
+    "cplexAPI"                        # build is broken
+    "Crossover"                       # build is broken
+    "CrypticIBDcheck"                 # build is broken
+    "csaw"                            # build is broken
+    "ctsem"                           # depends on broken package OpenMx-2.7.4
+    "cudaBayesreg"                    # build is broken
+    "curlconverter"                   # depends on broken package V8-1.2
+    "cytofkit"                        # depends on broken package flowCore-1.38.2
+    "daff"                            # depends on broken package V8-1.2
+    "dagbag"                          # build is broken
+    "dagitty"                         # depends on broken package V8-1.2
+    "dagLogo"                         # depends on broken package MotIV-1.28.0
+    "DAISIE"                          # depends on broken package animation-2.4
+    "dataMaid"                        # build is broken
+    "dataone"                         # build is broken
+    "datapack"                        # build is broken
+    "dbConnect"                       # depends on broken package RMySQL-0.10.9
+    "DBKGrad"                         # depends on broken package rpanel-1.1-3
+    "DCM"                             # build is broken
+    "DDD"                             # depends on broken package animation-2.4
+    "deBInfer"                        # depends on broken package PBSddesolve-1.12.2
+    "DecisionCurve"                   # build is broken
+    "deepSNV"                         # build is broken
+    "DEGraph"                         # depends on broken package RCytoscape-1.21.1
+    "DEploid"                         # build is broken
+    "DiagrammeRsvg"                   # depends on broken package V8-1.2
+    "DiffBind"                        # build is broken
+    "diffHic"                         # depends on broken package r-csaw-1.6.1
+    "DirichletMultinomial"            # build is broken
+    "diveRsity"                       # build is broken
+    "DmelSGI"                         # depends on broken package r-rhdf5-2.16.0
+    "DNAprofiles"                     # build is broken
+    "docxtools"                       # build is broken
+    "DOQTL"                           # depends on broken package r-rhdf5-2.16.0
+    "DOT"                             # depends on broken package V8-1.2
+    "dynr"                            # build is broken
+    "ecospat"                         # depends on broken package MigClim-1.6
+    "EGAD"                            # depends on broken package arrayQualityMetrics-3.28.2
+    "eiR"                             # depends on broken package ChemmineR-2.24.2
+    "emg"                             # build is broken
+    "envlpaster"                      # build is broken
+    "erpR"                            # depends on broken package rpanel-1.1-3
+    "euroMix"                         # build is broken
+    "evobiR"                          # depends on broken package animation-2.4
+    "exifr"                           # build is broken
+    "exprso"                          # build is broken
+    "fastR"                           # build is broken
+    "fdq"                             # depends on broken package gdtools-0.1.3
+    "Fgmutils"                        # depends on broken package gdtools-0.1.3
+    "flan"                            # build is broken
+    "flowAI"                          # depends on broken package r-flowCore-1.38.2
+    "flowBeads"                       # depends on broken package r-flowCore-1.38.2
+    "flowBin"                         # depends on broken package r-flowCore-1.38.2
+    "flowCHIC"                        # depends on broken package r-flowCore-1.38.2
+    "flowClean"                       # depends on broken package r-flowCore-1.38.2
+    "flowClust"                       # depends on broken package r-flowCore-1.38.2
+    "flowCore"                        # build is broken
+    "flowDensity"                     # depends on broken package flowCore-1.38.2
+    "flowDiv"                         # depends on broken package r-flowCore-1.38.2
+    "flowFit"                         # depends on broken package r-flowCore-1.38.2
+    "flowFitExampleData"              # depends on broken package r-flowCore-1.38.2
+    "flowFP"                          # depends on broken package r-flowCore-1.38.2
+    "flowMatch"                       # depends on broken package r-flowCore-1.38.2
+    "flowMeans"                       # depends on broken package r-flowCore-1.38.2
+    "flowMerge"                       # depends on broken package r-flowCore-1.38.2
+    "flowPeaks"                       # build is broken
+    "flowQB"                          # depends on broken package r-flowCore-1.38.2
+    "flowQ"                           # depends on broken package flowCore-1.38.2
+    "FlowSOM"                         # depends on broken package r-flowCore-1.38.2
+    "flowStats"                       # depends on broken package r-flowCore-1.38.2
+    "flowTrans"                       # depends on broken package r-flowCore-1.38.2
+    "flowType"                        # depends on broken package r-flowCore-1.38.2
+    "flowUtils"                       # depends on broken package r-flowCore-1.38.2
+    "flowViz"                         # depends on broken package r-flowCore-1.38.2
+    "flowVS"                          # depends on broken package r-flowCore-1.38.2
+    "flowWorkspace"                   # depends on broken package r-flowCore-1.38.2
+    "fmcsR"                           # depends on broken package ChemmineR-2.24.2
+    "ForestTools"                     # depends on broken package imager-0.31
+    "fPortfolio"                      # depends on broken package Rsymphony-0.1-26
+    "fracprolif"                      # build is broken
+    "funModeling"                     # build is broken
+    "gahgu133acdf"                    # build is broken
+    "gahgu133bcdf"                    # build is broken
+    "gahgu133plus2cdf"                # build is broken
+    "gahgu95av2cdf"                   # build is broken
+    "gahgu95bcdf"                     # build is broken
+    "gahgu95ccdf"                     # build is broken
+    "gahgu95dcdf"                     # build is broken
+    "gahgu95ecdf"                     # build is broken
+    "gamlss_demo"                     # depends on broken package rpanel-1.1-3
+    "gazepath"                        # build is broken
+    "gdtools"                         # build is broken
+    "GENE_E"                          # depends on broken package r-rhdf5-2.16.0
+    "geojson"                         # depends on broken package r-protolite-1.5
+    "geojsonio"                       # depends on broken package V8-1.2
+    "geojsonlint"                     # depends on broken package V8-1.2
+    "gfcanalysis"                     # depends on broken package animation-2.4
+    "gfer"                            # depends on broken package V8-1.2
+    "ggcyto"                          # depends on broken package r-flowCore-1.38.2
+    "ggghost"                         # depends on broken package animation-2.4
+    "ggiraph"                         # depends on broken package gdtools-0.1.3
+    "ggiraphExtra"                    # depends on broken package gdtools-0.1.3
+    "ggseas"                          # build is broken
+    "gmatrix"                         # depends on broken package cudatoolkit-8.0.61
+    "gMCP"                            # build is broken
+    "gmDatabase"                      # depends on broken package RMySQL-0.10.9
+    "gmum_r"                          # build is broken
+    "goldi"                           # build is broken
+    "googleformr"                     # build is broken
+    "gpg"                             # build is broken
+    "gpuR"                            # build is broken
+    "gputools"                        # depends on broken package cudatoolkit-8.0.61
+    "GraphPAC"                        # build is broken
+    "gridGraphics"                    # build is broken
+    "GSCA"                            # depends on broken package r-rhdf5-2.16.0
+    "GUIDE"                           # depends on broken package rpanel-1.1-3
+    "gunsales"                        # build is broken
+    "h2o"                             # build is broken
+    "h5vc"                            # depends on broken package r-rhdf5-2.16.0
+    "harrietr"                        # build is broken
+    "HDF5Array"                       # depends on broken package r-rhdf5-2.16.0
+    "healthyFlowData"                 # depends on broken package r-flowCore-1.38.2
+    "HierO"                           # build is broken
+    "HilbertVisGUI"                   # build is broken
+    "HiPLARM"                         # build is broken
+    "hisse"                           # depends on broken package animation-2.4
+    "homomorpheR"                     # depends on broken package sodium-0.4
+    "HTSSIP"                          # depends on broken package r-rhdf5-2.16.0
+    "idm"                             # depends on broken package animation-2.4
+    "ifaTools"                        # depends on broken package OpenMx-2.7.4
+    "IHW"                             # depends on broken package r-lpsymphony-1.0.2
+    "IHWpaper"                        # depends on broken package r-lpsymphony-1.0.2
+    "IlluminaHumanMethylation450k_db" # build is broken
+    "imager"                          # build is broken
+    "immunoClust"                     # depends on broken package r-flowCore-1.38.2
+    "inSilicoMerging"                 # build is broken
+    "intansv"                         # build is broken
+    "interactiveDisplay"              # build is broken
+    "ionicons"                        # depends on broken package rsvg-1.0
+    "IONiseR"                         # depends on broken package r-rhdf5-2.16.0
+    "ITGM"                            # depends on broken package gdtools-0.1.3
+    "jpmesh"                          # depends on broken package V8-1.2
+    "js"                              # depends on broken package V8-1.2
+    "jsonld"                          # depends on broken package V8-1.2
+    "jsonvalidate"                    # depends on broken package V8-1.2
+    "KoNLP"                           # build is broken
+    "largeList"                       # build is broken
+    "largeVis"                        # build is broken
+    "lawn"                            # depends on broken package V8-1.2
+    "LCMCR"                           # build is broken
+    "lefse"                           # build is broken
+    "lfe"                             # build is broken
+    "lgcp"                            # depends on broken package rpanel-1.1-3
+    "Libra"                           # build is broken
+    "libsoc"                          # build is broken
+    "link2GI"                         # depends on broken package r-sf-0.3-4
+    "LinRegInteractive"               # depends on broken package rpanel-1.1-3
+    "liquidSVM"                       # build is broken
+    "littler"                         # build is broken
+    "LowMACA"                         # depends on broken package MotIV-1.28.0
+    "lpsymphony"                      # build is broken
+    "lvnet"                           # depends on broken package OpenMx-2.7.4
+    "MafDb_1Kgenomes_phase3_hs37d5"   # build is broken
+    "mafs"                            # build is broken
+    "magick"                          # build is broken
+    "maGUI"                           # build is broken
+    "mapr"                            # depends on broken package V8-1.2
+    "mar1s"                           # build is broken
+    "MatrixRider"                     # depends on broken package CNEr-1.8.3
+    "MBESS"                           # depends on broken package OpenMx-2.7.4
+    "mBvs"                            # build is broken
+    "mcaGUI"                          # build is broken
+    "mdsr"                            # depends on broken package RMySQL-0.10.9
+    "Mediana"                         # depends on broken package gdtools-0.1.3
+    "melviewr"                        # build is broken
+    "MeSH_Hsa_eg_db"                  # build is broken
+    "MeSH_Mmu_eg_db"                  # build is broken
+    "meshr"                           # depends on broken package r-MeSH.Hsa.eg.db-1.6.0
+    "Metab"                           # build is broken
+    "metagear"                        # build is broken
+    "MetaIntegrator"                  # depends on broken package RMySQL-0.10.9
+    "metaSEM"                         # depends on broken package OpenMx-2.7.4
+    "MigClim"                         # build is broken
+    "minimist"                        # depends on broken package V8-1.2
+    "miscF"                           # depends on broken package BRugs-0.8-6
+    "mixlink"                         # build is broken
+    "MLSeq"                           # build is broken
+    "MMDiff"                          # depends on broken package r-DiffBind-2.0.9
+    "mmnet"                           # build is broken
+    "MonetDBLite"                     # build is broken
+    "mongolite"                       # build is broken
+    "monogeneaGM"                     # depends on broken package animation-2.4
+    "MonoPhy"                         # depends on broken package animation-2.4
+    "motifbreakR"                     # depends on broken package MotIV-1.28.0
+    "motifStack"                      # depends on broken package MotIV-1.28.0
+    "MotIV"                           # build is broken
+    "mptools"                         # depends on broken package animation-2.4
+    "mrMLM"                           # build is broken
+    "mRMRe"                           # build is broken
+    "mscstexta4r"                     # build is broken
+    "mscsweblm4r"                     # build is broken
+    "MSeasyTkGUI"                     # build is broken
+    "MSGFgui"                         # depends on broken package MSGFplus-1.6.2
+    "MSGFplus"                        # build is broken
+    "multiDimBio"                     # depends on broken package gridGraphics-0.1-5
+    "multipanelfigure"                # depends on broken package gridGraphics-0.1-5
+    "munsellinterpol"                 # build is broken
+    "mutossGUI"                       # build is broken
+    "mvMORPH"                         # depends on broken package animation-2.4
+    "mvst"                            # build is broken
+    "ncdfFlow"                        # depends on broken package r-flowCore-1.38.2
+    "NCIgraph"                        # depends on broken package RCytoscape-1.21.1
+    "ndjson"                          # build is broken
+    "ndtv"                            # depends on broken package animation-2.4
+    "NetRep"                          # depends on broken package r-RhpcBLASctl-0.15-148
+    "nlts"                            # build is broken
+    "NORRRM"                          # build is broken
+    "odbc"                            # build is broken
+    "officer"                         # depends on broken package gdtools-0.1.3
+    "OpenCL"                          # build is broken
+    "opencpu"                         # depends on broken package r-protolite-1.5
+    "openCyto"                        # depends on broken package r-flowCore-1.38.2
+    "OpenMx"                          # build is broken
+    "optbdmaeAT"                      # build is broken
+    "optBiomarker"                    # depends on broken package rpanel-1.1-3
+    "ora"                             # depends on broken package ROracle-1.3-1
+    "OUwie"                           # depends on broken package animation-2.4
+    "PAA"                             # build is broken
+    "paleotree"                       # depends on broken package animation-2.4
+    "PathSelectMP"                    # build is broken
+    "PatternClass"                    # build is broken
+    "PBD"                             # depends on broken package animation-2.4
+    "PBSddesolve"                     # build is broken
+    "PBSmapping"                      # build is broken
+    "pcadapt"                         # depends on broken package vcfR-1.4.0
+    "pcaL1"                           # build is broken
+    "pcaPA"                           # build is broken
+    "pcrsim"                          # build is broken
+    "pdfsearch"                       # build is broken
+    "pdftools"                        # build is broken
+    "pd_genomewidesnp_6"              # build is broken
+    "permGPU"                         # build is broken
+    "PGA"                             # build is broken
+    "PGPC"                            # depends on broken package ChemmineR-2.24.2
+    "ph2bye"                          # depends on broken package animation-2.4
+    "PhyInformR"                      # depends on broken package animation-2.4
+    "phylocurve"                      # depends on broken package animation-2.4
+    "phyloseq"                        # depends on broken package r-rhdf5-2.16.0
+    "PhySortR"                        # depends on broken package animation-2.4
+    "phytools"                        # depends on broken package animation-2.4
+    "PICS"                            # build is broken
+    "PING"                            # depends on broken package PICS-2.16.0
+    "plateCore"                       # depends on broken package r-flowCore-1.38.2
+    "plfMA"                           # build is broken
+    "podkat"                          # build is broken
+    "PottsUtils"                      # depends on broken package BRugs-0.8-6
+    "powell"                          # build is broken
+    "pqsfinder"                       # depends on broken package r-flowCore-1.38.2
+    "prebs"                           # depends on broken package r-rhdf5-2.16.0
+    "PREDAsampledata"                 # depends on broken package gahgu133plus2cdf-2.2.1
+    "predictionInterval"              # depends on broken package OpenMx-2.7.4
+    "pRoloc"                          # build is broken
+    "pRolocGUI"                       # build is broken
+    "proteoQC"                        # build is broken
+    "protolite"                       # build is broken
+    "prototest"                       # build is broken
+    "PSAboot"                         # build is broken
+    "psbcGroup"                       # build is broken
+    "PythonInR"                       # build is broken
+    "qcmetrics"                       # build is broken
+    "QFRM"                            # build is broken
+    "qrqc"                            # build is broken
+    "qtbase"                          # build is broken
+    "qtpaint"                         # build is broken
+    "qtutils"                         # build is broken
+    "QUALIFIER"                       # depends on broken package r-flowCore-1.38.2
+    "QuartPAC"                        # build is broken
+    "QuasR"                           # build is broken
+    "QUBIC"                           # build is broken
+    "QVM"                             # build is broken
+    "raincpc"                         # build is broken
+    "rainfreq"                        # build is broken
+    "RAM"                             # depends on broken package animation-2.4
+    "RamiGO"                          # depends on broken package RCytoscape-1.21.1
+    "randomcoloR"                     # depends on broken package V8-1.2
+    "randstr"                         # build is broken
+    "RapidPolygonLookup"              # depends on broken package PBSmapping-2.69.76
+    "RAppArmor"                       # build is broken
+    "raptr"                           # depends on broken package PBSmapping-2.69.76
+    "RBerkeley"                       # build is broken
+    "RbioRXN"                         # depends on broken package ChemmineR-2.24.2
+    "Rblpapi"                         # build is broken
+    "Rchemcpp"                        # depends on broken package ChemmineR-2.24.2
+    "rchess"                          # depends on broken package V8-1.2
+    "RchyOptimyx"                     # depends on broken package r-flowCore-1.38.2
+    "RcmdrPlugin_FuzzyClust"          # build is broken
+    "RcmdrPlugin_PcaRobust"           # build is broken
+    "Rcpi"                            # depends on broken package ChemmineR-2.24.2
+    "Rcplex"                          # build is broken
+    "RcppAPT"                         # build is broken
+    "RcppGetconf"                     # build is broken
+    "RcppOctave"                      # build is broken
+    "RcppRedis"                       # build is broken
+    "rcqp"                            # build is broken
+    "rcrypt"                          # build is broken
+    "RCytoscape"                      # build is broken
+    "rDEA"                            # build is broken
+    "RDieHarder"                      # build is broken
+    "REBayes"                         # depends on broken package Rmosek-1.2.5.1
+    "recluster"                       # depends on broken package animation-2.4
+    "redland"                         # build is broken
+    "remoter"                         # build is broken
+    "repijson"                        # depends on broken package V8-1.2
+    "replicationInterval"             # depends on broken package OpenMx-2.7.4
+    "ReporteRs"                       # depends on broken package gdtools-0.1.3
+    "ReQON"                           # depends on broken package seqbias-1.20.0
+    "RforProteomics"                  # depends on broken package interactiveDisplay-1.10.2
+    "rgbif"                           # depends on broken package V8-1.2
+    "Rgnuplot"                        # build is broken
+    "rgp"                             # build is broken
+    "rgpui"                           # depends on broken package rgp-0.4-1
+    "rhdf5"                           # build is broken
+    "RhpcBLASctl"                     # build is broken
+    "ridge"                           # build is broken
+    "rjade"                           # depends on broken package V8-1.2
+    "rJPSGCS"                         # build is broken
+    "RKEEL"                           # depends on broken package RKEELjars-1.0.15
+    "RKEELjars"                       # build is broken
+    "Rknots"                          # depends on broken package r-bio3d-2.3-1
+    "rLindo"                          # build is broken
+    "rlo"                             # depends on broken package PythonInR-0.1-3
+    "RMallow"                         # build is broken
+    "rmapshaper"                      # depends on broken package V8-1.2
+    "rMAT"                            # build is broken
+    "Rmosek"                          # build is broken
+    "RMySQL"                          # build is broken
+    "RnavGraph"                       # build is broken
+    "rnetcarto"                       # build is broken
+    "ROI_plugin_cplex"                # depends on broken package Rcplex-0.3-3
+    "ROI_plugin_symphony"             # depends on broken package Rsymphony-0.1-26
+    "Rolexa"                          # build is broken
+    "ROracle"                         # build is broken
+    "RPA"                             # depends on broken package r-rhdf5-2.16.0
+    "RPANDA"                          # depends on broken package animation-2.4
+    "rpanel"                          # build is broken
+    "rpg"                             # build is broken
+    "Rphylopars"                      # depends on broken package animation-2.4
+    "Rpoppler"                        # build is broken
+    "RQuantLib"                       # build is broken
+    "RSAP"                            # build is broken
+    "rsbml"                           # build is broken
+    "RSCABS"                          # build is broken
+    "rscala"                          # build is broken
+    "Rsomoclu"                        # build is broken
+    "rsparkling"                      # depends on broken package h2o-3.10.3.6
+    "rsvg"                            # build is broken
+    "Rsymphony"                       # build is broken
+    "rtable"                          # depends on broken package gdtools-0.1.3
+    "rTANDEM"                         # build is broken
+    "Rtextrankr"                      # build is broken
+    "rUnemploymentData"               # depends on broken package acs-2.0
+    "rvg"                             # depends on broken package gdtools-0.1.3
+    "RVideoPoker"                     # depends on broken package rpanel-1.1-3
+    "rzmq"                            # build is broken
+    "s2"                              # build is broken
+    "Sabermetrics"                    # build is broken
+    "sapFinder"                       # build is broken
+    "sbrl"                            # build is broken
+    "scater"                          # depends on broken package r-rhdf5-2.16.0
+    "scran"                           # depends on broken package r-rhdf5-2.16.0
+    "SDD"                             # depends on broken package rpanel-1.1-3
+    "seasonal"                        # build is broken
+    "seasonalview"                    # build is broken
+    "Sejong"                          # build is broken
+    "SemiCompRisks"                   # build is broken
+    "semtree"                         # depends on broken package OpenMx-2.7.4
+    "seqbias"                         # build is broken
+    "SeqGrapheR"                      # build is broken
+    "seqTools"                        # build is broken
+    "sf"                              # build is broken
+    "shazam"                          # build is broken
+    "shinyTANDEM"                     # build is broken
+    "SICtools"                        # build is broken
+    "SigTree"                         # depends on broken package r-rhdf5-2.16.0
+    "SimInf"                          # build is broken
+    "simsalapar"                      # build is broken
+    "smapr"                           # depends on broken package r-rhdf5-2.16.0
+    "SnakeCharmR"                     # build is broken
+    "sodium"                          # build is broken
+    "soilphysics"                     # depends on broken package rpanel-1.1-3
+    "sortinghat"                      # build is broken
+    "spade"                           # depends on broken package r-flowCore-1.38.2
+    "spdynmod"                        # depends on broken package animation-2.4
+    "spocc"                           # depends on broken package V8-1.2
+    "spongecake"                      # build is broken
+    "srd"                             # depends on broken package animation-2.4
+    "SSDM"                            # build is broken
+    "stagePop"                        # depends on broken package PBSddesolve-1.12.2
+    "Starr"                           # build is broken
+    "stream"                          # depends on broken package animation-2.4
+    "streamMOA"                       # depends on broken package animation-2.4
+    "stremr"                          # build is broken
+    "subspaceMOA"                     # depends on broken package animation-2.4
+    "svglite"                         # depends on broken package gdtools-0.1.3
+    "sybilSBML"                       # build is broken
+    "synthACS"                        # depends on broken package acs-2.0
+    "tcpl"                            # depends on broken package RMySQL-0.10.9
+    "TDA"                             # build is broken
+    "TED"                             # depends on broken package animation-2.4
+    "tesseract"                       # build is broken
+    "textreadr"                       # build is broken
+    "textTinyR"                       # build is broken
+    "TFBSTools"                       # depends on broken package CNEr-1.8.3
+    "TKF"                             # depends on broken package animation-2.4
+    "tmap"                            # depends on broken package V8-1.2
+    "tmaptools"                       # depends on broken package V8-1.2
+    "tofsims"                         # build is broken
+    "toxboot"                         # depends on broken package RMySQL-0.10.9
+    "TransView"                       # build is broken
+    "treeplyr"                        # depends on broken package animation-2.4
+    "TSMySQL"                         # depends on broken package RMySQL-0.10.9
+    "uaparserjs"                      # depends on broken package V8-1.2
+    "UBCRM"                           # build is broken
+    "uHMM"                            # build is broken
+    "umx"                             # depends on broken package OpenMx-2.7.4
+    "userfriendlyscience"             # depends on broken package OpenMx-2.7.4
+    "V8"                              # build is broken
+    "VBmix"                           # build is broken
+    "vcfR"                            # build is broken
+    "vdiffr"                          # depends on broken package gdtools-0.1.3
+    "vmsbase"                         # depends on broken package PBSmapping-2.69.76
+    "wallace"                         # depends on broken package V8-1.2
+    "wand"                            # build is broken
+    "webp"                            # build is broken
+    "wordbankr"                       # depends on broken package RMySQL-0.10.9
+    "x13binary"                       # build is broken
+    "x_ent"                           # depends on broken package r-protolite-1.5
+    "xps"                             # build is broken
+    "xslt"                            # build is broken
+    "zoon"                            # build is broken
   ];
 
   otherOverrides = old: new: {
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 9aec419c0f8d6..8dc3a50abec5a 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -10,7 +10,6 @@ mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/pa
                   , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/")
                   , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/experiment/src/contrib/")
                   , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/")
-                  , irkernel="http://irkernel.github.io/src/contrib/"
                   )
 
 mirrorType <- commandArgs(trailingOnly=TRUE)[1]
diff --git a/pkgs/development/r-modules/irkernel-packages.nix b/pkgs/development/r-modules/irkernel-packages.nix
deleted file mode 100644
index cef0af62e4f64..0000000000000
--- a/pkgs/development/r-modules/irkernel-packages.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is generated from generate-r-packages.R. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# Rscript generate-r-packages.R irkernel >new && mv new irkernel-packages.nix
-
-{ self, derive }:
-let derive2 = derive {};
-in with self; {
-  IRdisplay = derive2 { name="IRdisplay"; version="0.3"; sha256="0aa7v3x6s9jd5kzwfh4659gm3dqkmadbk40a0jdpm856mf9r5w6s"; depends=[base64enc repr]; };
-  IRkernel = derive2 { name="IRkernel"; version="0.5"; sha256="0v9f01j1ysadq2f8d4mpbimrspj7051cncl0rd1n97rb8wlb9rrf"; depends=[digest evaluate IRdisplay jsonlite repr rzmq uuid]; };
-  repr = derive2 { name="repr"; version="0.4"; sha256="1mhvslkxr5nkxiijapzm29jpmjnhhjs1v9s84xvhqpxlcav8dsn6"; depends=[]; };
-  rzmq = derive2 { name="rzmq"; version="0.7.7"; sha256="0cds9wsbfb7lhgfjjfisv1i3905ny7x3i2wbb1rcih03ba4a1ij3"; depends=[]; };
-}
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 20dc23979f5a5..02fe9f50558e7 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,7 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
 , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc
 }@args:
@@ -89,7 +89,7 @@ in
   msgpack = attrs: {
     buildInputs = [ libmsgpack ];
   };
-  
+
   mysql = attrs: {
     buildInputs = [ mysql.lib zlib openssl ];
   };
@@ -218,7 +218,7 @@ in
         --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
     '';
   };
-  
+
   uuid4r = attrs: {
     buildInputs = [ which libossp_uuid ];
   };
@@ -226,12 +226,12 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    buildInputs = [ xapian pkgconfig zlib ];
+    buildInputs = [ xapian_1_2_22 pkgconfig zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
     '';
     preInstall = ''
-      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
+      export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
     '';
   };
 
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 427ff7058405c..b9b8dc7192700 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -4,10 +4,10 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.3";
+  version = "0.9.4";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62";
+    sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";
   };
 
   buildInputs = with pythonPackages; [
@@ -41,6 +41,7 @@ pythonPackages.buildPythonApplication (rec {
     dateutil
     txaio
     autobahn
+    pyjwt
 
     # tls
     pyopenssl
@@ -70,7 +71,6 @@ pythonPackages.buildPythonApplication (rec {
     homepage = http://buildbot.net/;
     description = "Continuous integration system that automates the build/test cycle";
     maintainers = with maintainers; [ nand0p ryansydnor ];
-    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 })
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index f2fdd1535bfd0..b22759af8fecc 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j";
+      sha256 = "09a3yvs5hhf8syrkyydznmymgg86dpvgrwy9rb3bryq00wpjb3wn";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -17,7 +17,6 @@ let
       homepage = http://buildbot.net/;
       description = "Buildbot Packaging Helper";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -26,7 +25,7 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.3";
+    version = "0.9.4";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
@@ -34,14 +33,13 @@ in {
     src = pythonPackages.fetchPypi {
       inherit pname version format;
       python = "py2";
-      sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7";
+      sha256 = "08m4h2pf6hgi8igh2j0qzfq49izc2z0qqj6ddxk0di5l306jx4im";
     };
 
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot UI";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -49,11 +47,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk";
+      sha256 = "1w2vv8iyzl7ak4161avp9n6mhh08adav2fl82bbm17a3064apl8n";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -62,7 +60,6 @@ in {
       homepage = http://buildbot.net/;
       description = "Buildbot Console View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -70,11 +67,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g";
+      sha256 = "17xn6vrr0k2xabw6hr9sdyy0ry3llyjfmc79qrpgp5bsly2qv3jf";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -83,7 +80,6 @@ in {
       homepage = http://buildbot.net/;
       description = "Buildbot Waterfall View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 861ed647c5df0..3023555d22c1f 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp";
+    sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
@@ -21,7 +21,6 @@ pythonPackages.buildPythonApplication (rec {
     homepage = http://buildbot.net/;
     description = "Buildbot Worker Daemon";
     maintainers = with maintainers; [ nand0p ryansydnor ];
-    platforms = platforms.all;
     license = licenses.gpl2;
   };
 })
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
new file mode 100644
index 0000000000000..1d6ac8493f19d
--- /dev/null
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -0,0 +1,25 @@
+{ fetchFromGitHub, rustPlatform, stdenv }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "clog-cli-${version}";
+  version = "0.9.2";
+
+  src = fetchFromGitHub {
+    owner = "clog-tool";
+    repo = "clog-cli";
+    rev = "${version}";
+    sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv";
+  };
+
+  depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x";
+
+  meta = {
+    description = "Generate changelogs from local git metadata";
+    homepage = https://github.com/clog-tool/clog-cli;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.nthorne];
+  };
+}
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 0276b3f960133..fc8488ee104ec 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "delve-${version}";
-  version = "0.11.0-alpha";
+  version = "0.12.1";
 
   goPackagePath = "github.com/derekparker/delve";
-  excludedPackages = "_fixtures";
+  excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
 
   src = fetchFromGitHub {
     owner = "derekparker";
     repo = "delve";
     rev = "v${version}";
-    sha256 = "10axxlvqpa6gx6pz2djp8bb08b83rdj1pavay0nqdd2crsb6rvgd";
+    sha256 = "0vkyx9sd66yrqz9sa4pysmpjv6gdgpfk1icrbjk93h2ry15ma8d6";
   };
 
   meta = {
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index f21808d28f7cd..4040eda141fd6 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,36 +1,37 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name    = "coccinelle-${version}";
-  version = "1.0.0-rc23";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "1qrd4kr3wc0hm4l60fwn19iwzwqcjsx85mm3k4gm3cdhljjma82p";
+    sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
   };
 
   buildInputs = with ocamlPackages; [
-    ocaml findlib menhir ocamlPackages.camlp4
+    ocaml findlib menhir
     ocaml_pcre pycaml
     python ncurses pkgconfig
-    makeWrapper
   ];
 
-  # TODO: is the generation of this wrapper truly/still needed?
-  # I don't have a non-NixOS system, so I cannot verify this, but shouldn't
-  # libpython know where to find its modules? (the path is for example in
-  # its Sys-module).
-  postInstall =
-    # On non-NixOS systems, Coccinelle would end up looking up Python modules
-    # in the wrong directory.
-    '' for p in "$out/bin/"*
-       do
-         wrapProgram "$p" \
-           --prefix "PYTHONPATH" ":" "${python}/lib/python${python.majorVersion}"
-       done
-    '';
+  doCheck = !stdenv.isDarwin;
 
-  configureFlags = "--enable-release";
+  # The build system builds two versions of spgen:
+  # 'spgen' with ocamlc -custom (bytecode specially linked)
+  # and 'spgen.opt' using ocamlopt.
+  # I'm not sure of the intentions here, but the way
+  # the 'spgen' binary is produced results in an
+  # invalid/incorrect interpreter path (/lib/ld-linux*).
+  # We could patch it, but without knowing why it's
+  # finding the wrong path it seems safer to use
+  # the .opt version that is built correctly.
+  # All that said, our fix here is simple: remove 'spgen'.
+  # The bin/spgen entrypoint is really a bash script
+  # and will use spgen.opt if 'spgen' doesn't exist.
+  postInstall = ''
+    rm $out/lib/coccinelle/spgen/spgen
+  '';
 
   meta = {
     description = "Program to apply semantic patches to C code";
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index 18f3fe375cbc6..77066cfc8e152 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,24 +1,30 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pmccabe-2.4-CVS20070814";
+  name = "pmccabe-${version}";
+  version = "2.6";
 
   src = fetchurl {
-    url = "http://cvs.parisc-linux.org/download/${name}.tar.gz";
-    sha256 = "0nqvfdf2cxx516nw0rwr3lhzhiyrnpc2jf45ldfwsdc9rm2nj3r9";
+    url = "http://http.debian.net/debian/pool/main/p/pmccabe/pmccabe_${version}.tar.gz";
+    sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474";
   };
 
   configurePhase = ''
-    sed -i "Makefile"							\
-        -"es|^[[:blank:]]*DESTDIR[[:blank:]]*=.*$|DESTDIR = $out|g ;	\
-	   s|^[[:blank:]]*INSTALL[[:blank:]]*=.*$|INSTALL = install|g ;	\
-	   s|/usr/|/|g"
-  '';
+    sed -i -r Makefile \
+      -e 's,/usr/,/,g' \
+      -e "s,^DESTDIR =.*$,DESTDIR = $out," \
+      -e "s,^INSTALL = install.*$,INSTALL = install," \
+      -e "s,^all:.*$,all: \$(PROGS),"
+    '';
+
+  checkPhase = "make test";
+
+  doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "McCabe-style function complexity and line counting for C and C++";
-    homepage = http://www.parisc-linux.org/~bame/pmccabe/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = https://people.debian.org/~bame/pmccabe/;
+    license = licenses.gpl2Plus;
 
     longDescription = ''
       pmccabe calculates McCabe-style cyclomatic complexity for C and
@@ -32,6 +38,7 @@ stdenv.mkDerivation rec {
       trees or files; and vifn, to invoke vi given a function name rather
       than a file name.
     '';
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
index d83be1c143135..2b5f42b2cbe54 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,17 +1,39 @@
-{ stdenv, fetchFromGitHub, cmake }:
-
+{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
 stdenv.mkDerivation rec {
   name = "msgpack-tools-${version}";
-  version = "v0.6";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    rev = version;
+    rev = "v${version}";
     sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
   };
 
-  buildInputs = [ cmake ];
+  libb64 = fetchurl {
+    url = "mirror://sourceforge/libb64/libb64-1.2.1.zip";
+    sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410";
+  };
+
+  rapidjson = fetchurl {
+    url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz";
+    sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw";
+  };
+
+  mpack = fetchurl {
+    url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz";
+    sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg";
+  };
+
+  postUnpack = ''
+    mkdir $sourceRoot/contrib
+    cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz
+    cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip
+    cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
+  '';
+
+
+  buildInputs = [ cmake unzip ];
 
   meta = with stdenv.lib; {
     description = "Command-line tools for converting between MessagePack and JSON";
diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy/default.nix
index 6831c7f2b56c1..eb6e50840a5b3 100644
--- a/pkgs/development/tools/mypy-lang/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchurl, python35Packages }:
-
 python35Packages.buildPythonApplication rec {
-  name = "mypy-lang-${version}";
-  version = "0.4.5";
+  name = "mypy-${version}";
+  version = "0.501";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchurl {
-    url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";
-    sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f";
+    url = "mirror://pypi/m/mypy/${name}.tar.gz";
+    sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h";
   };
 
-  propagatedBuildInputs = with python35Packages; [ lxml ];
+  propagatedBuildInputs = with python35Packages; [ lxml typed-ast ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index cedd35ae6ade3..8babfe415dfde 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchzip, which, ocaml, ocamlbuild }:
 
 let param = {
-  "4.02.3" = {
+  "4.02" = {
      version = "4.02+6";
      sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; };
-  "4.03.0" = {
+  "4.03" = {
      version = "4.03+1";
      sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; };
-  "4.04.0" = {
+  "4.04" = {
      version = "4.04+1";
      sha256 = "1ad7rygqjxrc1im95gw9lp8q83nhdaf383f2808f1p63yl42xm7k"; };
-  }."${ocaml.version}";
+  "4.05" = {
+     version = "4.05+1";
+     sha256 = "0wm795hpwvwpib9c9z6p8kw2fh7p7b2hml6g15z8zry3y7w738sv"; };
+  }."${ocaml.meta.branch}";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 0e8c656fbb8b6..c7d26fc79ddb8 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.7";
+  version = "0.5.8";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "1jg2yhnzlyxg735b6qcj3pgnr5q2i361ql27qmxk977al24v5w8i";
+    sha256 = "0pwmmn5k5wscmpidxpc88yrgm7gkpk9ssdh97lz0fjqln99gwp8r";
   };
 
   unpackPhase = "tar xvzf $src";
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 4af3ab5c4b93c..770eb9cc78b40 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.20.3";
+  version = "0.22.0";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1w4n05155rlkyv9k43fs0zrl04pri89vbi7rzpwmcg6zfxz273lw";
+    sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs";
   };
 
   buildInputs = [makeWrapper nodejs];
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 53ed893794c28..b34d84ac851a1 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "7.6.0";
+    version = "7.7.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1adldbhza422951i9rk69x75apj9rdqlx1pm8ybb9w7zjqk09ybg";
+      sha256 = "04bn7c2hvhs6dqjz3khrlqyspljbxiw7y7g4fkjkn8k7lwmchpwn";
     };
 
   })
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index f993ad1b8e099..128cbe71b5d36 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub
-, SDL2, libpng, libjpeg, glew, openal, scons
+, SDL2, libpng, libjpeg, glew, openal, scons, libmad
 }:
 
 let
-  version = "0.9.4";
+  version = "0.9.6";
 
 in
 stdenv.mkDerivation rec {
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     owner = "endless-sky";
     repo = "endless-sky";
     rev = "v${version}";
-    sha256 = "1mirdcpap0a280j472lhmhqg605b7glvdr4l93qcapk8an8d46m7";
+    sha256 = "166wr861w415kynim0yx3x7c16x66f5367hv2mfzhpyp244jzccx";
   };
 
   enableParallelBuilding = true;
 
   buildInputs = [
-    SDL2 libpng libjpeg glew openal scons
+    SDL2 libpng libjpeg glew openal scons libmad
   ];
 
   patches = [
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
new file mode 100644
index 0000000000000..b8550b3712e36
--- /dev/null
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoconf, automake, allegro }:
+
+stdenv.mkDerivation rec {
+  name = "garden-of-coloured-lights-${version}";
+  version = "1.0.9";
+
+  buildInputs = [ allegro autoconf automake ];
+
+  prePatch = ''
+    noInline='s/inline //'
+    sed -e "$noInline" -i src/stuff.c
+    sed -e "$noInline" -i src/stuff.h
+  '';
+
+  src = fetchurl {
+    url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";
+    sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Old-school vertical shoot-em-up / bullet hell";
+    homepage = http://garden.sourceforge.net/drupal/;
+    maintainers = with maintainers; [ profpatsch ];
+    license = licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 91ceb74b0c567..0df7fae13c657 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     "SHAREDIR=$(out)/share"
   ];
 
+  hardeningDisable = [ "format" ];
+
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index b0fd8072566eb..f13190abdf701 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -1,32 +1,43 @@
 {stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.6";
+  version = "1.4.9";
   name = "tome4-${version}";
   src = fetchurl {
     url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
-    sha256 = "12pi2lw1k6l3p209nnkh4nfv3ppp8kpd6mkh1324c81z6mh6w4wg";
+    sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl";
   };
-  buildInputs = [ mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image premake4 ];
-  NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ];
+  nativeBuildInputs = [ premake4 ];
+  buildInputs = [
+    mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image
+  ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL2_image}/include/SDL2"
+    "-I${SDL2_ttf}/include/SDL2"
+  ];
   preConfigure = ''
-    sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua
+    substituteInPlace premake4.lua \
+      --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \
+      --replace "/usr/include/GL" "/run/opengl-driver/include"
     premake4 gmake
   '';
   makeFlags = [ "config=release" ];
   installPhase = ''
     install -Dm755 t-engine $out/opt/tome4/t-engine
-    echo "cd $out/opt/tome4" >> tome4
-    echo "./t-engine &" >> tome4
+    cat > tome4 <<EOF
+#!/bin/sh
+cd $out/opt/tome4
+./t-engine &
+EOF
     install -Dm755 tome4 $out/bin/tome4
     cp -r bootstrap $out/opt/tome4
     cp -r game $out/opt/tome4
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://te4.org/";
     description = "Tales of Maj'eyal (rogue-like game)";
-    maintainers = [ stdenv.lib.maintainers.chattered  ];
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.chattered ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index b3d289df551cd..91f5af1062c15 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.5";
+  version = "0.2.6";
   name = "cups-pk-helper-${version}";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
-    sha256 = "0651ij5p5s0n3xxbaqsy72s22nx9hfkrjgvg766lkqd1cpniw8hr";
+    sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm";
   };
 
-  buildInputs = [ intltool pkgconfig glib polkit cups ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib polkit cups ];
 
   meta = with stdenv.lib; {
     description = "PolicyKit helper to configure cups with fine-grained privileges";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 3f86d4e725df1..0ed6f5dfe1909 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.8";
+  version = "1.6.12";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/05/10/61/125006df4ffc84861395c1158a02f1f73e6f1753/epson-inkjet-printer-escpr-1.6.8-1lsb3.2.tar.gz";
-      sha256 = "02v8ljzw6xhfkz1x8m50mblcckgfbpa89fc902wcmi2sy8fihgh4";
+
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz";
+      sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda";
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 
@@ -29,7 +30,14 @@ in
 	    enable = true;
 	    drivers = [ pkgs.epson-escpr ];
 	  };
-      '';
+
+  To setup a wireless printer, enable Avahi which provides
+  printer's hostname to CUPS and nss-mdns to make this
+  hostname resolvable:
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+    };'';
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ artuuge ];
       platforms = platforms.linux;
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 74b9932ed8322..bb6997dfb96c1 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2";
       sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06";
     })
+
+    ./uncompress2.patch
   ];
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/misc/emulators/pcsxr/uncompress2.patch
new file mode 100644
index 0000000000000..356868ce7a8b6
--- /dev/null
+++ b/pkgs/misc/emulators/pcsxr/uncompress2.patch
@@ -0,0 +1,20 @@
+--- a/libpcsxcore/cdriso.c
++++ b/libpcsxcore/cdriso.c
+@@ -1219,7 +1219,7 @@
+ 	return ret;
+ }
+ 
+-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+ 	int ret = 0;
+@@ -1298,7 +1298,7 @@
+ 	if (is_compressed) {
+ 		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+ 		cdbuffer_size = cdbuffer_size_expect;
+-		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
++		ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+ 		if (ret != 0) {
+ 			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+ 					ret, block, sector);
diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
new file mode 100644
index 0000000000000..6ad4f06328d8b
--- /dev/null
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -0,0 +1,140 @@
+{ stdenv, fetchFromGitHub, lilypond }:
+
+with stdenv.lib;
+
+let
+  olpFont = a@{
+    fontName,
+    rev,
+    sha256,
+    version ? rev,
+    ...
+  }:
+    stdenv.mkDerivation (a // rec {
+      inherit version;
+      name = "openlilypond-font-${fontName}-${version}";
+
+      src = fetchFromGitHub {
+        inherit rev sha256;
+        owner = "OpenLilyPondFonts";
+        repo = a.fontName;
+      };
+
+      phases = [ "unpackPhase" "installPhase" ];
+
+      installPhase = ''
+        for f in {otf,supplementary-fonts}/**.{o,t}tf; do
+          install -Dt $out/otf -m755 otf/*
+        done
+
+        for f in svg/**.{svg,woff}; do
+          install -Dt $out/svg -m755 svg/*
+        done
+      '';
+
+      meta = {
+        inherit (src.meta) homepage;
+        description = "${fontName} font for LilyPond";
+        license = a.license or licenses.ofl;
+        platforms = lilypond.meta.platforms;
+        maintainers = (a.meta.maintainers or []) ++ [ maintainers.yurrriq ];
+      };
+    });
+
+in
+
+rec {
+  beethoven = olpFont {
+    fontName = "beethoven";
+    rev = "669f400";
+    sha256 = "17wdklg5shmqwnb7b81qavfg52v32wx5yf15c6al0hbvv1nqqj2i";
+  };
+  bravura = olpFont {
+    fontName = "bravura";
+    rev = "53c7744";
+    sha256 = "1p27w1c3bzxlnm6rzq8n7dbfjwbxqjy4r0fhkmk9jbm8awmzw214";
+  };
+  cadence = olpFont {
+    fontName = "cadence";
+    rev = "1cc0fb7";
+    sha256 = "1zxb3m8glh8iwj8mzcgyaxhlq0bji0rwniw702m70h9kpifiim1j";
+  };
+  gonville = olpFont {
+    fontName = "gonville";
+    rev = "a638bc9";
+    sha256 = "15khy9677crgd6bpajn7l1drysgxy49wiym3b248khgpavidwyy9";
+  };
+  gutenberg1939 = olpFont {
+    fontName = "gutenberg1939";
+    rev = "2316a35";
+    sha256 = "1lkhivmrx92z37zfrb5mkhzhwggyaga9cm0wl89r0n2f2kayyc7q";
+  };
+  haydn = olpFont {
+    fontName = "haydn";
+    rev = "9e7de8b";
+    sha256 = "1jmbhb2jm887sdc498l2jilpivq1d8lmmgdb8lp59lv8d9fx105z";
+  };
+  improviso = olpFont {
+    fontName = "improviso";
+    rev = "0753f5a";
+    sha256 = "1clin9c74gjhhira12mwxynxn4b1ixij5bg04mvk828lbr740mfm";
+  };
+  lilyboulez = olpFont {
+    fontName = "lilyboulez";
+    rev = "e8455fc";
+    sha256 = "0mq92x0rbgfb6s7ipgg2zcxika2si30w3ay89rp7m6vwca01649y";
+  };
+  lilyjazz = olpFont {
+    fontName = "lilyjazz";
+    rev = "8f1f2dd";
+    sha256 = "0k44dl5hfcn7wn2b6c51mbw6hsb1sprmx95xiabvcbpxnkplbmac";
+  };
+  lv-goldenage = olpFont {
+    fontName = "lv-goldenage";
+    rev = "8a92fd3";
+    sha256 = "03nbd1vmlaj7wkhsnl2lq09nafv7zj1k518zs966vclzah94qghp";
+  };
+  paganini = olpFont {
+    fontName = "paganini";
+    rev = "8e4e55a";
+    sha256 = "0gw9wr4hfn205j40rpgnfddhzhn9x4pwfinamj5b7607880nvx29";
+  };
+  profondo = olpFont {
+    fontName = "profondo";
+    rev = "8cfb668";
+    sha256 = "0armwbg9y0l935949b7klngws6fq42fi944lws61qvjl61780br8";
+  };
+  ross = olpFont {
+    fontName = "ross";
+    rev = "aa8127f";
+    sha256 = "1w2x3pd1d1z4x0107dpq95v7m547cj4nkkzxgqpmzfqa0074idqd";
+  };
+  scorlatti = olpFont {
+    fontName = "scorlatti";
+    rev = "1db87da";
+    sha256 = "07jam5hwdy6bydrm98cdla6p6rl8lmy8zzsfq46i55l64l3w956h";
+  };
+  sebastiano = olpFont {
+    fontName = "sebastiano";
+    rev = "44bf262";
+    sha256 = "09i8p3p4z6vz69j187cpxvikkgc4pk6gxippahy0k7i7bh0d4qaj";
+  };
+
+  all = [
+    beethoven
+    bravura
+    cadence
+    gonville
+    gutenberg1939
+    haydn
+    improviso
+    lilyboulez
+    lilyjazz
+    lv-goldenage
+    paganini
+    profondo
+    ross
+    scorlatti
+    sebastiano
+  ];
+}
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
new file mode 100644
index 0000000000000..861d8cf14de96
--- /dev/null
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, lndir
+, lilypond
+, openlilylib-fonts
+, fonts ? openlilylib-fonts.all
+}:
+
+stdenv.mkDerivation {
+  name = "${lilypond.name}-with-fonts";
+  phases = "installPhase";
+  buildInputs = fonts;
+  nativeBuildInputs = [ lndir ];
+  installPhase = ''
+    local fontsdir=$out/share/lilypond/${lilypond.version}/fonts
+
+    install -m755 -d $fontsdir/otf
+    install -m755 -d $fontsdir/svg
+
+    ${stdenv.lib.concatMapStrings (font: ''
+        lndir -silent ${font}/otf $fontsdir/otf
+        lndir -silent ${font}/svg $fontsdir/svg
+      '') fonts}
+
+      install -m755 -d $out/lib
+      lndir -silent ${lilypond}/lib $out/lib
+      install -m755 -d $out/share
+      lndir -silent ${lilypond}/share $out/share
+
+      install -m755 -Dt $out/bin ${lilypond}/bin/*
+
+      for p in $out/bin/*; do
+        substituteInPlace $p --replace "exec -a ${lilypond}" "exec -a $out"
+      done
+  '';
+}
diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix
index 012fef1b5b0e1..031afeeca2fc8 100644
--- a/pkgs/misc/screensavers/vlock/default.nix
+++ b/pkgs/misc/screensavers/vlock/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
     sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile
   '';
 
+  patches = [ ./eintr.patch ];
+
   configureFlags = "VLOCK_GROUP=root ROOT_GROUP=root";
 
   buildInputs = [ pam ];
diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/misc/screensavers/vlock/eintr.patch
new file mode 100644
index 0000000000000..e33b52228fc3c
--- /dev/null
+++ b/pkgs/misc/screensavers/vlock/eintr.patch
@@ -0,0 +1,22 @@
+In systemd I have seen this error, using it as a service:
+
+vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted system call
+
+I think this should fix that.
+
+diff --git a/modules/new.c b/modules/new.c
+index e9b15fb..1f692fd 100644
+--- a/modules/new.c
++++ b/modules/new.c
+@@ -103,7 +103,10 @@ static char *get_console_name(int n)
+  * file descriptor. */
+ static int activate_console(int consfd, int vtno)
+ {
+-  int c = ioctl(consfd, VT_ACTIVATE, vtno);
++  int c;
++  do {
++    c = ioctl(consfd, VT_ACTIVATE, vtno);
++  } while(c != 0 && errno == EINTR);
+ 
+   return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
+ }
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index fa1be80287a2c..6db3b44b68662 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, fetchurl
-, SDL2, wxGTK
-}:
+{ stdenv, fetchgit
+, SDL2, wxGTK }:
 
 stdenv.mkDerivation rec {
 
   name = "sound-of-sorting-${version}";
-  version = "0.6.5";
+  version = "unstable-2015-07-21";
 
-  src = fetchurl {
-    url = "https://github.com/bingmann/sound-of-sorting/archive/${name}.tar.gz";
-    sha256 = "1524bhmy5067z9bjc15hvqslw43adgpdn4272iymq09ahja4x76b";
+  src = fetchgit {
+    url = "https://github.com/bingmann/sound-of-sorting.git";
+    rev = "05db428c796a7006d63efdbe314f976e0aa881d6";
+    sha256 = "0m2f1dym3hcar7784sjzkbf940b28r02ajhkjgyyw7715psifb8l";
+    fetchSubmodules = true;
   };
 
   buildInputs = with stdenv.lib;
   [ wxGTK SDL2 ];
 
   preConfigure = ''
-    export SDL_CONFIG=${SDL2}/bin/sdl2-config
+    export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config
   '';
 
   meta = with stdenv.lib;{
     description = "Audibilization and Visualization of Sorting Algorithms";
     homepage = http://panthema.net/2013/sound-of-sorting/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.AndersonTorres ];
+    license = with licenses; gpl3;
+    maintainers = with maintainers; [ AndersonTorres ];
   };
 }
diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 634ea743e322b..2a75ea590eeac 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "2017-02-17";
+  version = "2017-02-26";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
-    rev = "46afa0f1566207c07ce15633d3a4ca12075afcb7";
-    sha256 = "0sxpj8k0dlgh1k1w1hnpy94rvh7h6mj9vrhldmhc128kncdcxk3j";
+    rev = "66c222c25c43603e73d3521e0e91ffb268214229";
+    sha256 = "1q0nc02d7kwaxjb8d2rvwc3yf3v46r44zsighwjnmczpw7y3j6h8";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c8872a40e561d..2686138bc930f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -124,11 +124,11 @@ rec {
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2017-02-12";
+    name = "CheckAttach-2017-02-26";
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
-      rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e";
-      sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g";
+      rev = "4e841a854e8ee3fd24849e972a3c3f5456ef6be3";
+      sha256 = "0dvqrca1sa8r29kg2k6qhpp3mbsbk29p81zpa7gzw8h73kqfwph1";
     };
     dependencies = [];
 
@@ -146,11 +146,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2016-11-29";
+    name = "Hoogle-2017-03-01";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "9f00214ece60b9514ef2911fb62e7d53c52d3b4c";
-      sha256 = "1yh732s9k3lhsdqz8qfqijvl0za7cl9mndbzqh4dg2g14f5f5qqw";
+      rev = "cfb0c864dbacf6f916ba05c4a688e21154aa971b";
+      sha256 = "0gddyh47gwy684kjs9yxfnc0lg8jq9w5pdyv3yrvypyiqi51vw1b";
     };
     dependencies = [];
 
@@ -179,11 +179,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-02-07";
+    name = "Syntastic-2017-02-28";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10";
-      sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi";
+      rev = "48e8b0e9d2721f608fd1d1157c9388b2626cbddf";
+      sha256 = "0q52iqnbqm1h5iy8wr4l03y8w9yamgk48sd495p255pmxn8dryc5";
     };
     dependencies = [];
 
@@ -201,33 +201,33 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-02-12";
+    name = "Tagbar-2017-02-18";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7";
-      sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x";
+      rev = "959f48798136bfd4ce60075d3c86c580fcf5e5c5";
+      sha256 = "02v30744w2jcavwk9cjdy51ldpqylj6pgg6zavj4dni7knbnq3jm";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-01-22";
+    name = "The_NERD_Commenter-2017-02-28";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005";
-      sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d";
+      rev = "41e686824a5b77ba5afe9c5dabdc045aac922c5a";
+      sha256 = "1c9zhlljbnskmgn8ycckznbh05cf3ldbq902gg8rn0n0433dy7wc";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-01-02";
+    name = "The_NERD_tree-2017-02-25";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "281701021c5001332a862da80175bf585d24e2e8";
-      sha256 = "0fp2rfz6rmaj01w5kifqzdyi934j20pa8bpgw13ks1s0s4x7xkck";
+      rev = "e671e403dd1ec1da59f70605c73aaedb6cb0e637";
+      sha256 = "0g3bdwbg6hyh83qn4ad1hjk3pvq049fjqwj6viwa668zyvq4vwm4";
     };
     dependencies = [];
 
@@ -356,11 +356,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-02-10";
+    name = "fugitive-2017-02-25";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5";
-      sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq";
+      rev = "87c1bda4d5573185a1f79c42a919c4b62bc34c42";
+      sha256 = "1zfq28sawq5x6y55w5m248r5vhs2g0llhs2xpihys9kg7jgj49zq";
     };
     dependencies = [];
 
@@ -380,7 +380,7 @@ rec {
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-auto-save-2017-01-16";
     src = fetchgit {
-      url = "git://github.com/907th/vim-auto-save";
+      url = "https://github.com/907th/vim-auto-save";
       rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5";
       sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y";
     };
@@ -389,22 +389,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-02-06";
+    name = "vim-autoformat-2017-02-19";
     src = fetchgit {
-      url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e";
-      sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq";
-    };
-    dependencies = [];
-
-  };
-
-  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-object-2015-08-11";
-    src = fetchgit {
-      url = "git://github.com/michaeljsmith/vim-indent-object";
-      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
-      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
+      url = "https://github.com/Chiel92/vim-autoformat";
+      rev = "42adced2500134017180ec37d10a8ffcde48e825";
+      sha256 = "0yabhdnarrb0iiv51lxjvlicmlh6ga9n51iwrriv03p43s9h5hg1";
     };
     dependencies = [];
 
@@ -413,7 +402,7 @@ rec {
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nix-2016-11-02";
     src = fetchgit {
-      url = "git://github.com/LnL7/vim-nix";
+      url = "https://github.com/LnL7/vim-nix";
       rev = "b06cccd8ff61149b13d3fc8b7e0d06caa55c9888";
       sha256 = "0d1wxxijyyl449f81asl9d31kg0wvs3m0fypin172ahgpf3lyar4";
     };
@@ -422,33 +411,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-01-31";
+    name = "tsuquyomi-2017-02-16";
     src = fetchgit {
-      url = "git://github.com/Quramy/tsuquyomi";
-      rev = "201d84d37ac9077855942dc9c6e6e235e285f20f";
-      sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx";
-    };
-    dependencies = [];
-
-  };
-
-  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "delimitMate-2016-07-19";
-    src = fetchgit {
-      url = "git://github.com/Raimondi/delimitMate";
-      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
-      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
+      url = "https://github.com/Quramy/tsuquyomi";
+      rev = "043f8e0a008853bfe4c6a56a04930defe8494984";
+      sha256 = "0jzkg2wrs46g6ycidh54z0rdhvjfm1syaf6sf17cl9m7h6wprsy8";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-02-09";
+    name = "deoplete-nvim-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0";
-      sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp";
+      url = "https://github.com/Shougo/deoplete.nvim";
+      rev = "b9774f4a320838288670fd215901115b06b4a600";
+      sha256 = "1r91lnbjqhvpzszygkl4s1m9wc1qh4pg2pd43r66akpnddmgil0k";
     };
     dependencies = [];
 
@@ -457,7 +435,7 @@ rec {
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Spacegray-vim-2016-10-30";
     src = fetchgit {
-      url = "git://github.com/ajh17/Spacegray.vim";
+      url = "https://github.com/ajh17/Spacegray.vim";
       rev = "79936a4434bf57b64c2d73320e62b4e67d84af74";
       sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r";
     };
@@ -468,7 +446,7 @@ rec {
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-closetag-2016-07-19";
     src = fetchgit {
-      url = "git://github.com/alvan/vim-closetag";
+      url = "https://github.com/alvan/vim-closetag";
       rev = "e7e6cb99b9abb2aaa4711b9b2a98ad029169253b";
       sha256 = "0827yrgawfjf82z37lndf58ikyh6s8g9qhxvnbfxvz8cc4a6r21v";
     };
@@ -479,7 +457,7 @@ rec {
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-css-color-2017-02-09";
     src = fetchgit {
-      url = "git://github.com/ap/vim-css-color";
+      url = "https://github.com/ap/vim-css-color";
       rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b";
       sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc";
     };
@@ -488,11 +466,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-02-12";
+    name = "clighter8-2017-03-04";
     src = fetchgit {
-      url = "git://github.com/bbchung/clighter8";
-      rev = "357a0292438dfad356ce52c94f96840063fad80d";
-      sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak";
+      url = "https://github.com/bbchung/clighter8";
+      rev = "229012f8f8181417e0f43b4f19c4273dd7d5233a";
+      sha256 = "0hx9l1mr7im9zrwhwf6n2lyc5azna7b2lkz4v1y9f93gv78b1vv5";
     };
     dependencies = [];
     preFixup = ''
@@ -502,11 +480,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-02-12";
+    name = "neomake-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/benekastah/neomake";
-      rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653";
-      sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w";
+      url = "https://github.com/benekastah/neomake";
+      rev = "4cd4dbb68f4f5c365e213552642c7e8a8b954f83";
+      sha256 = "1h03cxdbbzghigrya2xy7a4rri5fjm8vma4bya7xfndc0sg9wlhz";
     };
     dependencies = [];
 
@@ -515,7 +493,7 @@ rec {
   vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hdevtools-2012-12-29";
     src = fetchgit {
-      url = "git://github.com/bitc/vim-hdevtools";
+      url = "https://github.com/bitc/vim-hdevtools";
       rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
       sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz";
     };
@@ -523,12 +501,23 @@ rec {
 
   };
 
+  vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-sort-motion-2017-01-28";
+    src = fetchgit {
+      url = "https://github.com/christoomey/vim-sort-motion";
+      rev = "dab96e1f4100a559c58f1d0d8e5e400057479f6b";
+      sha256 = "0p8p8nn0q62xm6sc36rwn3dknyk0wpjya21iy9y721vbz1s0l8x7";
+    };
+    dependencies = [];
+
+  };
+
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-01-28";
+    name = "vim-tmux-navigator-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8";
-      sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx";
+      url = "https://github.com/christoomey/vim-tmux-navigator";
+      rev = "2fc1ed42ab580ab47c506ab0bef09f1dbb9ff04d";
+      sha256 = "1mw0x3kcxvhfypzd7yj6bcknp6c5bh4zb4r9b16n1r7gplvwv8jn";
     };
     dependencies = [];
 
@@ -537,7 +526,7 @@ rec {
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "spacevim-2017-01-22";
     src = fetchgit {
-      url = "git://github.com/ctjhoa/spacevim";
+      url = "https://github.com/ctjhoa/spacevim";
       rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5";
       sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn";
     };
@@ -548,7 +537,7 @@ rec {
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-vim-2017-01-13";
     src = fetchgit {
-      url = "git://github.com/ctrlpvim/ctrlp.vim";
+      url = "https://github.com/ctrlpvim/ctrlp.vim";
       rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359";
       sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc";
     };
@@ -559,7 +548,7 @@ rec {
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "agda-vim-2016-10-22";
     src = fetchgit {
-      url = "git://github.com/derekelkins/agda-vim";
+      url = "https://github.com/derekelkins/agda-vim";
       rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4";
       sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf";
     };
@@ -570,7 +559,7 @@ rec {
   vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-scala-2016-08-02";
     src = fetchgit {
-      url = "git://github.com/derekwyatt/vim-scala";
+      url = "https://github.com/derekwyatt/vim-scala";
       rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7";
       sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp";
     };
@@ -579,11 +568,11 @@ rec {
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2017-02-01";
+    name = "vim-jade-2017-02-15";
     src = fetchgit {
-      url = "git://github.com/digitaltoad/vim-jade";
-      rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d";
-      sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1";
+      url = "https://github.com/digitaltoad/vim-jade";
+      rev = "20e41fc7ca0f1f1023c64548918e2b8155bb44ea";
+      sha256 = "1smqwpzsllmwc7kafyj65fkmh8p87b14dzgldnh4cnrhkcbnddav";
     };
     dependencies = [];
 
@@ -592,7 +581,7 @@ rec {
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-2016-09-21";
     src = fetchgit {
-      url = "git://github.com/dracula/vim";
+      url = "https://github.com/dracula/vim";
       rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
       sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
     };
@@ -603,7 +592,7 @@ rec {
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-ghc-2016-07-01";
     src = fetchgit {
-      url = "git://github.com/eagletmt/neco-ghc";
+      url = "https://github.com/eagletmt/neco-ghc";
       rev = "7f02a9c25fb272a87d2be092826e2cd3094c620d";
       sha256 = "1fcfk45qb96h6y4zb3p0104iyqc85q1synn9ah56zp6hnkkyffbw";
     };
@@ -614,7 +603,7 @@ rec {
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
-      url = "git://github.com/editorconfig/editorconfig-vim";
+      url = "https://github.com/editorconfig/editorconfig-vim";
       rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2";
       sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g";
     };
@@ -625,7 +614,7 @@ rec {
   acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "acp-2013-02-05";
     src = fetchgit {
-      url = "git://github.com/eikenb/acp";
+      url = "https://github.com/eikenb/acp";
       rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e";
       sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg";
     };
@@ -633,45 +622,34 @@ rec {
 
   };
 
-  argtextobj = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "argtextobj-vim-2010-10-17";
-    src = fetchgit {
-      url = "git://github.com/vim-scripts/argtextobj.vim";
-      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
-      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
-    };
-    dependencies = [];
-
-  };
-
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-01-24";
+    name = "vim-elixir-2017-02-21";
     src = fetchgit {
-      url = "git://github.com/elixir-lang/vim-elixir";
-      rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
-      sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
+      url = "https://github.com/elixir-lang/vim-elixir";
+      rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e";
+      sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2";
     };
     dependencies = [];
 
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2017-01-13";
+    name = "elm-vim-2017-02-27";
     src = fetchgit {
-      url = "git://github.com/elmcast/elm-vim";
-      rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40";
-      sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2";
+      url = "https://github.com/elmcast/elm-vim";
+      rev = "b47d013d1fdfecc9e19df8034439b8e379813696";
+      sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw";
     };
     dependencies = [];
 
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-02-07";
+    name = "vim-localvimrc-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/embear/vim-localvimrc";
-      rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98";
-      sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx";
+      url = "https://github.com/embear/vim-localvimrc";
+      rev = "aaea27fe897edbfb0c5f71ef0ac02489f4bcfefa";
+      sha256 = "1lp947x9q9746r8zfssnn2xylbvzyyzxh7s7rshqglslwd74hhz8";
     };
     dependencies = [];
 
@@ -680,7 +658,7 @@ rec {
   vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellConcealPlus-2016-05-13";
     src = fetchgit {
-      url = "git://github.com/enomsg/vim-haskellConcealPlus";
+      url = "https://github.com/enomsg/vim-haskellConcealPlus";
       rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03";
       sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr";
     };
@@ -691,7 +669,7 @@ rec {
   YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
-      url = "git://github.com/esneider/YUNOcommit.vim";
+      url = "https://github.com/esneider/YUNOcommit.vim";
       rev = "981082055a73ef076d7e27477874d2303153a448";
       sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
     };
@@ -700,11 +678,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-02-02";
+    name = "vim-go-2017-02-19";
     src = fetchgit {
-      url = "git://github.com/fatih/vim-go";
-      rev = "1425decf6d4e1b313955cefe08c859d07c2c2822";
-      sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl";
+      url = "https://github.com/fatih/vim-go";
+      rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9";
+      sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a";
     };
     dependencies = [];
 
@@ -713,7 +691,7 @@ rec {
   vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorschemes-2016-08-01";
     src = fetchgit {
-      url = "git://github.com/flazz/vim-colorschemes";
+      url = "https://github.com/flazz/vim-colorschemes";
       rev = "b8dff40f69f1873effbed97c759a8452ecb240ed";
       sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj";
     };
@@ -724,7 +702,7 @@ rec {
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "floobits-neovim-2017-02-08";
     src = fetchgit {
-      url = "git://github.com/floobits/floobits-neovim";
+      url = "https://github.com/floobits/floobits-neovim";
       rev = "9755412fcd68cfc76a36aa000682a84d96013650";
       sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
     };
@@ -733,11 +711,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-11-29";
+    name = "psc-ide-vim-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "640842ac8786098fc74fce4737734c97a7629591";
-      sha256 = "0mwqkgqlglcnv1k7k5lmibc7piwkd79j96vgv52ya31hg50vkrin";
+      url = "https://github.com/frigoeu/psc-ide-vim";
+      rev = "cfd4228ff907be6124953d4ff41951ce3eca28ce";
+      sha256 = "1dvdrj06l65xflq7f5k2c4awrc7hh03qr48h9i39q8lg4xc0qc1p";
     };
     dependencies = [];
 
@@ -746,7 +724,7 @@ rec {
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsonnet-2016-12-16";
     src = fetchgit {
-      url = "git://github.com/google/vim-jsonnet";
+      url = "https://github.com/google/vim-jsonnet";
       rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57";
       sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251";
     };
@@ -757,7 +735,7 @@ rec {
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsdoc-2017-02-11";
     src = fetchgit {
-      url = "git://github.com/heavenshell/vim-jsdoc";
+      url = "https://github.com/heavenshell/vim-jsdoc";
       rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
       sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
     };
@@ -768,7 +746,7 @@ rec {
   vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-leader-guide-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/hecal3/vim-leader-guide";
+      url = "https://github.com/hecal3/vim-leader-guide";
       rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da";
       sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1";
     };
@@ -779,7 +757,7 @@ rec {
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "idris-vim-2017-01-27";
     src = fetchgit {
-      url = "git://github.com/idris-hackers/idris-vim";
+      url = "https://github.com/idris-hackers/idris-vim";
       rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8";
       sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb";
     };
@@ -790,7 +768,7 @@ rec {
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "calendar-vim-2017-02-09";
     src = fetchgit {
-      url = "git://github.com/itchyny/calendar.vim";
+      url = "https://github.com/itchyny/calendar.vim";
       rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852";
       sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip";
     };
@@ -801,7 +779,7 @@ rec {
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lightline-vim-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/itchyny/lightline.vim";
+      url = "https://github.com/itchyny/lightline.vim";
       rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a";
       sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5";
     };
@@ -812,7 +790,7 @@ rec {
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "thumbnail-vim-2016-12-25";
     src = fetchgit {
-      url = "git://github.com/itchyny/thumbnail.vim";
+      url = "https://github.com/itchyny/thumbnail.vim";
       rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c";
       sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz";
     };
@@ -823,7 +801,7 @@ rec {
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
-      url = "git://github.com/ivanov/vim-ipython";
+      url = "https://github.com/ivanov/vim-ipython";
       rev = "42499f094b805b90b683afa5009cee99abd0bb75";
       sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
     };
@@ -834,7 +812,7 @@ rec {
   vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hier-2011-08-27";
     src = fetchgit {
-      url = "git://github.com/jceb/vim-hier";
+      url = "https://github.com/jceb/vim-hier";
       rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
       sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
     };
@@ -845,7 +823,7 @@ rec {
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-orgmode-2017-01-31";
     src = fetchgit {
-      url = "git://github.com/jceb/vim-orgmode";
+      url = "https://github.com/jceb/vim-orgmode";
       rev = "37fc5db4d167ca0def23febcb06d984ab72015be";
       sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x";
     };
@@ -856,7 +834,7 @@ rec {
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-buffergator-2017-02-05";
     src = fetchgit {
-      url = "git://github.com/jeetsukumaran/vim-buffergator";
+      url = "https://github.com/jeetsukumaran/vim-buffergator";
       rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
       sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
     };
@@ -867,7 +845,7 @@ rec {
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tslime-vim-2016-06-14";
     src = fetchgit {
-      url = "git://github.com/jgdavey/tslime.vim";
+      url = "https://github.com/jgdavey/tslime.vim";
       rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
       sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
     };
@@ -878,7 +856,7 @@ rec {
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "auto-pairs-2017-01-26";
     src = fetchgit {
-      url = "git://github.com/jiangmiao/auto-pairs";
+      url = "https://github.com/jiangmiao/auto-pairs";
       rev = "e915d857fe927309ef0090e830f892204b750c43";
       sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4";
     };
@@ -887,11 +865,11 @@ rec {
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2017-02-12";
+    name = "vim-nerdtree-tabs-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/jistr/vim-nerdtree-tabs";
-      rev = "de6a60909e71790baf5d46f863643379ec19bc4c";
-      sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y";
+      url = "https://github.com/jistr/vim-nerdtree-tabs";
+      rev = "01ae3cdc7018fa33f140cce3e7cdf210c04ffbab";
+      sha256 = "01z2xp95sqi5mxhdxm8q0zkx83rn16qbv884rj2irmbl1k8fhv62";
     };
     dependencies = [];
 
@@ -900,7 +878,7 @@ rec {
   zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "zenburn-2015-09-18";
     src = fetchgit {
-      url = "git://github.com/jnurmine/zenburn";
+      url = "https://github.com/jnurmine/zenburn";
       rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179";
       sha256 = "1las12jznf25dkxrjk3s9l70c6wnpjisngmvi83bhw5gvx4c7mq5";
     };
@@ -911,7 +889,7 @@ rec {
   vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorstepper-2016-01-28";
     src = fetchgit {
-      url = "git://github.com/jonbri/vim-colorstepper";
+      url = "https://github.com/jonbri/vim-colorstepper";
       rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05";
       sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs";
     };
@@ -922,7 +900,7 @@ rec {
   vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-xdebug-2012-08-15";
     src = fetchgit {
-      url = "git://github.com/joonty/vim-xdebug";
+      url = "https://github.com/joonty/vim-xdebug";
       rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
       sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw";
     };
@@ -931,11 +909,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-02-08";
+    name = "fzf-vim-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/junegunn/fzf.vim";
-      rev = "dade777e6dad6a318630d7ce26b9761761522c40";
-      sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy";
+      url = "https://github.com/junegunn/fzf.vim";
+      rev = "87a910a127623db9ba2eae9ec9548db1a5142a0a";
+      sha256 = "05b4slg10h9v19bvb6n8hn706w4zyyz0h8akyzzmjkrm0sv92x6r";
     };
     dependencies = [];
 
@@ -944,7 +922,7 @@ rec {
   limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "limelight-vim-2016-06-24";
     src = fetchgit {
-      url = "git://github.com/junegunn/limelight.vim";
+      url = "https://github.com/junegunn/limelight.vim";
       rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
       sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
     };
@@ -955,7 +933,7 @@ rec {
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-peekaboo-2017-01-13";
     src = fetchgit {
-      url = "git://github.com/junegunn/vim-peekaboo";
+      url = "https://github.com/junegunn/vim-peekaboo";
       rev = "9de6fd70ad20cbf568664c06d673c69e2f622287";
       sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky";
     };
@@ -966,7 +944,7 @@ rec {
   vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eighties-2016-12-15";
     src = fetchgit {
-      url = "git://github.com/justincampbell/vim-eighties";
+      url = "https://github.com/justincampbell/vim-eighties";
       rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
       sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
     };
@@ -977,7 +955,7 @@ rec {
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
-      url = "git://github.com/latex-box-team/latex-box";
+      url = "https://github.com/latex-box-team/latex-box";
       rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
       sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl";
     };
@@ -986,11 +964,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2016-08-10";
+    name = "typescript-vim-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/leafgarland/typescript-vim";
-      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
-      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
+      url = "https://github.com/leafgarland/typescript-vim";
+      rev = "48f92032a446daf2aea64ac5912b26328c3df1ef";
+      sha256 = "1lpqqjl3im96zy8w0iwyvmzcwdijfgji0czbsmi84hx299dpn8n4";
     };
     dependencies = [];
 
@@ -999,7 +977,7 @@ rec {
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
-      url = "git://github.com/lepture/vim-jinja";
+      url = "https://github.com/lepture/vim-jinja";
       rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
       sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
     };
@@ -1008,22 +986,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-02-09";
+    name = "vimtex-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/lervag/vimtex";
-      rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0";
-      sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492";
+      url = "https://github.com/lervag/vimtex";
+      rev = "75c4ac90f2d254741bad326536d03f382266a150";
+      sha256 = "1l89skr6ifpavximggzyzaw11973ci5gyh48cni07a2m0z26sy07";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2016-12-25";
+    name = "vim-easymotion-2017-03-04";
     src = fetchgit {
-      url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "af9786ee5780bf0cbafbd7b341c2b5234d18c1c0";
-      sha256 = "0f9xc6wz53msq03qivbmqfcfjncba0mrcl4x8vdkzr4chi0yxvbd";
+      url = "https://github.com/lokaltog/vim-easymotion";
+      rev = "19d00afefe5a1b8f6d891ce0b73dcde38c718fdd";
+      sha256 = "1fdfg8i1xllpgjfk52r58ar8pmbcw3gjdzj712d2n0j7mjmphdgs";
     };
     dependencies = [];
 
@@ -1032,7 +1010,7 @@ rec {
   vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-lawrencium-2017-01-10";
     src = fetchgit {
-      url = "git://github.com/ludovicchabant/vim-lawrencium";
+      url = "https://github.com/ludovicchabant/vim-lawrencium";
       rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
       sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
     };
@@ -1043,7 +1021,7 @@ rec {
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow-2016-10-28";
     src = fetchgit {
-      url = "git://github.com/luochen1990/rainbow";
+      url = "https://github.com/luochen1990/rainbow";
       rev = "906094f73a46ab4636806541b50c5d4182fa09e1";
       sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p";
     };
@@ -1052,11 +1030,11 @@ rec {
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2016-01-31";
+    name = "vim-xkbswitch-2017-02-21";
     src = fetchgit {
-      url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "89fa3fc16251f2e97281d29ade3ee022ba285003";
-      sha256 = "16wahaz9d6jyqlvmsn764xqircrwaap3pn4fbgmly7vfmdvq4p8b";
+      url = "https://github.com/lyokha/vim-xkbswitch";
+      rev = "0d88988f33b5b100fa14ab8ce93f3950ce6069e5";
+      sha256 = "0bglqbdhgrq9c3dzl6031ar6wzz733ym1af1sahb6h6zky30ij7n";
     };
     dependencies = [];
     patchPhase = ''
@@ -1067,22 +1045,33 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-01-04";
+    name = "vim-highlightedyank-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/machakann/vim-highlightedyank";
-      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
-      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+      url = "https://github.com/machakann/vim-highlightedyank";
+      rev = "db9b1e89af6dcbc56f84db980009915cac303fb8";
+      sha256 = "05l7q7l3zbk2lssgs52srk65b53frmxw0rpnv5dma7c2mjxcn9gn";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-02-04";
+    name = "vim-startify-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/mhinz/vim-startify";
-      rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97";
-      sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741";
+      url = "https://github.com/mhinz/vim-startify";
+      rev = "a16e94e6879d8cb5443ebd79ec53883489f46b55";
+      sha256 = "14c179wrh9aw4lwr2b88y6cjxj7x6jyl8kk4fqwzv1h5zqh48fk6";
+    };
+    dependencies = [];
+
+  };
+
+  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-indent-object-2015-08-11";
+    src = fetchgit {
+      url = "https://github.com/michaeljsmith/vim-indent-object";
+      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
+      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
     };
     dependencies = [];
 
@@ -1091,7 +1080,7 @@ rec {
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2016-10-12";
     src = fetchgit {
-      url = "git://github.com/mkasa/lushtags";
+      url = "https://github.com/mkasa/lushtags";
       rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a";
       sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx";
     };
@@ -1102,7 +1091,7 @@ rec {
   hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hlint-refactor-vim-2015-12-05";
     src = fetchgit {
-      url = "git://github.com/mpickering/hlint-refactor-vim";
+      url = "https://github.com/mpickering/hlint-refactor-vim";
       rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
       sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
     };
@@ -1113,7 +1102,7 @@ rec {
   vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-indent-guides-2016-04-17";
     src = fetchgit {
-      url = "git://github.com/nathanaelkane/vim-indent-guides";
+      url = "https://github.com/nathanaelkane/vim-indent-guides";
       rev = "018298ead9d3aa9cd3b4ae222f81022a33978b09";
       sha256 = "0zyrs9r3vza2kqhqir6qpkygy6yljpn877bvycspv89ljzczmwrs";
     };
@@ -1124,7 +1113,7 @@ rec {
   vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-stylish-haskell-2015-05-10";
     src = fetchgit {
-      url = "git://github.com/nbouscal/vim-stylish-haskell";
+      url = "https://github.com/nbouscal/vim-stylish-haskell";
       rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
       sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j";
     };
@@ -1133,11 +1122,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-02-08";
+    name = "haskell-vim-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "c07c2b63f393252412b9c65726f2693bcacef71b";
-      sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b";
+      url = "https://github.com/neovimhaskell/haskell-vim";
+      rev = "5009c37a0f005aee164f8aaf2e99c57abf7a3402";
+      sha256 = "1i2ahm0sikdybhkhmijwcmcsq86bf29jpac6mh3jh0iimimrgwi7";
     };
     dependencies = [];
 
@@ -1146,7 +1135,7 @@ rec {
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "cpsm-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/nixprime/cpsm";
+      url = "https://github.com/nixprime/cpsm";
       rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c";
       sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs";
     };
@@ -1168,7 +1157,7 @@ rec {
   shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "shabadou-vim-2016-07-19";
     src = fetchgit {
-      url = "git://github.com/osyo-manga/shabadou.vim";
+      url = "https://github.com/osyo-manga/shabadou.vim";
       rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1";
       sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870";
     };
@@ -1179,7 +1168,7 @@ rec {
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-watchdogs-2016-11-14";
     src = fetchgit {
-      url = "git://github.com/osyo-manga/vim-watchdogs";
+      url = "https://github.com/osyo-manga/vim-watchdogs";
       rev = "455a61a34e6f2f82fda7e6de0fc14fc740a11764";
       sha256 = "05mqphn2l3f0sa86xq5iw1gmm8l1x8ri26kiw6w40hvdc22xkak5";
     };
@@ -1190,7 +1179,7 @@ rec {
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-markdown-2017-02-02";
     src = fetchgit {
-      url = "git://github.com/plasticboy/vim-markdown";
+      url = "https://github.com/plasticboy/vim-markdown";
       rev = "d6d59eef6f604b6430fd6adade9e18364666232b";
       sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6";
     };
@@ -1198,10 +1187,21 @@ rec {
 
   };
 
+  python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "python-mode-2017-02-06";
+    src = fetchgit {
+      url = "https://github.com/python-mode/python-mode";
+      rev = "d113cffc3f7a48564aeb568e1c7a6f5312ff09f5";
+      sha256 = "1gn74cj629q00ar3z0c1dlngn31jr4lv04bwi2npzinn7rpf8nj6";
+    };
+    dependencies = [];
+
+  };
+
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-racer-2017-02-08";
     src = fetchgit {
-      url = "git://github.com/racer-rust/vim-racer";
+      url = "https://github.com/racer-rust/vim-racer";
       rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e";
       sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd";
     };
@@ -1212,7 +1212,7 @@ rec {
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "purescript-vim-2016-08-31";
     src = fetchgit {
-      url = "git://github.com/raichoo/purescript-vim";
+      url = "https://github.com/raichoo/purescript-vim";
       rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477";
       sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv";
     };
@@ -1221,11 +1221,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-02-12";
+    name = "vim-grammarous-2017-02-24";
     src = fetchgit {
-      url = "git://github.com/rhysd/vim-grammarous";
-      rev = "3e096ed4d5b702167470f771ba2a40b31949dddf";
-      sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0";
+      url = "https://github.com/rhysd/vim-grammarous";
+      rev = "74a88d233056ac63ef65b3dd6766494ec33e6f2e";
+      sha256 = "0av6j1i0kf1gdvj19n9mdaxkxhb6dkbl7yia81sw6j2mkdzka3jc";
     };
     dependencies = [];
 
@@ -1234,7 +1234,7 @@ rec {
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-vim-2017-01-01";
     src = fetchgit {
-      url = "git://github.com/rust-lang/rust.vim";
+      url = "https://github.com/rust-lang/rust.vim";
       rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a";
       sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz";
     };
@@ -1243,11 +1243,11 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-02-11";
+    name = "neoformat-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/sbdchd/neoformat";
-      rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b";
-      sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm";
+      url = "https://github.com/sbdchd/neoformat";
+      rev = "c59748c706b15cfae891772c4e17a31f396c8ffb";
+      sha256 = "0awb1f7ham13rwsg88q356lczblb23kxq194j8h19jmjjbb1lv7p";
     };
     dependencies = [];
 
@@ -1256,7 +1256,7 @@ rec {
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-polyglot-2017-02-02";
     src = fetchgit {
-      url = "git://github.com/sheerun/vim-polyglot";
+      url = "https://github.com/sheerun/vim-polyglot";
       rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb";
       sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny";
     };
@@ -1267,7 +1267,7 @@ rec {
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-01-16";
     src = fetchgit {
-      url = "git://github.com/shougo/neco-vim";
+      url = "https://github.com/shougo/neco-vim";
       rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
       sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
     };
@@ -1278,7 +1278,7 @@ rec {
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neocomplete-vim-2017-01-08";
     src = fetchgit {
-      url = "git://github.com/shougo/neocomplete.vim";
+      url = "https://github.com/shougo/neocomplete.vim";
       rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b";
       sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya";
     };
@@ -1289,7 +1289,7 @@ rec {
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neosnippet-snippets-2017-01-24";
     src = fetchgit {
-      url = "git://github.com/shougo/neosnippet-snippets";
+      url = "https://github.com/shougo/neosnippet-snippets";
       rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a";
       sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6";
     };
@@ -1298,11 +1298,11 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-02-09";
+    name = "neosnippet-vim-2017-02-13";
     src = fetchgit {
-      url = "git://github.com/shougo/neosnippet.vim";
-      rev = "db828325268ca28c17674bd876b40be895daa27e";
-      sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i";
+      url = "https://github.com/shougo/neosnippet.vim";
+      rev = "1bd7e23c79b73da16eb0c9469b25c376d3594583";
+      sha256 = "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5";
     };
     dependencies = [];
 
@@ -1311,7 +1311,7 @@ rec {
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "unite-vim-2017-02-10";
     src = fetchgit {
-      url = "git://github.com/shougo/unite.vim";
+      url = "https://github.com/shougo/unite.vim";
       rev = "97e634117ff05d3c867d625940da5c7947cebf63";
       sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z";
     };
@@ -1322,7 +1322,7 @@ rec {
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimproc-vim-2016-08-06";
     src = fetchgit {
-      url = "git://github.com/shougo/vimproc.vim";
+      url = "https://github.com/shougo/vimproc.vim";
       rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
       sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
     };
@@ -1341,17 +1341,18 @@ rec {
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimshell-vim-2016-12-14";
     src = fetchgit {
-      url = "git://github.com/shougo/vimshell.vim";
+      url = "https://github.com/shougo/vimshell.vim";
       rev = "d0c5bef010237855b4de25863bc54895effe5d7a";
       sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
     };
     dependencies = [ "vimproc-vim" ];
+
   };
 
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "gundo-vim-2016-12-16";
     src = fetchgit {
-      url = "git://github.com/sjl/gundo.vim";
+      url = "https://github.com/sjl/gundo.vim";
       rev = "b4f3624d01ffdfd7bdcd2e19128fffe768fe6262";
       sha256 = "0a18z3yc2fmpaymzlyjkjblxxkjvn83yh64rvidr3nzg262applz";
     };
@@ -1360,11 +1361,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-01-24";
+    name = "alchemist-vim-2017-02-24";
     src = fetchgit {
-      url = "git://github.com/slashmili/alchemist.vim";
-      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
-      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
+      url = "https://github.com/slashmili/alchemist.vim";
+      rev = "31c13df87ed13428f8070718cea8a3ade4c37c99";
+      sha256 = "0c485zgrg997waf7jrw1qyzw8903yc4p5y5d7skn2irn66dl0388";
     };
     dependencies = [];
 
@@ -1373,7 +1374,7 @@ rec {
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2016-12-19";
     src = fetchgit {
-      url = "git://github.com/takac/vim-hardtime";
+      url = "https://github.com/takac/vim-hardtime";
       rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b";
       sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4";
     };
@@ -1384,7 +1385,7 @@ rec {
   vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-expand-region-2013-08-19";
     src = fetchgit {
-      url = "git://github.com/terryma/vim-expand-region";
+      url = "https://github.com/terryma/vim-expand-region";
       rev = "966513543de0ddc2d673b5528a056269e7917276";
       sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv";
     };
@@ -1395,7 +1396,7 @@ rec {
   vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimpreviewpandoc-2016-03-07";
     src = fetchgit {
-      url = "git://github.com/tex/vimpreviewpandoc";
+      url = "https://github.com/tex/vimpreviewpandoc";
       rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4";
       sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4";
     };
@@ -1406,7 +1407,7 @@ rec {
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-quickrun-2017-01-22";
     src = fetchgit {
-      url = "git://github.com/thinca/vim-quickrun";
+      url = "https://github.com/thinca/vim-quickrun";
       rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2";
       sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv";
     };
@@ -1417,7 +1418,7 @@ rec {
   molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "molokai-2015-11-11";
     src = fetchgit {
-      url = "git://github.com/tomasr/molokai";
+      url = "https://github.com/tomasr/molokai";
       rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
       sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
     };
@@ -1425,10 +1426,21 @@ rec {
 
   };
 
+  vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dispatch-2016-08-30";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-dispatch";
+      rev = "a54f2c5e18b8c2aad8c6f8ba474760e70fdaaca3";
+      sha256 = "18z1hkr3qrgj9j0kr0q3i5vq27dpkjhsm3mqyssi6k5v0iyw49dk";
+    };
+    dependencies = [];
+
+  };
+
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eunuch-2016-09-07";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-eunuch";
+      url = "https://github.com/tpope/vim-eunuch";
       rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21";
       sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc";
     };
@@ -1439,7 +1451,7 @@ rec {
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-repeat-2015-05-09";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-repeat";
+      url = "https://github.com/tpope/vim-repeat";
       rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415";
       sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7";
     };
@@ -1450,7 +1462,7 @@ rec {
   vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-speeddating-2015-01-24";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-speeddating";
+      url = "https://github.com/tpope/vim-speeddating";
       rev = "426c792e479f6e1650a6996c683943a09344c21e";
       sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8";
     };
@@ -1461,7 +1473,7 @@ rec {
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
-      url = "git://github.com/travitch/hasksyn";
+      url = "https://github.com/travitch/hasksyn";
       rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
       sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
     };
@@ -1472,7 +1484,7 @@ rec {
   vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellconceal-2014-10-28";
     src = fetchgit {
-      url = "git://github.com/twinside/vim-haskellconceal";
+      url = "https://github.com/twinside/vim-haskellconceal";
       rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
       sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy";
     };
@@ -1481,11 +1493,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-02-11";
+    name = "youcompleteme-2017-02-27";
     src = fetchgit {
-      url = "git://github.com/valloric/youcompleteme";
-      rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4";
-      sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8";
+      url = "https://github.com/valloric/youcompleteme";
+      rev = "39659caf34c664c7419cadb41cb813158e0749fa";
+      sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx";
     };
     dependencies = [];
     buildPhase = ''
@@ -1507,22 +1519,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-12-31";
+    name = "vim-airline-themes-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8";
-      sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8";
+      url = "https://github.com/vim-airline/vim-airline-themes";
+      rev = "205f6964be55d17c908baaf89066928090b02729";
+      sha256 = "0cz39gxmrsnv9r72ymyzjwlgdi2x0dxxibwvlwp6zwdwws4l3fw8";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-02-07";
+    name = "vim-pandoc-2017-02-20";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c";
-      sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw";
+      url = "https://github.com/vim-pandoc/vim-pandoc";
+      rev = "15873af56c3c15ebd5431983741c399097fb61de";
+      sha256 = "08h1bmrjv8bjywz1fj2rjnmmwrlpdl1lv1gz5msdy817n5lf1xh2";
     };
     dependencies = [];
 
@@ -1531,7 +1543,7 @@ rec {
   vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-pandoc-after-2015-06-01";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc-after";
+      url = "https://github.com/vim-pandoc/vim-pandoc-after";
       rev = "4377665e5c98f29ea838deb3b942200b8dd096ef";
       sha256 = "1379g174pvsaw1wdv1n18gby84sv59rsamfcgq9bqd4kg54g6h3j";
     };
@@ -1540,11 +1552,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2017-01-19";
+    name = "vim-pandoc-syntax-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "89341527b2bde3fbd473f5677e1df09072c319b5";
-      sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52";
+      url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
+      rev = "2e7420ba617da6aa6acc221c41fbea44783eb585";
+      sha256 = "0k964jsr9v8nz1w2d8qy6rv66110ga6hllbp5zcrfw7j62cgmvn7";
     };
     dependencies = [];
 
@@ -1553,7 +1565,7 @@ rec {
   Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/Colour-Sampler-Pack";
+      url = "https://github.com/vim-scripts/Colour-Sampler-Pack";
       rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
       sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
     };
@@ -1564,7 +1576,7 @@ rec {
   Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Rename-2011-08-30";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/Rename";
+      url = "https://github.com/vim-scripts/Rename";
       rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
       sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
     };
@@ -1572,10 +1584,21 @@ rec {
 
   };
 
+  ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ReplaceWithRegister-2014-10-30";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/ReplaceWithRegister";
+      rev = "832efc23111d19591d495dc72286de2fb0b09345";
+      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
+    };
+    dependencies = [];
+
+  };
+
   a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "a-vim-2010-11-06";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/a.vim";
+      url = "https://github.com/vim-scripts/a.vim";
       rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
       sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
     };
@@ -1586,7 +1609,7 @@ rec {
   align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "align-2012-08-07";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/align";
+      url = "https://github.com/vim-scripts/align";
       rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
       sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
     };
@@ -1594,10 +1617,21 @@ rec {
 
   };
 
+  argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "argtextobj-vim-2010-10-17";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/argtextobj.vim";
+      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
+      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
+    };
+    dependencies = [];
+
+  };
+
   changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "changeColorScheme-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/changeColorScheme.vim";
+      url = "https://github.com/vim-scripts/changeColorScheme.vim";
       rev = "b041d49f828629d72f2232531a230d1ec5de2405";
       sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
     };
@@ -1608,7 +1642,7 @@ rec {
   random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "random-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/random.vim";
+      url = "https://github.com/vim-scripts/random.vim";
       rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
       sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
     };
@@ -1619,7 +1653,7 @@ rec {
   tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tabmerge-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/tabmerge";
+      url = "https://github.com/vim-scripts/tabmerge";
       rev = "074e5f06f26e7108a0570071a0f938a821768c06";
       sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
     };
@@ -1630,7 +1664,7 @@ rec {
   wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "wombat256-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/wombat256.vim";
+      url = "https://github.com/vim-scripts/wombat256.vim";
       rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
       sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
     };
@@ -1639,22 +1673,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-02-08";
+    name = "vim-wakatime-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/wakatime/vim-wakatime";
-      rev = "3d343f656521ef0521a3277b81e4cd9af8be671a";
-      sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1";
+      url = "https://github.com/wakatime/vim-wakatime";
+      rev = "a7be16c948bc4975d83c07c7bf25206953b79b22";
+      sha256 = "0lnng566bw4462xg3i4qjbqvnkxmg2m33368nllapb1yj0x735c9";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-01-08";
+    name = "command-t-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/wincent/command-t";
-      rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81";
-      sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g";
+      url = "https://github.com/wincent/command-t";
+      rev = "5a19460ea0eab0ca617a8dbf405f7a506eca4ff6";
+      sha256 = "0vzw5cvlsw0cs2jp52qbc7nghw4jsbldrbkynbx8g7nrh36847my";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1669,7 +1703,7 @@ rec {
   vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easytags-2015-07-01";
     src = fetchgit {
-      url = "git://github.com/xolox/vim-easytags";
+      url = "https://github.com/xolox/vim-easytags";
       rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
       sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
     };
@@ -1677,15 +1711,26 @@ rec {
 
   };
 
+  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-misc-2015-05-21";
+    src = fetchgit {
+      url = "https://github.com/xolox/vim-misc";
+      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
+      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
+    };
+    dependencies = [];
+
+  };
+
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-02-10";
+    name = "deoplete-go-2017-02-13";
     src = fetchgit {
-      url = "git://github.com/zchee/deoplete-go";
-      rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a";
-      sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86";
+      url = "https://github.com/zchee/deoplete-go";
+      rev = "9c2d57710f022ea5fe3b0428e6635a3de77bcf9e";
+      sha256 = "0rl211rmnzwribzpqxfg99lsyln2x1i8ygyz8b9jy804fm5i24f3";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1695,11 +1740,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-01-16";
+    name = "deoplete-jedi-2017-02-17";
     src = fetchgit {
-      url = "git://github.com/zchee/deoplete-jedi";
-      rev = "6240de812f06263524f46379ad08a0d3d539730f";
-      sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1";
+      url = "https://github.com/zchee/deoplete-jedi";
+      rev = "a4dd511535a6fe06717a7bd2d680b9b87ade595d";
+      sha256 = "03wwqk4r2rm5yjxqw2f4302lknb9a10yfpw4b0vyr40zch6jascr";
     };
     dependencies = [];
 
@@ -1750,11 +1795,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2016-10-13";
+    name = "pathogen-2017-02-13";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "7ba2e1b67a8f8bcbafedaf6763580390dfd93436";
-      sha256 = "1g15wzyw9b93n3icwpscx4b4qkn23snbmqjqp867ba0w0z3h6hpv";
+      rev = "020ab25c38f62627c1dab6c7a851176c6ad309f9";
+      sha256 = "19cdb9ach89jx0y9kpz39d41dzq5dfy5l83v8l57jxjq1s4wry55";
     };
     dependencies = [];
 
@@ -1870,11 +1915,11 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2016-08-07";
+    name = "tlib-2017-03-03";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "8c74564396e368788a5cb901b0e8017a3166cee9";
-      sha256 = "15bh6q8g7p1giz2lybqhdf7a7xisqwpr751gprqx3vmh97drry5z";
+      rev = "b80c8f0f932ffaf9078f6998fe422cfbc7b95178";
+      sha256 = "177phwdhfckhc4bm4xv1db8lxrvsi8lvv7n3c1j03w2r8f9h8pj8";
     };
     dependencies = [];
 
@@ -2101,22 +2146,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-02-11";
+    name = "vim-airline-2017-02-28";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2";
-      sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b";
+      rev = "fbd791e7f0431e18b987a2a8937a4c3d34dd2125";
+      sha256 = "15m4wdvx4x8m43x5z08sbw74i1l7vwj0qljsgs7jn36yc9453sn7";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2016-12-27";
+    name = "vim-coffee-script-2017-03-02";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "72f48c3f9bb6ba4f9ba1e6e4933c2c25686a1b62";
-      sha256 = "07qamx2jv5418ya1c1hca3qvnfvw78r15iakgh0kljajzdq3yy0b";
+      rev = "1eddf182ba28d4e695fe1dbcae5b5b029218cb44";
+      sha256 = "1s9idnbj3613ldgrysp4iscd1xnrfdcgdhygfzhhsv0a0lrm40xa";
     };
     dependencies = [];
 
@@ -2134,22 +2179,22 @@ rec {
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2016-09-21";
+    name = "vim-gista-2017-02-20";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "8f27e74bd1f8edb3ca5711864b34cb4c526d9947";
-      sha256 = "0zymx6ww6yc9h06k373z7mbv07jmi66zv1cm15ip2qnik1nr80p7";
+      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
+      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
     };
     dependencies = [];
 
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-02-06";
+    name = "vim-gitgutter-2017-02-22";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143";
-      sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1";
+      rev = "1c034be0d31168c8f4770ef7b69adb67d00d6f3d";
+      sha256 = "1wj084frahj80h1nkllmpf0qj06d96a5m5qclnd3fc2aqclcimx0";
     };
     dependencies = [];
 
@@ -2200,33 +2245,33 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-02-10";
+    name = "vim-signify-2017-03-02";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "a2c28f654087735a276ec7c1f558b782db5488a5";
-      sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp";
+      rev = "b4c516cd63f04c08bfc6a8eb27a971702d849f33";
+      sha256 = "108vlkrv00b6ldj4r972k3z2a3dfcs1z4788dhnx81k25rax42k4";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-02-07";
+    name = "vim-snippets-2017-03-01";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "b8c340daf084f243a487f8853a0984504909dfda";
-      sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q";
+      rev = "9a2379be7698ff83985eebb394b7a9f99560a77f";
+      sha256 = "0c7gicl9m05m7wb846vbd1i7ginkm5k4rvcvcvhc9x7krn5qg64q";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2016-12-10";
+    name = "vim-webdevicons-2017-02-25";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "93387d7fba06f8ba7ee52dc00d08919f8a35341d";
-      sha256 = "1zxw0mbb5a54kc31qfwi1d9gylagsa9jnbsfghnsminx32ch8jcd";
+      rev = "d246037d0da70d80be9699487a95f913316a4c76";
+      sha256 = "0bps527fhhgp06yswxx6rdmrycckm4hzacmrwzll85xg8cqcjwh2";
     };
     dependencies = [];
 
@@ -2244,11 +2289,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-01-30";
+    name = "vimwiki-2017-03-01";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4";
-      sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z";
+      rev = "56cb06e73e9850e60b6eb53bad8bb98ded1ab872";
+      sha256 = "1s9nppmgkr5v6ljc918qivlyzp491vnyn3cc4k3cqd1ly2ymxv48";
     };
     dependencies = [];
 
@@ -2266,11 +2311,11 @@ rec {
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2016-10-22";
+    name = "vundle-2017-02-24";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "88688fe453038ac1ac26e31646cfbec50fca2fb7";
-      sha256 = "1i46xjn0zklcrdp4yf856jpl7lwf14x4y67qhnc41q12rcvimvr5";
+      rev = "f6cc06238d5ac888ddfc514f80392f44cb2e21ac";
+      sha256 = "00qd5nalac7q83dx779547s6dwn952adj2w3j1sgdgaybjwmsrl2";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b12983b4bc09a..f5f3f9556577b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -33,6 +33,7 @@
 "github:bbchung/clighter8"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
+"github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
@@ -89,6 +90,7 @@
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:plasticboy/vim-markdown"
+"github:python-mode/python-mode"
 "github:racer-rust/vim-racer"
 "github:raichoo/purescript-vim"
 "github:rhysd/vim-grammarous"
@@ -109,6 +111,7 @@
 "github:tex/vimpreviewpandoc"
 "github:thinca/vim-quickrun"
 "github:tomasr/molokai"
+"github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
 "github:tpope/vim-repeat"
 "github:tpope/vim-speeddating"
@@ -121,6 +124,7 @@
 "github:vim-pandoc/vim-pandoc-syntax"
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/Rename"
+"github:vim-scripts/ReplaceWithRegister"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/align"
@@ -131,6 +135,7 @@
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
 "github:xolox/vim-easytags"
+"github:xolox/vim-misc"
 "github:zchee/deoplete-jedi"
 "github:zchee/deoplete-go"
 "goyo"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 4b754f15c0fa4..141dde9276262 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -254,7 +254,7 @@ let
           let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager'
           if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload')
             " checkout VAM
-            execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager '
+            execute '!git clone --depth=1 https://github.com/MarcWeber/vim-addon-manager '
                 \       shellescape(c.plugin_root_dir.'/vim-addon-manager', 1)
           endif
         endif
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
index 376b7c674d6ce..89a96133fba5a 100644
--- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
+++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
@@ -134,10 +134,10 @@ fun! nix#AddNixDerivation(opts, cache, name, ...) abort
     if len(list) > 0
       if '' != list[2]
         let name = list[2]
-        let repository = { 'type': 'git', 'owner': list[1], 'repo': list[2], 'url': 'git://github.com/'.list[1].'/'.list[2] }
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': list[2], 'url': 'https://github.com/'.list[1].'/'.list[2] }
       else
         let name = list[1]
-        let repository = { 'type': 'git', 'owner': list[1], 'repo': 'vim-addon-'.list[1], 'url': 'git://github.com/'.list[1].'/vim-addon-'.list[1] }
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': 'vim-addon-'.list[1], 'url': 'https://github.com/'.list[1].'/vim-addon-'.list[1] }
       endif
     else
       let repository = get(g:vim_addon_manager.plugin_sources, a:name, {})
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 0e5d466e16ad4..0768f5a12e09c 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "khd-${version}";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
     rev = "v${version}";
-    sha256 = "02v2bq095h1ylx700kayakg7f9p43vrz6p9ry3g7lq37s6apgm8h";
+    sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr";
   };
 
   buildInputs = [ Carbon Cocoa ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A simple modal hototkey daemon for OSX";
+    description = "A simple modal hotkey daemon for OSX";
     homepage = https://github.com/koekeishiya/khd;
     downloadPage = https://github.com/koekeishiya/khd/releases;
     platforms = platforms.darwin;
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 0d62f99e1e774..08c729baaaf7d 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170208";
+  version = "20170305";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0bqwb2xwwihyj8sw084qpyi8d4xx9sn7jlza6hfc57qnj4dha76w";
+    sha256 = "0di64pqs0snbfmncbarvyb9dr3bpv203pqxn5h5i39400jvqwyb6";
   };
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index fea41affe2c45..e67e54f7b439b 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,17 +1,23 @@
-{stdenv, fetchurl, perl, python}:
-# Perl and Python required by the test suite.
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
+  version = "2.5.0";
 
-  version = "2.3.1";
+  src = fetchFromGitHub {
+    owner = "dmtcp";
+    repo = "dmtcp";
+    rev = version;
+    sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
+  };
 
-  buildInputs = [ perl python ];
+  dontDisableStatic = true;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/dmtcp/dmtcp-${version}.tar.gz";
-    sha256 = "1f83ae112e102d4fbf69dded0dfaa6daeb60c4c0c569297553785a876e95ba15";
-  };
+  postPatch = ''
+    substituteInPlace configure \
+      --replace '#define ELF_INTERPRETER "$interp"' \
+                "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
+  '';
 
   preConfigure = ''
     substituteInPlace src/dmtcp_coordinator.cpp \
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9b0cd003072b1..8acf67d3dd15c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -121,6 +121,7 @@ with stdenv.lib;
   IP_VS_PROTO_ESP y
   IP_VS_PROTO_AH y
   IP_DCCP_CCID3 n # experimental
+  IP_MULTICAST y
   IPV6_ROUTER_PREF y
   IPV6_ROUTE_INFO y
   IPV6_OPTIMISTIC_DAD y
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1f5c07f9b0948..fffe524b11f35 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.13";
-      grrev  = "201702270729";
-      sha512 = "07sbgvksjrvawisq4knjq34022blgg8f14blv22d37siplyamydarsykai5dks5573k61dv9q027jigxyamy50h0fd5ic8qpdp0y30c";
+      grrev  = "201703052141";
+      sha512 = "197n21975ifp2nkpl6d7v3r9fllw2l7pyd2h8cic7dnigy65a5jqx1sxhqryivijx3czf6hj173q999j218ihlg15p6a7aqjhkh90kf";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index ceaed205db96a..2555ce5c6c319 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, help2man, fuse, pam }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-${version}";
-  version = "2.0.4";
+  # use unstable because it fixed some serious crashes,
+  # stable should be reconsidered in future
+  name = "lxcfs-unstable-2017-03-02";
 
-  src = fetchurl {
-    url = "https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz";
-    sha256 = "0pfrsn7hqccpcnwg4xk8ds0avb2yc9gyvj7bk2bl90vpwsm35j7y";
+  src = fetchFromGitHub {
+    owner = "lxc";
+    repo = "lxcfs";
+    sha256 = "1say5bf6gknzs0aymvrg2xiypc311gcdcfdmvb2vnz058pmianq9";
+    rev = "4a6707e130b4b65a33606ebc18a95ec471f4bf40";
   };
 
-  nativeBuildInputs = [ pkgconfig help2man ];
+  nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
   buildInputs = [ fuse pam ];
 
   configureFlags = [
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 2d3a74e18aa09..ceb6e8c86c013 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -11,9 +11,9 @@ let
               scalaVersion = "2.11";
               sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
             };
-    "0.10" = { kafkaVersion = "0.10.1.1";
-               scalaVersion = "2.11";
-               sha256 = "0a89dyvisa5vilfa0h0ljrb00l5n9h730yxy1058z7a2g43q0h0m";
+    "0.10" = { kafkaVersion = "0.10.2.0";
+               scalaVersion = "2.12";
+               sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1";
              };
   };
 in
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 0c9f72f66d5d4..581dbc3b1f767 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, pkgs, lib, fetchurl, fetchgit,
+{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, binutils, newt,
   lua, speex,
-  srtp, wget, curl,
-  subversionClient
+  srtp, wget, curl
 }:
 
 let
@@ -11,7 +10,7 @@ let
     inherit version;
     name = "asterisk-${version}";
 
-    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ];
+    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl ];
 
     patches = [
       # We want the Makefile to install the default /var skeleton
@@ -36,7 +35,7 @@ let
     preConfigure = ''
       mkdir externals_cache
     '' + lib.concatStringsSep "\n"
-        (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + ''
+        (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + ''
 
       chmod -w externals_cache
     '';
@@ -50,7 +49,6 @@ let
     preBuild = ''
       make menuselect.makeopts
       substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
-      ./contrib/scripts/get_mp3_source.sh
     '';
 
     postInstall = ''
@@ -71,6 +69,12 @@ let
     sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb";
   };
 
+  mp3-202 = fetchsvn {
+    url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
+    rev = 202;
+    sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
+  };
+
 in
 {
 
@@ -79,6 +83,7 @@ in
     sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd";
     externals = {
       "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "addons/mp3" = mp3-202;
     };
   };
 
@@ -87,6 +92,7 @@ in
     sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj";
     externals = {
       "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "addons/mp3" = mp3-202;
     };
   };
 
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 340e376e9ed6f..a9b1333fb0fa6 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.4";
+  version = "3.2.5";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0a14wr2yal9q5vlwadyki9w35bn4f3r7r5w3zynp4f7460lfapmf";
+    sha256 = "1vgn3k57pgj4prndhjshzkwchj9igpagmmlrbkvqdj4axw762i9g";
   };
 
   buildInputs = with pkgs; [
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 82a5604bed848..52596d6e0795c 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -2,14 +2,14 @@
 
 let
   bootstrap = fetchurl {
-    url = "https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/1.2.0.1/meteor-bootstrap-os.linux.x86_64.tar.gz";
-    sha256 = "0jc516qyig7f5a8ns4y6d9031f0ww2sd90n837kz6x97nin7655s";
+    url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz";
+    sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz";
   };
 in
 
 stdenv.mkDerivation rec {
   name = "meteor-${version}";
-  version = "1.2.0.1";
+  version = "1.4.2.3";
 
   dontStrip = true;
 
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     for p in $(find $out/packages -name '*.node'); do
       patchelf \
         --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \
-        $p
+        $p || true
     done
 
     # Meteor needs an initial package-metadata in $HOME/.meteor,
diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix
new file mode 100644
index 0000000000000..b467fcfdff5b3
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/2.2.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "2.2.9";
+  sha256 = "1wc2l8l7i43r0yc6qqi3wj4pm0969kjkh2pgx80wglzxm7275hv5";
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index eee912d1b8c35..49e71614bf93e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2364,11 +2364,11 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.19.1";
+    name = "xorg-server-1.19.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2;
-      sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2;
+      sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 310bebd382ade..c7a4ff20a73d1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -394,6 +394,11 @@ in
     let
       attrs = with args;
         if (args.abiCompat == null) then attrs_passed
+            # All this just for 1.19.2, as the tarball is incorrectly autotoolized.
+            // {
+              nativeBuildInputs = [ utilmacros fontutil ];
+              preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi";
+            }
         else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index eadae7ad3c456..943707c0c5eea 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -3,7 +3,8 @@
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
-, gst_all_1, pulseaudioLight, gobjectIntrospection }:
+, gst_all_1, pulseaudioLight, gobjectIntrospection
+, pam }:
 
 with lib;
 
@@ -36,34 +37,29 @@ in buildPythonApplication rec {
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-libav
 
+    pam
+
     makeWrapper
   ];
 
   propagatedBuildInputs = with python2Packages; [
     pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
-    netifaces numpy websockify pygobject3 gst-python
+    netifaces numpy websockify pygobject3 gst-python pam
   ];
 
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
+    substituteInPlace xpra/server/auth/pam.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
   '';
   setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
 
-  preInstall = ''
-    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
-    ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data_files/d' setup.py
-  '';
-
   postInstall = ''
     wrapProgram $out/bin/xpra \
-      --set FONTCONFIG_FILE "${fontsConf}" \
-      --set XPRA_LOG_DIR "\$HOME/.xpra" \
       --set XPRA_INSTALL_PREFIX "$out" \
       --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
       --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} \
+      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib  \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]}
   '';
 
   preCheck = "exit 0";
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 5cb7bf2c62fc2..89bb816aa579a 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -1,27 +1,28 @@
 { stdenv, fetchFromGitHub, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.3";
   name = "undmg-${version}";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "undmg";
-    rev = "refs/tags/v${version}";
-    sha256 = "0w9vwvj9zbpsjkg251bwv9y10wjyjmh54q2piklz74w64rlbqblr";
-    name = "undmg-${version}";
+    rev = "v${version}";
+    sha256 = "1pxqw92h2w75d4jwiihwnkhnsfk09cddh3flgrqwh9r3ry14fgbb";
+    
   };
 
   buildInputs = [ zlib bzip2 ];
 
   setupHook = ./setup-hook.sh;
 
-  installFlags = "PREFIX=\${out}";
+  makeFlags = "PREFIX=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/matthewbauer/undmg;
     description = "Extract a DMG file";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ matthewbauer lnl7 ];
   };
 }
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index fae72e5fcd842..c47242503c9cb 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   name = "unshield-${version}";
-  version = "1.3";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "twogood";
     repo = "unshield";
     rev = version;
-    sha256 = "0cg84jr0ymvi8bmm3lx5hshhgm33vnr1rma1mfyqkc065c7gi9ja";
+    sha256 = "07lmh8vmrbqy4kd6zl5yc1ar3bg33w5cymlzwfijy6arg77hjgq9";
   };
 
-  patches = [
-    # Fix build in separate directory
-    (fetchpatch {
-      url = "https://github.com/twogood/unshield/commit/07ce8d82f0f60b9048265410fa8063298ab520c4.patch";
-      sha256 = "160pbk2r98lv3vd0qxsxm6647qn5mddj37jzfmccdja4dpxhxz2z";
-    })
-  ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib openssl ];
 
   meta = with stdenv.lib; {
     description = "Tool and library to extract CAB files from InstallShield installers";
-    homepage = https://github.com/twogood/unshield;
+    homepage = "https://github.com/twogood/unshield";
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index bbec851b25cc9..9378585d8b2f1 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz";
   };
 
+  preConfigure = ''
+    intltoolize -f
+  '';
+
   buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ];
   propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
   pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ];
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 34946355d1089..9827cc4724305 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, autoconf, automake, alsaLib, gtk3, glibc, libnotify, libX11 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "pnmixer-${version}";
-  version = "0.7";
+  version = "0.7.1-rc1";
 
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
     rev = "v${version}";
-    sha256 = "077l28qhr82ifqfwc2nqi5q1hmi6dyqqbhmjcsn27p4y433f3rpb";
+    sha256 = "0ns7s1jsc7fc3fvs9m3xwbv1fk1410cqc5w1cmia1mlzy94r3r6p";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake intltool ];
+  nativeBuildInputs = [ cmake pkgconfig gettext ];
 
-  buildInputs = [ alsaLib gtk3 glibc libnotify libX11 ];
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  buildInputs = [ alsaLib gtk3 glib libnotify libX11 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/nicklan/pnmixer;
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index b27d5c834b1bc..476c42504a262 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.9";
+  version = "1.0.10";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1ciwp9yilcibk0x82y5nn8ps95jrm8rxvff8mjrlp7a2w100i1im";
+    sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index a0306d8d51a91..7e3c2cda48b86 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     # Explicit --docdir= is required for on-line help to work:
-    "--docdir=$out/share/doc"
+    "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
   ] ++ stdenv.lib.optional (builtins.elem stdenv.system
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 73db9e2ca203d..b7d7a07a084f0 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cmake, fuse }:
+{ stdenv, fetchFromGitHub, cmake, fuse }:
 
 stdenv.mkDerivation rec {
   name = "unionfs-fuse-${version}";
   version = "1.0";
 
-  src = fetchurl {
-    url = "https://github.com/rpodgorny/unionfs-fuse/archive/v${version}.tar.gz";
-    sha256 = "02fcrjb06lxkxpk4l8arsqmai807sray24lj2nrasqaacg80ps1f";
+  src = fetchFromGitHub {
+    owner = "rpodgorny";
+    repo = "unionfs-fuse";
+    rev = "v${version}";
+    sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf";
   };
 
   patches =
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 8e086f7386f55..1dfe6b2450610 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,9 +1,9 @@
-{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, qt55 }:
+{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
 
 symlinkJoin {
   name = "fcitx-with-plugins-${fcitx.version}";
 
-  paths = [ fcitx fcitx-configtool qt55.fcitx-qt5 ] ++ plugins;
+  paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index cdf2a4aca86cb..67e5a7848b2e8 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.26.1";
+  name = "gparted-0.28.1";
 
   src = fetchurl {
-    sha256 = "1h9d6x335wxpm49yphzm9n1hbh2hcg0p2rphv76mrvsss91bcm1g";
+    sha256 = "0cyk8lpimm6wani8khw0szwqkgw5wpq2mfnfxkbgfm2774a1z2bn";
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 68ee65159954e..da7af7ef66f61 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.1";
+  version = "2.2.2";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "19kwg6yn2bx9nk813d7z1mv5j375iy2qvpcvwm8hp242g13j5cy7";
+    sha256 = "1d6fbyc9m2dkmlv03w3b1n8vq6sga888ag1k55mq3rgn4ba1kx26";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 452b6c981ff9f..5fcde9bdaeb76 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,19 +1,30 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.9";
   name    = "grc-${version}";
+  version = "1.10.1";
 
-  src = fetchurl {
-    url    = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz";
-    sha256 = "0nsgqpijhpinnzscmpnhcjahv8yivz0g65h8zsly2md23ibnwqj1";
+  src = fetchFromGitHub {
+    owner  = "garabik";
+    repo   = "grc";
+    rev    = "v${version}";
+    sha256 = "1c2ndnbyznb608h3s99fbcyh4qb1ccipxm15lyszrrks0w2llbah";
   };
 
+  buildInputs = with python3Packages; [ wrapPython makeWrapper ];
+
   installPhase = ''
-    sed -i s%/usr%% install.sh
-    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
-    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
-    ./install.sh "$out"
+    ./install.sh "$out" "$out"
+
+    for f in $out/bin/* ; do
+      patchPythonScript $f
+      substituteInPlace $f \
+        --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \
+        --replace "'/etc/grc.conf'"   "'$out/etc/grc.conf'" \
+        --replace "'/usr/share/grc/'" "'$out/share/grc/'"
+      wrapProgram $f \
+        --prefix PATH : $out/bin
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index eef1ac472280c..7a70f2bdbff33 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -12,12 +12,21 @@ let
     "x86_64-linux".target = "i386";
   };
 
-  efiSystems = {
+  efiSystemsBuild = {
     "i686-linux".target = "i386";
     "x86_64-linux".target = "x86_64";
+    "aarch64-linux".target = "aarch64";
   };
 
-  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
+  # For aarch64, we need to use '--target=aarch64-efi' when building,
+  # but '--target=arm64-efi' when installing. Insanity!
+  efiSystemsInstall = {
+    "i686-linux".target = "i386";
+    "x86_64-linux".target = "x86_64";
+    "aarch64-linux".target = "arm64";
+  };
+
+  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
   version = "2.x-2015-11-16";
@@ -89,11 +98,11 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-bash-completion.patch ];
 
   configureFlags = optional zfsSupport "--enable-libzfs"
-    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
+    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ];
 
   # save target that grub is compiled for
   grubTarget = if efiSupport
-               then "${efiSystems.${stdenv.system}.target}-efi"
+               then "${efiSystemsInstall.${stdenv.system}.target}-efi"
                else if inPCSystems
                     then "${pcSystems.${stdenv.system}.target}-pc"
                     else "";
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index 77149a1799003..5b4044f1891c7 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
-  hardeningDisable = [ "stackprotector" "pic" ];
+  hardeningDisable = [ "fortify" "stackprotector" "pic" ];
 
   buildFlags = "memtest.bin";
 
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index 654ba4c1795cd..03c1273a7d32f 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -1,23 +1,27 @@
 { stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
-  version = "0.15.6";
+  version = "0.16";
   name = "scanmem-${version}";
+ 
   src = fetchFromGitHub {
     owner  = "scanmem";
     repo   = "scanmem";
     rev    = "v${version}";
-    sha256 = "16cw76ji3mp0sj8q0sz5wndavk10n0si1sm6kr5zpiws4sw047ii";
+    sha256 = "131rx6cpnlz2x36r0ry80gqapmxpz2qc3h0040xhvp7ydmd4fyjd";
   };
-  buildInputs = [ autoconf automake intltool libtool readline ];
+
+  nativeBuildInputs = [ autoconf automake intltool libtool ];
+  buildInputs = [ readline ];
+  
   preConfigure = ''
     ./autogen.sh
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/scanmem/scanmem";
     description = "Memory scanner for finding and poking addresses in executing processes";
-    maintainers = [ stdenv.lib.maintainers.chattered  ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ maintainers.chattered  ];
+    platforms = with platforms; linux ++ darwin;
+    license = licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index c7c389a3733f1..83c384e5ec0a4 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "smc-6.3.0";
+  name = "smc-6.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/smc/smc/6_3_0/smc_6_3_0.tgz";
-    sha256 = "0arzi8kc4vycp1ccf0v87p08cdpylwhx4za2pzvp08vkfwi8zc7z";
+    url = "mirror://sourceforge/project/smc/smc/6_6_0/smc_6_6_0.tgz";
+    sha256 = "14lf286dslm7ymkr4my1xgjvwvqc9181mwkfr65ab49cxl0q85wz";
   };
 
   # Prebuilt Java package.
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index a79f38464746c..24a7e8d3f7143 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ alsaLib libjack2 ncurses ];
 
-  configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ];
+  configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ];
 
   NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
 
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index 39a7dc25c0949..5cf29c5cd4284 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tldr-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "1dyvmxdxm92bfs5i6cngk8isa65qp6xlpim4yizs5rnm0rynf9kr";
-    rev = "v${version}";
-    repo = "tldr-cpp-client";
     owner = "tldr-pages";
+    repo = "tldr-cpp-client";
+    rev = "v${version}";
+    sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6";
   };
 
   buildInputs = [ curl clang libzip ];
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index baadd6f30646b..f02c41484818f 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
-    owner  = "nviennot";
+    owner  = "tmate-io";
     repo   = "tmate";
     rev    = version;
-    sha256 = "1w3a7na0yj1y0x24qckc7s2y9xfak5iv6vyqrd0iibn3b7dxarli";
+    sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r";
   };
 
   buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ];
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 2a4dae87e1858..40fc72a0d7131 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,33 +1,29 @@
-{ stdenv, fetchurl, substituteAll, coreutils, python2, python2Packages }:
+{ stdenv, fetchFromGitHub, coreutils
+, python3, python3Packages, substituteAll }:
 
 assert stdenv.isLinux;
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
-  version = "0.12.9.14";
+  version = "0.17.1.14";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz";
-    sha256 = "10idvzrlppj632pw6mpk1zy9arn1x4lly4d8nfy9cz4zqv06lhvh";
+  src = fetchFromGitHub {
+    owner = "andreafrancia";
+    repo = "trash-cli";
+    rev = "${version}";
+    sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
   };
 
-
   patches = [
-    # Fix paths.
     (substituteAll {
       src = ./nix-paths.patch;
       df = "${coreutils}/bin/df";
-      python = "${python2}/bin/${python2.executable}";
       libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
     })
-
-    # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3
-    # to fix failing test case.
-    ./fix_should_output_info_for_multiple_files.patch
   ];
 
-  buildInputs = with python2Packages; [ nose mock ];
+  buildInputs = with python3Packages; [ nose mock ];
 
   checkPhase = "nosetests";
 
diff --git a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch
deleted file mode 100644
index 17947be74824f..0000000000000
--- a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4f45a37a390d7c844dd9c9b58fff7259a77ffff9 Mon Sep 17 00:00:00 2001
-From: Javi Merino <merino.jav@gmail.com>
-Date: Sun, 31 Aug 2014 05:45:17 -0700
-Subject: [PATCH] Fix should_output_info_for_multiple_files
-
-Test should_output_info_for_multiple_files fails because the output is
-not in the same order as the input.  Add assert_equal_any_order() to
-the OutputCollector, which sorts the expected and actual lines so that
-the output matches even if the order in which they are shown in
-trash-list is different.
----
- integration_tests/describe_trash_list.py | 8 +++++---
- integration_tests/output_collector.py    | 8 ++++++++
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/integration_tests/describe_trash_list.py b/integration_tests/describe_trash_list.py
-index 6dd8d30..3489a22 100644
---- a/integration_tests/describe_trash_list.py
-+++ b/integration_tests/describe_trash_list.py
-@@ -73,9 +73,9 @@ def should_output_info_for_multiple_files(self):
- 
-         self.user.run_trash_list()
- 
--        self.user.should_read_output( "2000-01-01 00:00:01 /file1\n"
--                                      "2000-01-01 00:00:02 /file2\n"
--                                      "2000-01-01 00:00:03 /file3\n")
-+        self.user.should_read_output_any_order( "2000-01-01 00:00:01 /file1\n"
-+                                                "2000-01-01 00:00:02 /file2\n"
-+                                                "2000-01-01 00:00:03 /file3\n")
- 
-     @istest
-     def should_output_unknown_dates_with_question_marks(self):
-@@ -294,6 +294,8 @@ def error(self):
-         raise ValueError()
-     def should_read_output(self, expected_value):
-         self.stdout.assert_equal_to(expected_value)
-+    def should_read_output_any_order(self, expected_value):
-+        self.stdout.assert_equal_any_order(expected_value)
-     def should_read_error(self, expected_value):
-         self.stderr.assert_equal_to(expected_value)
-     def output(self):
-diff --git a/integration_tests/output_collector.py b/integration_tests/output_collector.py
-index 06dc002..7f3704f 100644
---- a/integration_tests/output_collector.py
-+++ b/integration_tests/output_collector.py
-@@ -9,6 +9,14 @@ def write(self,data):
-         self.stream.write(data)
-     def assert_equal_to(self, expected):
-         return self.should_be(expected)
-+    def assert_equal_any_order(self, expected):
-+        actual_sorted = sorted(self.stream.getvalue().splitlines(1))
-+        actual = "".join(actual_sorted)
-+
-+        expected_sorted = sorted(expected.splitlines(1))
-+        expected = "".join(expected_sorted)
-+
-+        assert_equals_with_unidiff(expected, actual)
-     def should_be(self, expected):
-         assert_equals_with_unidiff(expected, self.stream.getvalue())
-     def should_match(self, regex):
diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch
index 29412027b7a50..d7b485eec158a 100644
--- a/pkgs/tools/misc/trash-cli/nix-paths.patch
+++ b/pkgs/tools/misc/trash-cli/nix-paths.patch
@@ -1,18 +1,5 @@
-diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py
---- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py	2014-12-23 10:10:43.808470486 +0100
-+++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py	2014-12-23 10:11:02.688517975 +0100
-@@ -9,7 +9,7 @@ from pprint import pprint
- @istest
- class WhenNoArgs:
-     def setUp(self):
--        process = Popen(['python', 'trashcli/rm.py'],
-+        process = Popen(['@python@', 'trashcli/rm.py'],
-                     env={'PYTHONPATH':'.'},
-                     stdin=None,
-                     stdout=PIPE,
-diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py
---- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
-+++ trash-cli-0.12.9.14/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
+--- a/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
++++ a/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
 @@ -12,7 +12,7 @@ def mount_points_from_getmnt():
  
  def mount_points_from_df():
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index e539c0e1e0252..1042c5794bdf8 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, harfbuzz, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3";
+  version = "1.6";
   name = "ttfautohint-${version}";
   
   src = fetchurl {
     url = "mirror://savannah/freetype/${name}.tar.gz";
-    sha256 = "01719jgdzgf0m4fzkkij563iksr40c7wydv1yq8ygpxjj0vs17y3";
+    sha256 = "1r8vsznvh89ay35angxp3w1xljxjlpcv9wdjyn7m61n323vi6474";
   };
-
-  buildInputs = [ harfbuzz pkgconfig qt4 ];
+  
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ harfbuzz qt4 ];
 
   meta = with stdenv.lib; {
     description = "An automatic hinter for TrueType fonts";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.freetype.org/ttfautohint/;
     license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu ndowens ];
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index eb1a861db9282..113359a8bcea5 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchFromGitHub, ncurses }:
+{ stdenv, fetchFromGitHub, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "tty-clock-${version}";
-  version = "0.1";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "xorg62";
     repo = "tty-clock";
-    rev = "v0.1";
-    sha256 = "14h70ky5y9nb3mzhlshdgq5n47hg3g6msnwbqd7nnmjzrw1nmarl";
+    rev = "v${version}";
+    sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
   };
-
+  
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
-  preInstall = ''
-    sed -i 's@/usr/local/@$(out)/@' Makefile
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/xorg62/tty-clock;
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index ab7ab2b68c341..45149cafc9d27 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ttylog-${version}";
-  version = "0.26";
+  version = "0.29";
 
   src = fetchFromGitHub {
     owner = "rocasa";
     repo = "ttylog";
     rev = version;
-    sha256 = "1xvqch1dwpl2d89n9cjcxhqbpvm50fspj5yn883wbii6dpg62p84";
+    sha256 = "035i9slmdgds5azwxqwp6skxykvaq3mq4jckvm49fng8jq09z7zr";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index cf3b75be3f684..0e7cd49b543dc 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -5,10 +5,10 @@ with pythonPackages;
 buildPythonPackage rec {
   namePrefix = "";
   name = "wakatime-${version}";
-  version = "6.0.1";
+  version = "7.0.4";
 
   src = fetchFromGitHub {
-    sha256 = "0bkzchivkz39jiz78jy7zkpsg6fd94wd7nsmrnijvxb3dn35l7l2";
+    sha256 = "1cddabx9x11d2nxxcqlf4piysjnpfici0n5qy3n9gw81asz1djhf";
     rev = version;
     repo = "wakatime";
     owner = "wakatime";
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index ddcf6061ed8b4..a07c1507218d5 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
    name = "xdo-${version}";
-   version = "0.5.3";
+   version = "0.5.5";
 
    src = fetchFromGitHub {
      owner = "baskerville";
      repo = "xdo";
      rev = version;
-     sha256 = "0gfrziil6xw6pkr8k8rn56ihy0333v6dlsw3dckib9hm7ikj0k2f";
+     sha256 = "17i7ym4jrrbsiqs0jnm6k49hp9qn32hswad4j0lavwgv4wawachz";
    };
-
-   prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+   
+   makeFlags = "PREFIX=$(out)";
 
    buildInputs = [ libxcb xcbutilwm ];
 
-   meta = {
+   meta = with stdenv.lib; {
      description = "Small X utility to perform elementary actions on windows";
-     inherit (src.meta) homepage;
-     maintainers = [ stdenv.lib.maintainers.meisternu ];
-     license = stdenv.lib.licenses.bsd2;
-     platforms = stdenv.lib.platforms.linux;
+     homepage = "https://github.com/baskerville/xdo";
+     maintainers = with maintainers; [ meisternu ];
+     license = licenses.bsd2;
+     platforms = platforms.linux;
    };
 }
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 5573f7e17ea90..d9f87a8d89406 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     # The configure scripts really don't like looking in PATH at all...
     export AWK=$(type -P awk)
-    export ECHO=$(type -P sort)
+    export ECHO=$(type -P echo)
     export LIBTOOL=$(type -P libtool)
     export MAKE=$(type -P make)
     export SED=$(type -P sed)
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index 03c8949bb459f..e4d5bf7abdd09 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xiccd-${version}";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "agalakhov";
     repo = "xiccd";
     rev = "v${version}";
-    sha256 = "17p3vngmmjk52r5p8y41s19nwp7w25bgff68ffd50zdlicd33rsy";
+    sha256 = "0dhv913njzm80g5lwak5znmxllfa6rrkifwja8vk133lyxnarqra";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 2d942e0147545..dbd042ec88587 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.27";
+  version = "2017.03.07";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0pcrr1bxxw3aar681gj8n5ms69j54namjlw5bj88crs0nm69kspk";
+    sha256 = "19acz9m3gazd1ims4l9a9ni1p7jw8z4y0ncqn99xlx9kna8ryjnv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -51,6 +51,6 @@ buildPythonApplication rec {
     '';
     license = licenses.publicDomain;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu ];
+    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ];
   };
 }
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index dbf0b9af8abc3..71c9a113298fd 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-${version}";
-  version = "1.17.3";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
-    sha256 = "034wmwinxmngji1ly8nm9q4hg194iwk164y5rw0whnf69ycc6bs8";
+    sha256 = "1bc2z6y2x7bbqn7ink2dg3wrgqzlcq2zxxg0cdcxy6jm7c9kwcyg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 7c8a30971f72c..1f34952ad24be 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -5,8 +5,8 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "driftnet-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "8d47fd563a06122d4a6f9b9b9d27ba3d635148c0";
+  name = "driftnet-${version}";
+  version = "1.1.5";
 
   buildInputs = [
     pkgconfig libpcap libjpeg libungif libpng giflib
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "deiv";
     repo = "driftnet";
-    sha256 = "1i9fqbsfrhvr36r17v3ydr1bqsszns8gyjbvlfqbdd4l5l5n6amg";
+    rev = "0ae4a91";
+    sha256 = "1sagpx0mw68ggvqd9c3crjhghqmj7391mf2cb6cjw1cpd2hcddsj";
   };
 
   meta = {
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 5eac65a009a75..691b93844a029 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,17 +1,23 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "4.53.0";
+  version = "4.54.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "1awjdxiq3d25h10h32a7h2wxbkgvgvsnicp5xwx4p8mm6gz9c998";
+    sha256 = "0r9s91zrdm6xklnj1fwzz74cxhkbmrgrrp86n62qgijkafa5fmnl";
   };
 
   doCheck = false;
 
+  postPatch = ''
+    # getmail spends a lot of effort to build an absolute path for
+    # documentation installation; too bad it is counterproductive now
+    sed -e '/datadir or prefix,/d' -i setup.py
+  '';
+
   meta = {
     description = "A program for retrieving mail";
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ];
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 7d9c00ecaaf34..1b917019662a6 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl zlib ];
 
-  # TODO: make it work on darwin/bsd as well
+  # TODO: make it work on bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else "linux2628"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes"
+    export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux2628" else "generic"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes ${stdenv.lib.optionalString stdenv.isDarwin "CC=cc USE_KQUEUE=1"}"
   '';
 
   meta = {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index 4a756711e8ee2..c7d06274bea0e 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "horst-${version}";
-  version = "git-2016-03-15";
+  version = "5.0";
 
   src = fetchFromGitHub {
     owner = "br101";
     repo = "horst";
-    rev = "9d5c2f387607ac1c174b59497557b8985cdb788b";
-    sha256 = "0a4ixc9xbc818hw7rai24i1y8nqq2aqxqd938ax89ik4pfd2w3l0";
+    rev = "version-${version}";
+    sha256 = "0m7gc6dj816z8wyq5bdkqj7fw6rmxaah84s34ncsaispz2llva1x";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
new file mode 100644
index 0000000000000..fb50ddc9eb4e7
--- /dev/null
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "httplab-${version}";
+  version = "0.1.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/gchaincl/httplab";
+
+  src = fetchFromGitHub {
+    owner = "gchaincl";
+    repo = "httplab";
+    inherit rev;
+    sha256 = "19d0aasaxayvw25m9n2gahyq590dwym7k0fng8pqvrgc2mpl0ncw";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gchaincl/httplab;
+    description = "Interactive WebServer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
+}
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index a92c343285798..3a6e9b625b879 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, perl }:
 
 stdenv.mkDerivation rec {
   name = "inetutils-1.9.4";
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
   };
 
-  buildInputs = [ ncurses /* for `talk' */ ];
+  patches = [ ./whois-Update-Canadian-TLD-server.patch ];
+
+  buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ];
 
   configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
 
diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
new file mode 100644
index 0000000000000..d63d4e29daf00
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
@@ -0,0 +1,27 @@
+From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001
+From: Mats Erik Andersson <gnu@gisladisker.se>
+Date: Thu, 2 Mar 2017 15:38:38 +0100
+Subject: [PATCH] whois: Update Canadian TLD server.
+Content-Type: text/plain; charset=utf-8
+
+---
+ ChangeLog           | 8 ++++++++ (OMITTED)
+ whois/tld_serv_list | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/whois/tld_serv_list b/whois/tld_serv_list
+index 056efcf..91697b8 100644
+--- a/whois/tld_serv_list
++++ b/whois/tld_serv_list
+@@ -81,7 +81,7 @@
+ #.bw			# NIC? www.botsnet.bw
+ #.by	NONE		# NIC? http://unibel.by www.open.by
+ .bz	NONE		# http://www.psg.com/dns/bz/
+-.ca	whois.cdnnet.ca
++.ca	whois.cira.ca
+ .cc	whois.nic.cc
+ .cd	WEB http://www.nic.cd/database/cd/
+ #.cf	NONE		# NIC? http://www.socatel.intnet.cf
+-- 
+2.10.0
+
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index d7b7fcb2fdc0b..d6ae4a0e5a946 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.7.3";
+  name = "lftp-${version}";
+  version = "4.7.6";
 
   src = fetchurl {
     urls = [
-      "http://lftp.yar.ru/ftp/${name}.tar.bz2"
+      "https://lftp.tech/ftp/${name}.tar.bz2"
+      "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "06jmc9x86ga67yyx7655zv96gfv1gdm955a7g4afd3bwf6bzfxac";
+    sha256 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,13 +20,11 @@ stdenv.mkDerivation rec {
     "--with-readline=${readline.dev}"
   ];
 
-  postPatch = ''
-    substituteInPlace src/lftp_rl.c --replace 'history.h' 'readline/history.h'
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";
-    homepage = http://lftp.yar.ru/;
+    homepage = http://lftp.tech/;
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 8e82023d50a2a..dcdcf9b734c0b 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -3,20 +3,21 @@
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
-  version = "1.0.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = baseName;
     repo = baseName;
     rev = "v${version}";
-    sha256 = "19nqg7s1034fal8sb2rjssgcpvxh50yidyjhnbfmmi8v3fbvpbwl";
+    sha256 = "17gvr642skz4a23966lckdbrkh6mx31shi8hmakkvi91sa869i30";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    pyopenssl pyasn1 urwid pillow flask click pyperclip blinker
-    construct pyparsing html2text tornado brotlipy requests2
-    sortedcontainers passlib cssutils h2 ruamel_yaml jsbeautifier
-    watchdog editorconfig
+    blinker click certifi construct cryptography
+    cssutils editorconfig h2 html2text hyperframe
+    jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
+    pyparsing pyperclip requests2 ruamel_yaml tornado
+    urwid watchdog brotlipy sortedcontainers
   ];
 
   # Tests fail due to an error with a decorator
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index c82588559dfcd..0fc6d7273eafa 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
+{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkitgtk24x, libsoup, icu
-, withMug ? stdenv.isLinux }:
+, withMug ? false }:
 
 stdenv.mkDerivation rec {
   version = "0.9.18";
@@ -12,9 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
   };
 
+  # as of 0.9.18 2 tests are failing but previously we had no tests
+  patches = [
+    ./failing_tests.patch
+  ];
+
+  # pmccabe should be a checkInput instead, but configure looks for it
   buildInputs = [
-    sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
-    autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
+    sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe
+  ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  doCheck = true;
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
diff --git a/pkgs/tools/networking/mu/failing_tests.patch b/pkgs/tools/networking/mu/failing_tests.patch
new file mode 100644
index 0000000000000..c45834ff2082c
--- /dev/null
+++ b/pkgs/tools/networking/mu/failing_tests.patch
@@ -0,0 +1,18 @@
+diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c
+index 73cbd3f4..46a0b131 100644
+--- a/mu/tests/test-mu-query.c
++++ b/mu/tests/test-mu-query.c
+@@ -753,10 +753,10 @@ main (int argc, char *argv[])
+	g_test_add_func ("/mu-query/test-mu-query-sizes",
+			 test_mu_query_sizes);
+
+-	g_test_add_func ("/mu-query/test-mu-query-dates-helsinki",
+-			 test_mu_query_dates_helsinki);
+-	g_test_add_func ("/mu-query/test-mu-query-dates-sydney",
+-			 test_mu_query_dates_sydney);
++	/* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */
++	/* 		 test_mu_query_dates_helsinki); */
++	/* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */
++	/* 		 test_mu_query_dates_sydney); */
+	g_test_add_func ("/mu-query/test-mu-query-dates-la",
+			 test_mu_query_dates_la);
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix
index 65729d896aabf..f2d4d979ceeb1 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/pkgs/tools/networking/ocproxy/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libevent }:
 
 stdenv.mkDerivation rec {
-  version = "1.50";
+  version = "1.60";
   name = "ocproxy-${version}";
 
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "ocproxy";
     rev = "v${version}";
-    sha256 = "136vlk2svgls5paf17xi1zahcahgcnmi2p55khh7zpqaar4lzw6s";
+    sha256 = "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx";
   };
 
-  buildInputs = [ autoconf automake libevent ];
+  nativeBuildInputs = [ autoconf automake ];
+  buildInputs = [ libevent ];
 
   preConfigure = ''
     patchShebangs autogen.sh
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 7d9062c08db7f..f22ad32aaa4e8 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-3.8.1";
+  name = "openresolv-${version}";
+  version = "3.9.0";
 
   src = fetchurl {
     url = "mirror://roy/openresolv/${name}.tar.xz";
-    sha256 = "0hqxvrhc4r310hr59bwi1vbl16my27pdlnbrnbqqihiav67xfnfj";
+    sha256 = "1f2dccc52iykbpma26fbxzga2l6g4njm3bgaxz4rgdrb4cwlv82i";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index e7f40ade77ea5..8fcdb49b2b1e3 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, perl, ppp, iproute, which }:
 
 stdenv.mkDerivation rec {
-  name = "pptp-1.8.0";
+  name = "pptp-${version}";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pptpclient/${name}.tar.gz";
-    sha256 = "1nmvwj7wd9c1isfi9i0hdl38zv55y2khy2k0v1nqlai46gcl5773";
+    sha256 = "00cj3jqj1hqri856jif4kkzan684qv1cb1zf2amzblvqqnzqq7hb";
   };
 
   patchPhase =
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 6dbd62679939b..dce6d1acb776b 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sstp-client-${version}";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
-    sha256 = "096lw3a881hjqnffms3bl077pjyq77870kjaf83chhjcakc8942z";
+    sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v";
   };
 
   patchPhase =
diff --git a/pkgs/tools/networking/tlspool/configvar-fix.patch b/pkgs/tools/networking/tlspool/configvar-fix.patch
new file mode 100644
index 0000000000000..424fef20dcfd7
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/configvar-fix.patch
@@ -0,0 +1,36 @@
+From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Wed, 1 Mar 2017 15:15:22 +0100
+Subject: [PATCH] fix to
+ https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738
+
+---
+ tool/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tool/Makefile b/tool/Makefile
+index 9a15012..0f655e9 100644
+--- a/tool/Makefile
++++ b/tool/Makefile
+@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto
+ 
+ configvar_CFLAGS = $(tlspool_CFLAGS)
+ configvar_LDFLAGS = $(tlspool_LDFLAGS)
+-configvar_LIBS = $(tlspool_LIBS)
+ 
+ P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1)
+ P11KIT_LIBS   = $(shell pkg-config --libs   p11-kit-1)
+@@ -96,8 +95,8 @@ have_db: have_db.c
+ pgp11_genkey: pgp11_genkey.c
+ 	gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS)
+ 
+-configvar: configvar.c $(configvar_LIBS)
+-	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS)
++configvar: configvar.c
++	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<"
+ 
+ $(tlspool_LIBS):
+ 	$(MAKE) -C ../lib `basename $(tlspool_LIBS)`
+-- 
+2.12.0
+
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
new file mode 100644
index 0000000000000..2a43358a5e1a7
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -0,0 +1,60 @@
+{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11_kit,
+  libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash,
+  python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh,
+  useSystemd ? true, systemd, swig
+}:
+
+let
+  pname = "tlspool";
+  version = "20170123";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromGitHub { 
+    owner = "arpa2";
+    repo = "tlspool";
+    rev = "90cfa0758b02849114ba6373f280a4f2d3e534bf";
+    sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370";
+  };
+
+  propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ];
+  buildInputs = [ unbound pkgconfig unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder
+                  libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ]
+                ++ stdenv.lib.optional useSystemd systemd;
+
+  phases = [ "unpackPhase" "patchPhase" "postPatchPhase" "buildPhase" "installPhase" ]; 
+
+  patches = [ ./fixing-rpath.patch ./configvar-fix.patch ];
+
+  postPatchPhase = ''
+    substituteInPlace etc/tlspool.conf \
+      --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
+      --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
+    substituteInPlace lib/Makefile \
+      --replace "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX)" "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX) SWIG=${swig}/bin/swig"
+  '';
+
+  buildPhase = ''
+    make clean
+    make DESTDIR=$out PREFIX=/ all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/sbin $out/man $out/etc/tlspool/ $out/include/${pname}/pulleyback
+    mkdir -p $out/${python.sitePackages}/tlspool
+    mkdir -p $out/bdb
+    make DESTDIR=$out PREFIX=/ install
+    cp -R etc/* $out/etc/tlspool/
+    cp include/tlspool/*.h $out/include/${pname}
+    cp pulleyback/*.h $out/include/${pname}/pulleyback/
+    cp src/*.h $out/include/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment";
+    license = licenses.bsd2;
+    homepage = https://www.tlspool.org;
+    maintainers = with maintainers; [ leenaars qknight ];
+  };
+}
diff --git a/pkgs/tools/networking/tlspool/fixing-rpath.patch b/pkgs/tools/networking/tlspool/fixing-rpath.patch
new file mode 100644
index 0000000000000..6a434f3e40088
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/fixing-rpath.patch
@@ -0,0 +1,36 @@
+From 8082f050794f771d1afb8e5c3d08862fc633922b Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Wed, 1 Mar 2017 13:12:19 +0100
+Subject: [PATCH] RPATH is back
+ https://github.com/arpa2/tlspool/issues/58#issuecomment-283318767
+
+---
+ tool/Makefile | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/tool/Makefile b/tool/Makefile
+index c1e6ce9..9a15012 100644
+--- a/tool/Makefile
++++ b/tool/Makefile
+@@ -18,9 +18,17 @@ LIBS =
+ 
+ PREFIX = /usr/local
+ 
++DIR := ${CURDIR}
++LIBDIR := ""
++ifndef DESTDIR
++       LIBDIR=$(DIR)/../lib/
++else
++       LIBDIR=$(DESTDIR)/lib
++endif
++
+ tlspool_CFLAGS =
+ tlspool_LIBS = ../lib/libtlspool.so
+-tlspool_LDFLAGS = -L ../lib -ltlspool
++tlspool_LDFLAGS = -L ../lib -ltlspool -Wl,-rpath,$(LIBDIR)
+ 
+ donai_CFLAGS = -DDONAI_ONLY_TEXTPROC
+ donai_SRC = ../src/donai.c
+-- 
+2.11.1
+
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 742ddecf6ddfb..e755507356d7d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -21,7 +21,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "1.12pre")
+      ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
           (aws-sdk-cpp.override {
             apis = ["s3"];
             customMemoryManagement = false;
@@ -112,12 +112,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5060_fa125b9";
+    suffix = "pre5073_1cf4801";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "fa125b9b28bea25a4eeb4d39a71a481563127cb9";
-      sha256 = "1l7prlki3rjw3i119cizqqkpqg4p3hvym103x7hddimwpzwkw756";
+      rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
+      sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
     };
     fromGit = true;
   });
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 672b95dec4502..302a5e251b03b 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4";
   };
 
-  postPatch = ''
-    sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am
-  '';
-
   buildInputs = [
     autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan
     libXt libxslt libiconv docbook_xml_dtd_412
@@ -38,9 +34,11 @@ stdenv.mkDerivation rec {
   ];
 
   installFlags = [
-    "sysconfdir=\${out}/etc"
+    "sysconfdir=$(out)/etc"
   ];
 
+  
+
   meta = with stdenv.lib; {
     description = "Set of libraries and utilities to access smart cards";
     homepage = https://github.com/OpenSC/OpenSC/wiki;
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
new file mode 100644
index 0000000000000..de1796f431d35
--- /dev/null
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, libtool, which }:
+
+stdenv.mkDerivation  rec {
+  pname = "sha1collisiondetection";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "cr-marcstevens";
+    repo = pname;
+    rev = "development-v${version}";
+    sha256 = "09vd5mgclcdx7yq3kwzxy1z7pbxcp0xljfly7hy4ixahmnn290h6";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
+
+  nativeBuildInputs = [ libtool which ];
+
+  meta = with stdenv.lib; {
+    description = "Library and command line tool to detect SHA-1 collision";
+    longDescription = ''
+      This library and command line tool were designed as near drop-in
+      replacements for common SHA-1 libraries and sha1sum. They will
+      compute the SHA-1 hash of any given file and additionally will
+      detect cryptanalytic collision attacks against SHA-1 present in
+      each file. It is very fast and takes less than twice the amount
+      of time as regular SHA-1.
+      '';
+    platforms = platforms.all;
+    maintainers = with maintainers; [ leenaars ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 5f282dd378a5e..42b6024fb2146 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "0399b06f196fbfaebe73b4aeff2e2d65d0dc1901161513d0d6a94f031dcd827e";
+    sha256 = "1xw53zkv5xb9pxa8q84kh505yd6pkavxd12x2fjgqi6s12p2hsgb";
   };
 
   configureFlags = [
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index f546cd8f5ffc6..5de03199fa51a 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -1,58 +1,61 @@
-# I've only worked on this till it compiled and worked. So maybe there are some things which should be done but I've missed
 # restart using 'killall -TERM fcron; fcron -b
 # use convert-fcrontab to update fcrontab files
 
 { stdenv, fetchurl, perl, busybox, vim }:
 
 stdenv.mkDerivation rec {
-  name = "fcron-3.1.2";
+  name = "fcron-${version}";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
-    sha256 = "0p8sn4m3frh2x2llafq2gbcm46rfrn6ck4qi0d0v3ql6mfx9k4hw";
+    sha256 = "0sjz7r050myj6zgixzx3pk5ff819v6b0zfn0q1lkd19jkaix0531";
   };
 
   buildInputs = [ perl ];
 
+  patches = [ ./relative-fcronsighup.patch ];
+
   configureFlags =
     [ "--with-sendmail=${busybox}/sbin/sendmail"
       "--with-editor=${vim}/bin/vi"  # TODO customizable
       "--with-bootinstall=no"
+      "--localstatedir=/var"
       "--sysconfdir=/etc"
-      # fcron would have been default user/grp
-      "--with-username=root"
-      "--with-groupname=root"
       "--with-rootname=root"
       "--with-rootgroup=root"
       "--disable-checks"
     ];
-    
+
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files
-  
-  preConfigure =
-    ''
-      sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
-      # Don't let fcron create the group fcron, nix(os) should do this
-      sed -i '2s@.*@exit 0@' script/user-group
-
-      # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
-      sed -i '2s@.*@exit 0@' script/boot-install
-
-      # also don't use chown or chgrp for documentation (or whatever) when installing
-      find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
-    '';
-
-  patchPhase =
-    ''
-      # don't try to create /etc/fcron.{allow,deny,conf} 
-      sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
-             -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
-    '';
-
-  meta = { 
+
+  # fcron tries to install pid into system directory on install
+  installFlags = [
+    "ETC=."
+    "PIDDIR=."
+    "PIDFILE=fcron.pid"
+    "REBOOT_LOCK=fcron.reboot"
+    "FIFODIR=."
+    "FIFOFILE=fcron.fifo"
+    "FCRONTABS=."
+  ];
+
+  preConfigure = ''
+    sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
+    # Don't let fcron create the group fcron, nix(os) should do this
+    sed -i '2s@.*@exit 0@' script/user-group
+
+    # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
+    sed -i '2s@.*@exit 0@' script/boot-install
+
+    # also don't use chown or chgrp for documentation (or whatever) when installing
+    find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
+  '';
+
+  meta = with stdenv.lib; {
     description="A command scheduler with extended capabilities over cron and anacron";
     homepage = http://fcron.free.fr;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/pkgs/tools/system/fcron/relative-fcronsighup.patch
new file mode 100644
index 0000000000000..c0bbfc1ee3ef4
--- /dev/null
+++ b/pkgs/tools/system/fcron/relative-fcronsighup.patch
@@ -0,0 +1,16 @@
+Use relative fcronsighup to prefer setuid executable over package binary.
+--- fcron-3.2.1.orig/fcrontab.c	2016-06-26 17:02:48.000000000 +0200
++++ fcron-3.2.1/fcrontab.c	2017-03-05 21:54:24.676871335 +0100
+@@ -154,10 +154,10 @@
+                         fcrontab_gid);
+                 exit(ERR);
+             }
+-            execl(BINDIREX "/fcronsighup", BINDIREX "/fcronsighup", fcronconf,
++            execlp("fcronsighup",  "fcronsighup", fcronconf,
+                   NULL);
+ 
+-            error_e("Could not exec " BINDIREX " fcronsighup");
++            error_e("Could not exec fcronsighup");
+             exit(ERR);
+             break;
+ 
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 9934175ae3b6c..9c2a42eeb5aed 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lockfileProgs, perl, mimeConstruct }:
 
 stdenv.mkDerivation rec {
-  _name   = "logcheck";
-  version = "1.3.17";
-  name    = "${_name}-${version}";
+  name = "logcheck-${version}";
+  version = "1.3.18";
+  _name    = "logcheck_${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.xz";
-    sha256 = "0fphzaljc9ddv1x6l3zdf9cbarqgzpdqaqwm3plmarcc7qrgrly2";
+    url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
+    sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7";
   };
 
   preConfigure = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "SHAREDIR=share/logtail/detectrotate"
  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mails anomalies in the system logfiles to the administrator";
     longDescription = ''
       Mails anomalies in the system logfiles to the administrator.
@@ -37,9 +37,8 @@ stdenv.mkDerivation rec {
       Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
     '';
     homepage = http://logcheck.org;
-    license = stdenv.lib.licenses.gpl2;
-
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bluescreen303 ];
+    
   };
 }
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index a2d6e360a374f..63759184ba473 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, qt4, perl}:
+{stdenv, fetchurl, qt4, perl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qshowdiff-1.2";
-  
+  name = "qshowdiff-${version}";
+  version = "1.2";
+
   src = fetchurl {
-    url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
-    sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
+    url = "https://github.com/danfis/qshowdiff/archive/v${version}.tar.gz";
+    sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a";
   };
 
-  buildInputs = [ qt4 perl ];
+  buildInputs = [ qt4 perl pkgconfig ];
 
   configurePhase = ''
     mkdir -p $out/{bin,man/man1}
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index db604d862b884..6fcbf5061d1d3 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -1,16 +1,33 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma, pkgconfig, zimlib, file, zlib }:
+{ stdenv
+, fetchFromGitHub
 
-stdenv.mkDerivation {
-  name = "zimwriterfs";
-  version = "20150710";
+, autoconf
+, automake
+, libtool
+, pkgconfig
 
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+, file
+, icu
+, libgumbo
+, lzma
+, xapian
+, zimlib
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "zimwriterfs-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "wikimedia";
+    repo = "openzim";
+    rev = name;
+    sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
   };
 
-  buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
   setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
   preConfigure = "./autogen.sh";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e08d6b661ee23..31a2360f817d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -750,6 +750,8 @@ with pkgs;
 
   cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
 
+  clog-cli = callPackage ../development/tools/clog-cli { };
+
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   clib = callPackage ../tools/package-management/clib { };
@@ -1573,6 +1575,8 @@ with pkgs;
 
   edk2 = callPackage ../development/compilers/edk2 { };
 
+  eflite = callPackage ../applications/audio/eflite {};
+
   eid-mw = callPackage ../tools/security/eid-mw { };
 
   eid-viewer = callPackage ../tools/security/eid-viewer { };
@@ -2146,6 +2150,8 @@ with pkgs;
 
   gzrt = callPackage ../tools/compression/gzrt { };
 
+  httplab = callPackage ../tools/networking/httplab { };
+
   partclone = callPackage ../tools/backup/partclone { };
 
   partimage = callPackage ../tools/backup/partimage { };
@@ -3100,7 +3106,7 @@ with pkgs;
 
   nkf = callPackage ../tools/text/nkf {};
 
-  nlopt = callPackage ../development/libraries/nlopt {};
+  nlopt = callPackage ../development/libraries/nlopt { octave = null; };
 
   npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
 
@@ -3821,6 +3827,8 @@ with pkgs;
 
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
+  sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { };
+
   shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
 
   sharutils = callPackage ../tools/archivers/sharutils { };
@@ -4093,6 +4101,8 @@ with pkgs;
 
   tldr = callPackage ../tools/misc/tldr { };
 
+  tlspool = callPackage ../tools/networking/tlspool { };
+
   tmate = callPackage ../tools/misc/tmate { };
 
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
@@ -5167,7 +5177,13 @@ with pkgs;
     stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
   });
 
-  go = go_1_7;
+  go_1_8 = callPackage ../development/compilers/go/1.8.nix ({
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
+  });
+
+  go = go_1_8;
 
   go-repo-root = callPackage ../development/tools/go-repo-root { };
 
@@ -6299,9 +6315,7 @@ with pkgs;
   # Does not actually depend on Qt 5
   inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
 
-  coccinelle = callPackage ../development/tools/misc/coccinelle {
-    ocamlPackages = ocamlPackages_4_01_0;
-   };
+  coccinelle = callPackage ../development/tools/misc/coccinelle { };
 
   cpptest = callPackage ../development/libraries/cpptest { };
 
@@ -6423,7 +6437,9 @@ with pkgs;
     ocaml = ocaml_4_02;
   };
 
-  framac = callPackage ../development/tools/analysis/frama-c { };
+  framac = callPackage ../development/tools/analysis/frama-c {
+    coq = coq_8_4;
+  };
 
   frame = callPackage ../development/libraries/frame { };
 
@@ -6891,7 +6907,7 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy-lang = callPackage ../development/tools/mypy-lang { };
+  mypy = callPackage ../development/tools/mypy { };
 
 
   ### DEVELOPMENT / LIBRARIES
@@ -6918,7 +6934,8 @@ with pkgs;
 
   agg = callPackage ../development/libraries/agg { };
 
-  allegro = callPackage ../development/libraries/allegro {};
+  allegro = allegro4;
+  allegro4 = callPackage ../development/libraries/allegro {};
   allegro5 = callPackage ../development/libraries/allegro/5.nix {};
 
   amrnb = callPackage ../development/libraries/amrnb { };
@@ -7592,6 +7609,11 @@ with pkgs;
     guileBindings = config.gnutls.guile or false;
   };
 
+  gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
+    guileBindings = config.gnutls.guile or false;
+    gperf = gperf_3_0;
+  };
+
   gpac = callPackage ../applications/video/gpac { };
 
   gpgme = callPackage ../development/libraries/gpgme {
@@ -10023,13 +10045,19 @@ with pkgs;
     inherit (darwin.stubs) setfile rez derez;
   };
 
+  wxSVG = callPackage ../development/libraries/wxSVG {
+    wxGTK = wxGTK30;
+  };
+
   wtk = callPackage ../development/libraries/wtk { };
 
   x264 = callPackage ../development/libraries/x264 { };
 
   x265 = callPackage ../development/libraries/x265 { };
 
-  xapian = callPackage ../development/libraries/xapian { };
+  inherit (callPackages ../development/libraries/xapian { })
+    xapian_1_2_22 xapian_1_4_0;
+  xapian = xapian_1_4_0;
 
   xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
     libmagic = file;
@@ -10191,8 +10219,6 @@ with pkgs;
 
   javaCup = callPackage ../development/libraries/java/cup { };
 
-  javasvn = callPackage ../development/libraries/java/javasvn { };
-
   jclasslib = callPackage ../development/tools/java/jclasslib { };
 
   jdom = callPackage ../development/libraries/java/jdom { };
@@ -10248,7 +10274,11 @@ with pkgs;
     go = go_1_7;
   };
 
-  buildGoPackage = buildGo17Package;
+  buildGo18Package = callPackage ../development/go-modules/generic {
+    go = go_1_8;
+  };
+
+  buildGoPackage = buildGo18Package;
 
   go2nix = callPackage ../development/tools/go2nix { };
 
@@ -10388,6 +10418,7 @@ with pkgs;
   cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };
   cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { };
   cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { };
+  cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { };
   cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { };
   cassandra = cassandra_3_0;
 
@@ -13097,6 +13128,10 @@ with pkgs;
 
   dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
 
+  dvdstyler = callPackage ../applications/video/dvdstyler {
+    inherit (gnome2) libgnomeui;
+  };
+
   dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
   dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; };
 
@@ -13112,7 +13147,7 @@ with pkgs;
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk2 = null; });
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
 
@@ -14265,7 +14300,7 @@ with pkgs;
 
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
-    webkitgtk = webkitgtk24x;
+    inherit (gnome3) libpeas gsettings_desktop_schemas dconf;
   };
 
   lingot = callPackage ../applications/audio/lingot {
@@ -14312,6 +14347,11 @@ with pkgs;
   lilyterm = callPackage ../applications/misc/lilyterm {
     inherit (gnome2) vte;
     gtk = gtk2;
+    flavour = "stable";
+  };
+
+  lilyterm-git = lilyterm.override {
+    flavour = "git";
   };
 
   lumail = callPackage ../applications/networking/mailreaders/lumail { };
@@ -14359,7 +14399,10 @@ with pkgs;
 
   mcomix = callPackage ../applications/graphics/mcomix { };
 
-  mendeley = callPackage ../applications/office/mendeley { };
+  mendeley = callPackage ../applications/office/mendeley {
+    qt5 = qt56;
+    gconf = pkgs.gnome2.GConf;
+  };
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@@ -14607,6 +14650,8 @@ with pkgs;
 
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
 
+  speedread = callPackage ../applications/misc/speedread { };
+
   sup = callPackage ../applications/networking/mailreaders/sup {
     ruby = ruby_2_3.override { cursesSupport = true; };
   };
@@ -14977,7 +15022,8 @@ with pkgs;
     qt = qt4;
   };
 
-  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7
+  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 
@@ -15967,7 +16013,8 @@ with pkgs;
   };
   xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
 
-  xca = libsForQt5.callPackage ../applications/misc/xca { };
+  # v1.3.2 segfaults with qt 5.7
+  xca = libsForQt56.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 
@@ -16366,6 +16413,8 @@ with pkgs;
 
   gambatte = callPackage ../games/gambatte { };
 
+  garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
+
   gav = callPackage ../games/gav { };
 
   gcs = callPackage ../games/gcs { };
@@ -16581,7 +16630,10 @@ with pkgs;
 
   sauerbraten = callPackage ../games/sauerbraten {};
 
-  scid = callPackage ../games/scid { };
+  scid = callPackage ../games/scid {
+    tcl = tcl-8_5;
+    tk = tk-8_5;
+  };
 
   scummvm = callPackage ../games/scummvm { };
 
@@ -17129,8 +17181,8 @@ with pkgs;
     lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
   };
   coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
-    inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
+    inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_02.camlp5_transitional;
   };
   coq_8_5 = callPackage ../applications/science/logic/coq {
     version = "8.5pl3";
@@ -17140,7 +17192,7 @@ with pkgs;
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };
-  coq = coq_8_4;
+  coq = coq_8_6;
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
     inherit callPackage;
@@ -17701,6 +17753,10 @@ with pkgs;
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
   lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; };
+  lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
+    lilypond = lilypond-unstable;
+  };
+  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
   mailcore2 = callPackage ../development/libraries/mailcore2 { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4f5d292956205..1cc5de01e1017 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -717,14 +717,18 @@ let
       else core_extended_p4;
 
     async_kernel =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 
     async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
     async_unix =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f468b3b6c4682..63fc33ed17eb9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1393,29 +1393,7 @@ in {
     };
   });
 
-  astroid = buildPythonPackage rec {
-    name = "astroid-1.4.4";
-
-    propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy wrapt ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/astroid/${name}.tar.gz";
-      sha256 = "7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298";
-    };
-
-    checkPhase = ''
-        ${python.interpreter} -m unittest discover
-    '';
-
-    # Tests cannot be found because they're named unittest_...
-    # instead of test_...
-
-    meta = {
-      description = "A abstract syntax tree for Python with inference support";
-      homepage = http://bitbucket.org/logilab/astroid;
-      license = with licenses; [ lgpl2 ];
-    };
-  };
+  astroid = callPackage ../development/python-modules/astroid { };
 
   attrdict = buildPythonPackage (rec {
     name = "attrdict-2.0.0";
@@ -8182,6 +8160,7 @@ in {
       homepage = "http://jupyter.org/";
       license = licenses.bsd3;
       platforms = platforms.all;
+      priority = 100; # This is a metapackage which is unimportant
     };
   };
 
@@ -17416,6 +17395,22 @@ in {
     };
   };
 
+  kaitaistruct = buildPythonPackage rec {
+    name = "kaitaistruct-${version}";
+    version = "0.6";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/kaitaistruct/${name}.tar.gz";
+      sha256 = "0rwcrlz7f2bwmypqa38pag492bp71wp1bhz51hsaynjjyr9knr12";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Kaitai Struct: runtime library for Python";
+      homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
+      license = licenses.mit;
+    };
+  };
+
   Kajiki = buildPythonPackage rec {
     name = "Kajiki-${version}";
     version = "0.5.5";
@@ -20457,31 +20452,7 @@ in {
     };
   };
 
-  pylint = buildPythonPackage rec {
-    name = "pylint-${version}";
-    version = "1.5.4";
-
-    src = pkgs.fetchurl {
-        url = "mirror://pypi/p/pylint/${name}.tar.gz";
-        sha256 = "2fe3cc2fc66a56fdc35dbbc2bf1dd96a534abfc79ee6b2ad9ae4fe166e570c4b";
-    };
-
-    propagatedBuildInputs = with self; [ astroid ];
-
-    checkPhase = ''
-        cd pylint/test; ${python.interpreter} -m unittest discover -p "*test*"
-    '';
-
-    postInstall = ''
-        mkdir -p $out/share/emacs/site-lisp
-        cp "elisp/"*.el $out/share/emacs/site-lisp/
-    '';
-
-    meta = {
-        homepage = http://www.logilab.org/project/pylint;
-        description = "A bug and style checker for Python";
-    };
-  };
+  pylint = callPackage ../development/python-modules/pylint { };
 
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 
@@ -24219,6 +24190,9 @@ in {
 
     propagatedBuildInputs = with self; [ mpmath ];
 
+    # Bunch of failures including transients.
+    doCheck = false;
+
     preCheck = ''
       export LANG="en_US.UTF-8"
     '';
@@ -31304,6 +31278,8 @@ EOF
 
   tensorflowWithCuda = callPackage ../development/python-modules/tensorflow {
     cudaSupport = true;
+    cudatoolkit = pkgs.cudatoolkit8;
+    cudnn = pkgs.cudnn51_cudatoolkit80;
   };
 
   tflearn = buildPythonPackage rec {
@@ -32064,6 +32040,8 @@ EOF
     };
   };
 
+  typed-ast = callPackage ../development/python-modules/typed-ast { };
+
   stripe = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "stripe";
@@ -32182,6 +32160,8 @@ EOF
 
   snakeviz = callPackage ../development/python-modules/snakeviz { };
 
+  nitpick = callPackage ../applications/version-management/nitpick { };
+
 });
 
 in fix' (extends overrides packages)
author	Vladimír Čunát <vcunat@gmail.com>	2017-03-07 21:59:32 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2017-03-07 21:59:32 +0100
commit	b86b7c04a30856e15391df1f5e7c901ae350fe78 (patch)
tree	953fe308c0e11eed87d383c83b10e3c9cfd03989 /pkgs
parent	9eb2f4cb9ea7afb8f5c623bf0d4d0e22b8e8afec (diff)
parent	ac0021ce53d2f9d8b26aa5374ccac1cc3e4b270d (diff)