Merge remote-tracking branch 'origin/master' into staging

author: Eelco Dolstra <eelco.dolstra@logicblox.com> 2016-09-20 17:46:09 +0200
committer: Eelco Dolstra <eelco.dolstra@logicblox.com> 2016-09-20 17:46:09 +0200
commit: 7a4209c3561213cfb182ce93707a14f9715238eb (patch)
tree: e78812ee0449d9e4a32d190a701e2e90849f0d42 /pkgs
parent: 5f8a330d40008ec6457f96a07cdebe95deb1bdaf (diff)
parent: ea1afcd9f468f9f8813dba93d167bf2e558c797a (diff)
download: nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.gz
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.bz2
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.lz
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.xz
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.zst
nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.zip
193 files changed, 9655 insertions, 3771 deletions
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 6971a718de9f..ecb9d0f85d05 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -3,17 +3,19 @@
 , libSM, libsndfile, libogg
 }:
 
-stdenv.mkDerivation {
-  name = "freewheeling-100";
+stdenv.mkDerivation rec {
+  name = "freewheeling-${version}";
+  version = "100";
 
   src = fetchsvn {
     url = svn://svn.code.sf.net/p/freewheeling/code;
-    rev = 100;
+    rev = version;
     sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv";
   };
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
-    pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
+    gnutls33 freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
   ];
 
@@ -35,7 +37,6 @@ stdenv.mkDerivation {
         software, released under the GNU GPL license.
     '' ;
 
-    version = "r100";
     homepage = "http://freewheeling.sourceforge.net";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.sepi ];
diff --git a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch b/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch
deleted file mode 100644
index ad5dcbc472db..000000000000
--- a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a18f4cb77c567dec9ad924fcc76c50092de6ee7 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 23 Nov 2015 06:57:51 -0600
-Subject: [PATCH 2/2] fix ConfigReader QStringList corruption
-
----
- src/common/ConfigReader.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
-index 5bf5a6a..34182e6 100644
---- a/src/common/ConfigReader.cpp
-+++ b/src/common/ConfigReader.cpp
-@@ -30,7 +30,8 @@
- 
- QTextStream &operator>>(QTextStream &str, QStringList &list)  {
-     list.clear();
--    foreach(const QStringRef &s, str.readLine().splitRef(QLatin1Char(',')))
-+    QString line = str.readLine();
-+    foreach(const QStringRef &s, line.splitRef(QLatin1Char(',')))
-     {
-         QStringRef trimmed = s.trimmed();
-         if (!trimmed.isEmpty())
--- 
-2.6.3
-
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 923b185ae393..3f8d5aec4aa1 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
-, cmake, pkgconfig, libxcb, libpthreadstubs, lndir
+, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
 }:
 
 let
-  version = "0.13.0";
+  version = "0.14.0";
 
   unwrapped = stdenv.mkDerivation rec {
     name = "sddm-unwrapped-${version}";
@@ -14,19 +14,18 @@ let
       owner = "sddm";
       repo = "sddm";
       rev = "v${version}";
-      sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
+      sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
     };
 
     patches = [
       ./0001-ignore-config-mtime.patch
-      ./0002-fix-ConfigReader-QStringList-corruption.patch
-      (fetchpatch {
-        url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch;
-        sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj";
+      (fetchpatch { /* Fix display of user avatars. */
+        url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
+        sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
       })
     ];
 
-    nativeBuildInputs = [ cmake pkgconfig qttools ];
+    nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
     buildInputs = [
       libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
new file mode 100644
index 000000000000..03b920ffab0d
--- /dev/null
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft
+}:
+
+stdenv.mkDerivation rec {
+  name = "deadpixi-sam-unstable";
+  version = "2016-09-15";
+    src = fetchFromGitHub {
+      owner = "deadpixi";
+      repo = "sam";
+      rev = "a6a8872246e8634d884b0ce52bc3be9770ab1b0f";
+      sha256 = "1zr8dl0vp1xic3dq69h4bp2fcxsjhrzasfl6ayvkibjd6z5dn07p";
+    };
+
+  postPatch = ''
+    substituteInPlace config.mk.def \
+      --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2"
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+  buildInputs = [ libX11 libXt libXft ];
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    mv deadpixi-sam.desktop $out/share/applications
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Updated version of the sam text editor";
+    license = with licenses; lpl-102;
+    maintainers = with maintainers; [ ramkromberg ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh
deleted file mode 100644
index 984a61df6f3b..000000000000
--- a/pkgs/applications/editors/emacs-24/builder.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-source $stdenv/setup
-
-# This hook is supposed to be run on Linux. It patches the proper locations of
-# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
-# *our* versions, not the ones found in the system, as it would do by default.
-# On other platforms, this appears to be unnecessary.
-preConfigure() {
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
-        substituteInPlace $i --replace /bin/pwd pwd
-    done
-
-    case "${system}" in
-	x86_64-linux)	glibclibdir=lib64 ;;
-	i686-linux)	glibclibdir=lib ;;
-        *)              return;
-    esac
-
-    libc=$(cat ${NIX_CC}/nix-support/orig-libc)
-    echo "libc: $libc"
-
-    for i in src/s/*.h src/m/*.h; do
-        substituteInPlace $i \
-            --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
-            --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
-            --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
-            --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
-            --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
-            --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
-    done
-}
-
-preInstall () {
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
-        substituteInPlace $i --replace /bin/pwd pwd
-    done
-}
-
-genericBuild
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
deleted file mode 100644
index df53cf2c9a49..000000000000
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
-, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
-, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
-, withX ? !stdenv.isDarwin
-, withGTK3 ? false, gtk3 ? null
-, withGTK2 ? true, gtk2
-, enableTTYTrueColor ? false
-}:
-
-assert (libXft != null) -> libpng != null;      # probably a bug
-assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
-assert withGTK2 -> withX || stdenv.isDarwin;
-assert withGTK3 -> withX || stdenv.isDarwin;
-assert withGTK2 -> !withGTK3 && gtk2 != null;
-assert withGTK3 -> !withGTK2 && gtk3 != null;
-
-let
-  toolkit =
-    if withGTK3 then "gtk3"
-    else if withGTK2 then "gtk2"
-    else "lucid";
-in
-
-stdenv.mkDerivation rec {
-  name = "emacs-24.5";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url    = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx";
-  };
-
-  patches = lib.optionals stdenv.isDarwin [
-    ./at-fdcwd.patch
-  ] ++ lib.optionals enableTTYTrueColor [
-    # Modified TTY True Color patch from: https://gist.github.com/choppsv1/36aacdd696d505566088
-    # To use, pass --color=true-color, which will default to using ';'
-    # as the separator.
-    # Alternatively, set $EMACS_TRUE_COLOR_SEPARATOR to ';' or ':'.
-    ./tty-true-color.patch
-  ];
-
-  postPatch = ''
-    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
-    # emacs runs then dumps itself. In the process, it keeps a copy of the
-    # PATH env var, holding all the build inputs in it's closure.
-    # Prevent that by running the self-dumping emacs with an empty PATH.
-    sed -i 's|^RUN_TEMACS = |&PATH= |' src/Makefile.in
-  '';
-
-  buildInputs =
-    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]
-    ++ stdenv.lib.optional stdenv.isLinux dbus
-    ++ stdenv.lib.optionals withX
-      [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
-        imagemagick gconf ]
-    ++ stdenv.lib.optional (withX && withGTK2) gtk2
-    ++ stdenv.lib.optional (withX && withGTK3) gtk3
-    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
-
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
-
-  configureFlags =
-    if stdenv.isDarwin
-      then [ "--with-ns" "--disable-ns-self-contained" ]
-    else if withX
-      then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
-      else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
-             "--with-gif=no" "--with-tiff=no" ];
-
-  NIX_CFLAGS_COMPILE =
-    [ "-ffreestanding" ] # needed due to glibc 2.24 upgrade (see https://sourceware.org/glibc/wiki/Release/2.24#Known_Issues)
-    ++ stdenv.lib.optional (stdenv.isDarwin && withX) "-I${cairo.dev}/include/cairo";
-
-  postInstall = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    mkdir -p $out/Applications
-    mv nextstep/Emacs.app $out/Applications
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
-    platforms   = platforms.all;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      extensions are distributed with GNU Emacs; others are available
-      separately.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs-24/tty-true-color.patch b/pkgs/applications/editors/emacs-24/tty-true-color.patch
deleted file mode 100644
index 09ceeb658abb..000000000000
--- a/pkgs/applications/editors/emacs-24/tty-true-color.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
-index 98108ce..21814a9 100644
---- a/lisp/term/tty-colors.el
-+++ b/lisp/term/tty-colors.el
-@@ -764,7 +764,8 @@
-     (auto . 0)
-     (ansi8 . 8)
-     (always . 8)
--    (yes . 8))
-+    (yes . 8)
-+    (true-color . 16777216))
-   "An alist of supported standard tty color modes and their aliases.")
- 
- (defun tty-color-alist (&optional _frame)
-diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
-index c673749..244cf7f 100644
---- a/lisp/term/xterm.el
-+++ b/lisp/term/xterm.el
-@@ -674,6 +674,15 @@ versions of xterm."
-     ;; are more colors to support, compute them now.
-     (when (> ncolors 0)
-       (cond
-+       ((= (display-color-cells (selected-frame)) 16777216)	; 24-bit xterm
-+        (let ((idx (length xterm-standard-colors)))
-+          ;; Insert standard X colors after the standard xterm ones
-+          (mapc (lambda (color)
-+                       (if (not (assoc (car color) xterm-standard-colors))
-+                           (progn
-+                             (tty-color-define (car color) idx (cdr color))
-+                             (setq idx (1+ idx)))))
-+                color-name-rgb-alist)))
-        ((= ncolors 240)	; 256-color xterm
- 	;; 216 non-gray colors first
- 	(let ((r 0) (g 0) (b 0))
-diff --git a/src/dispextern.h b/src/dispextern.h
-index 239c442..5760b84 100644
---- a/src/dispextern.h
-+++ b/src/dispextern.h
-@@ -1739,9 +1739,15 @@ struct face
- INLINE bool
- face_tty_specified_color (unsigned long color)
- {
--  return color < FACE_TTY_DEFAULT_BG_COLOR;
-+  return (color < FACE_TTY_DEFAULT_BG_COLOR);
- }
- 
-+INLINE bool
-+face_tty_specified_24_bit_color (unsigned long color)
-+{
-+  /* 24 bit colors have 24th but not 25th bit set */
-+  return ((color & (0x03 << 24)) == (0x01 << 24));
-+}
- /* Non-zero if FACE was realized for unibyte use.  */
- 
- #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0)
-diff --git a/src/term.c b/src/term.c
-index 8312491..b14aded 100644
---- a/src/term.c
-+++ b/src/term.c
-@@ -1915,18 +1915,40 @@ turn_on_face (struct frame *f, int face_id)
-       const char *ts;
-       char *p;
- 
--      ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground;
-+      if (face_tty_specified_24_bit_color(fg))
-+        ts = tty->standout_mode ? tty->TS_set_rgb_background : tty->TS_set_rgb_foreground;
-+      else
-+        ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground;
-       if (face_tty_specified_color (fg) && ts)
- 	{
--          p = tparam (ts, NULL, 0, fg, 0, 0, 0);
-+          if (!face_tty_specified_24_bit_color(fg))
-+            p = tparam (ts, NULL, 0, fg, 0, 0, 0);
-+          else
-+            {
-+              const unsigned char r = (fg >> 16) & 0xFF,
-+                g = (fg >> 8) & 0xFF,
-+                b = fg & 0xFF;
-+              p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0);
-+            }
- 	  OUTPUT (tty, p);
- 	  xfree (p);
- 	}
- 
--      ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background;
-+      if (face_tty_specified_24_bit_color(bg))
-+        ts = tty->standout_mode ? tty->TS_set_rgb_foreground : tty->TS_set_rgb_background;
-+      else
-+        ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background;
-       if (face_tty_specified_color (bg) && ts)
- 	{
--          p = tparam (ts, NULL, 0, bg, 0, 0, 0);
-+          if (!face_tty_specified_24_bit_color(bg))
-+            p = tparam (ts, NULL, 0, bg, 0, 0, 0);
-+          else
-+            {
-+              const unsigned char r = (bg >> 16) & 0xFF,
-+                g = (bg >> 8) & 0xFF,
-+                b = bg & 0xFF;
-+              p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0);
-+          }
- 	  OUTPUT (tty, p);
- 	  xfree (p);
- 	}
-@@ -2028,6 +2050,8 @@ TERMINAL does not refer to a text terminal.  */)
-   struct terminal *t = get_tty_terminal (terminal, 0);
-   if (!t)
-     return make_number (0);
-+  else if (t->display_info.tty->TS_set_rgb_foreground)
-+    return make_number (16777216); /* 24 bit True Color */
-   else
-     return make_number (t->display_info.tty->TN_max_colors);
- }
-@@ -2043,6 +2067,8 @@ static int default_no_color_video;
- static char *default_orig_pair;
- static char *default_set_foreground;
- static char *default_set_background;
-+static char *default_set_rgb_foreground;
-+static char *default_set_rgb_background;
- 
- /* Save or restore the default color-related capabilities of this
-    terminal.  */
-@@ -2055,6 +2081,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save)
-       dupstring (&default_orig_pair, tty->TS_orig_pair);
-       dupstring (&default_set_foreground, tty->TS_set_foreground);
-       dupstring (&default_set_background, tty->TS_set_background);
-+      dupstring (&default_set_rgb_foreground, tty->TS_set_rgb_foreground);
-+      dupstring (&default_set_rgb_background, tty->TS_set_rgb_background);
-       default_max_colors = tty->TN_max_colors;
-       default_max_pairs = tty->TN_max_pairs;
-       default_no_color_video = tty->TN_no_color_video;
-@@ -2064,6 +2092,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save)
-       tty->TS_orig_pair = default_orig_pair;
-       tty->TS_set_foreground = default_set_foreground;
-       tty->TS_set_background = default_set_background;
-+      tty->TS_set_rgb_foreground = default_set_rgb_foreground;
-+      tty->TS_set_rgb_background = default_set_rgb_background;
-       tty->TN_max_colors = default_max_colors;
-       tty->TN_max_pairs = default_max_pairs;
-       tty->TN_no_color_video = default_no_color_video;
-@@ -2088,6 +2118,7 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
- 	tty->TN_max_pairs = 0;
- 	tty->TN_no_color_video = 0;
- 	tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = NULL;
-+        tty->TS_set_rgb_foreground = tty->TS_set_rgb_background = NULL;
- 	break;
-       case 0:	 /* default colors, if any */
-       default:
-@@ -2102,10 +2133,45 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
- 	tty->TS_set_foreground = "\033[3%dm";
- 	tty->TS_set_background = "\033[4%dm";
- #endif
-+        tty->TS_set_rgb_foreground = NULL;
-+        tty->TS_set_rgb_background = NULL;
- 	tty->TN_max_colors = 8;
- 	tty->TN_max_pairs = 64;
- 	tty->TN_no_color_video = 0;
- 	break;
-+      case 16777216: /* RGB colors */
-+        tty->TS_orig_pair = "\033[0m";
-+
-+        /* if the user hasn't explicitly chosen the ":" separator, use ";". */
-+        char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR");
-+        if (true_color_separator && strcmp (true_color_separator, ":") == 0)
-+        {
-+          /* XXX chopps use ITU T.421 ':' separator */
-+          /* TODO This should be extracted from terminfo/termcap. */
-+#ifdef TERMINFO
-+          tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm";
-+          tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm";
-+#else
-+          tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm";
-+          tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm";
-+#endif
-+        }
-+        else
-+        {
-+          /* TODO This should be extracted from terminfo/termcap. */
-+#ifdef TERMINFO
-+          tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm";
-+          tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm";
-+#else
-+          tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm";
-+          tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm";
-+#endif
-+        }
-+
-+        tty->TN_max_colors = 16777216;
-+        /*tty->TN_max_pairs = 64; TODO */
-+        tty->TN_no_color_video = 0;
-+        break;
-     }
- }
- 
-@@ -4201,6 +4267,38 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
-       tty->TN_no_color_video = tgetnum ("NC");
-       if (tty->TN_no_color_video == -1)
-         tty->TN_no_color_video = 0;
-+
-+
-+      /* Allow the user to opt-in to True Color support. */
-+      char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR");
-+      if (true_color_separator && strcmp (true_color_separator, ";") == 0)
-+        {
-+          /* TODO This should be extracted from terminfo/termcap. */
-+#ifdef TERMINFO
-+          tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm";
-+          tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm";
-+#else
-+          tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm";
-+          tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm";
-+#endif
-+        }
-+      else if (true_color_separator && strcmp (true_color_separator, ":") == 0)
-+        {
-+          /* XXX chopps use ITU T.421 ':' separator */
-+          /* TODO This should be extracted from terminfo/termcap. */
-+#ifdef TERMINFO
-+          tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm";
-+          tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm";
-+#else
-+          tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm";
-+          tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm";
-+#endif
-+        }
-+      else
-+        {
-+          tty->TS_set_rgb_foreground = NULL;
-+          tty->TS_set_rgb_background = NULL;
-+        }
-     }
- 
-   tty_default_color_capabilities (tty, 1);
-diff --git a/src/termchar.h b/src/termchar.h
-index d8066d7..e48d583 100644
---- a/src/termchar.h
-+++ b/src/termchar.h
-@@ -157,6 +157,10 @@ struct tty_display_info
-   const char *TS_set_foreground;
-   const char *TS_set_background;
- 
-+  /* Support for 24bit RGB color terminals. */
-+  const char *TS_set_rgb_foreground;
-+  const char *TS_set_rgb_background;
-+
-   int TF_hazeltine;             /* termcap hz flag. */
-   int TF_insmode_motion;        /* termcap mi flag: can move while in insert mode. */
-   int TF_standout_motion;       /* termcap mi flag: can move while in standout mode. */
-diff --git a/src/xfaces.c b/src/xfaces.c
-index 29c91f7..347ebf8 100644
---- a/src/xfaces.c
-+++ b/src/xfaces.c
-@@ -382,7 +382,7 @@ static ptrdiff_t lface_id_to_name_size;
- 
- /* TTY color-related functions (defined in tty-colors.el).  */
- 
--static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values;
-+static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values, Qtty_color_canonicalize;
- 
- /* The name of the function used to compute colors on TTYs.  */
- 
-@@ -943,54 +943,80 @@ tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color,
-   if (!STRINGP (color) || NILP (Ffboundp (Qtty_color_desc)))
-     return 0;
- 
--  XSETFRAME (frame, f);
--
--  color_desc = call2 (Qtty_color_desc, color, frame);
--  if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
-+  if (f->output_method == output_termcap
-+      && f->output_data.tty->display_info->TS_set_rgb_foreground
-+      && !NILP (Ffboundp (Qtty_color_standard_values)))
-     {
--      Lisp_Object rgb;
--
--      if (! INTEGERP (XCAR (XCDR (color_desc))))
--	return 0;
-+      /* Terminal supports 3 byte RGB colors. */
-+      if (!NILP (Ffboundp (Qtty_color_canonicalize)))
-+        color = call1(Qtty_color_canonicalize, color);
- 
--      tty_color->pixel = XINT (XCAR (XCDR (color_desc)));
-+      color_desc = call1 (Qtty_color_standard_values, color);
-+      if (! parse_rgb_list (color_desc, tty_color))
-+        return 0;
- 
--      rgb = XCDR (XCDR (color_desc));
--      if (! parse_rgb_list (rgb, tty_color))
--	return 0;
-+      /* Map XColor to 3 byte values. */
-+      tty_color->pixel = 1 << 24 /* Set bit 24 to mark RGB values. */
-+        | (tty_color->red / 256) << 16
-+        | (tty_color->green / 256) << 8
-+        | (tty_color->blue / 256);
- 
--      /* Should we fill in STD_COLOR too?  */
-       if (std_color)
--	{
--	  /* Default STD_COLOR to the same as TTY_COLOR.  */
--	  *std_color = *tty_color;
--
--	  /* Do a quick check to see if the returned descriptor is
--	     actually _exactly_ equal to COLOR, otherwise we have to
--	     lookup STD_COLOR separately.  If it's impossible to lookup
--	     a standard color, we just give up and use TTY_COLOR.  */
--	  if ((!STRINGP (XCAR (color_desc))
--	       || NILP (Fstring_equal (color, XCAR (color_desc))))
--	      && !NILP (Ffboundp (Qtty_color_standard_values)))
--	    {
--	      /* Look up STD_COLOR separately.  */
--	      rgb = call1 (Qtty_color_standard_values, color);
--	      if (! parse_rgb_list (rgb, std_color))
--		return 0;
--	    }
--	}
-+        *std_color = *tty_color;
- 
-       return 1;
-     }
--  else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist"))))
--    /* We were called early during startup, and the colors are not
--       yet set up in tty-defined-color-alist.  Don't return a failure
--       indication, since this produces the annoying "Unable to
--       load color" messages in the *Messages* buffer.  */
--    return 1;
-   else
--    /* tty-color-desc seems to have returned a bad value.  */
--    return 0;
-+    {
-+      XSETFRAME (frame, f);
-+
-+      color_desc = call2 (Qtty_color_desc, color, frame);
-+      if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
-+        {
-+          Lisp_Object rgb;
-+
-+          if (! INTEGERP (XCAR (XCDR (color_desc))))
-+            return 0;
-+
-+          tty_color->pixel = XINT (XCAR (XCDR (color_desc)));
-+
-+          rgb = XCDR (XCDR (color_desc));
-+          if (! parse_rgb_list (rgb, tty_color))
-+            return 0;
-+
-+          /* Should we fill in STD_COLOR too?  */
-+          if (std_color)
-+            {
-+              /* Default STD_COLOR to the same as TTY_COLOR.  */
-+              *std_color = *tty_color;
-+
-+              /* Do a quick check to see if the returned descriptor is
-+                 actually _exactly_ equal to COLOR, otherwise we have to
-+                 lookup STD_COLOR separately.  If it's impossible to lookup
-+                 a standard color, we just give up and use TTY_COLOR.  */
-+              if ((!STRINGP (XCAR (color_desc))
-+                   || NILP (Fstring_equal (color, XCAR (color_desc))))
-+                  && !NILP (Ffboundp (Qtty_color_standard_values)))
-+                {
-+                  /* Look up STD_COLOR separately.  */
-+                  rgb = call1 (Qtty_color_standard_values, color);
-+                  if (! parse_rgb_list (rgb, std_color))
-+                    return 0;
-+                }
-+            }
-+
-+          return 1;
-+        }
-+      else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist"))))
-+        /* We were called early during startup, and the colors are not
-+           yet set up in tty-defined-color-alist.  Don't return a failure
-+           indication, since this produces the annoying "Unable to
-+           load color" messages in the *Messages* buffer.  */
-+        return 1;
-+      else
-+        /* tty-color-desc seems to have returned a bad value.  */
-+        return 0;
-+    }
- }
- 
- /* A version of defined_color for non-X frames.  */
-@@ -1008,7 +1034,9 @@ tty_defined_color (struct frame *f, const char *color_name,
-   color_def->green = 0;
- 
-   if (*color_name)
--    status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
-+    {
-+      status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
-+    }
- 
-   if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name)
-     {
-@@ -5780,6 +5808,7 @@ map_tty_color (struct frame *f, struct face *face,
-   unsigned long default_pixel =
-     foreground_p ? FACE_TTY_DEFAULT_FG_COLOR : FACE_TTY_DEFAULT_BG_COLOR;
-   unsigned long pixel = default_pixel;
-+  XColor true_color;
- #ifdef MSDOS
-   unsigned long default_other_pixel =
-     foreground_p ? FACE_TTY_DEFAULT_BG_COLOR : FACE_TTY_DEFAULT_FG_COLOR;
-@@ -5798,7 +5827,18 @@ map_tty_color (struct frame *f, struct face *face,
-     {
-       /* Associations in tty-defined-color-alist are of the form
- 	 (NAME INDEX R G B).  We need the INDEX part.  */
--      pixel = XINT (XCAR (XCDR (def)));
-+      if (f->output_method == output_termcap
-+          && f->output_data.tty->display_info->TS_set_rgb_foreground
-+          && parse_rgb_list (XCDR (XCDR(def)), &true_color))
-+        {
-+          /* Map XColor to 3 byte values. */
-+          pixel = 1 << 24 /* Set bit 24 to mark RGB values. */
-+            | (true_color.red / 256) << 16
-+            | (true_color.green / 256) << 8
-+            | (true_color.blue / 256);
-+        }
-+       else
-+         pixel = XINT (XCAR (XCDR (def)));
-     }
- 
-   if (pixel == default_pixel && STRINGP (color))
-@@ -6460,6 +6500,7 @@ syms_of_xfaces (void)
-   DEFSYM (Qwindow_divider, "window-divider");
-   DEFSYM (Qwindow_divider_first_pixel, "window-divider-first-pixel");
-   DEFSYM (Qwindow_divider_last_pixel, "window-divider-last-pixel");
-+  DEFSYM (Qtty_color_canonicalize, "tty-color-canonicalize");
-   DEFSYM (Qtty_color_desc, "tty-color-desc");
-   DEFSYM (Qtty_color_standard_values, "tty-color-standard-values");
-   DEFSYM (Qtty_color_by_index, "tty-color-by-index");
diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch
deleted file mode 100644
index 2d8099b73736..000000000000
--- a/pkgs/applications/editors/emacs-25/at-fdcwd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
-index 84ede3e..8e8f42e 100644
---- a/lib/careadlinkat.h
-+++ b/lib/careadlinkat.h
-@@ -23,6 +23,10 @@
- #include <fcntl.h>
- #include <unistd.h>
- 
-+#ifndef AT_FDCWD
-+#define AT_FDCWD -2
-+#endif
-+
- struct allocator;
- 
- /* Assuming the current directory is FD, get the symbolic link value
diff --git a/pkgs/applications/editors/emacs-25/site-start.el b/pkgs/applications/editors/emacs-25/site-start.el
deleted file mode 100644
index 023d6412ed84..000000000000
--- a/pkgs/applications/editors/emacs-25/site-start.el
+++ /dev/null
@@ -1,17 +0,0 @@
-;; NixOS specific load-path
-(setq load-path
-      (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                               (split-string (or (getenv "NIX_PROFILES") ""))))
-              load-path))
-
-;;; Make `woman' find the man pages
-(eval-after-load 'woman
-  '(setq woman-manpath
-         (append (reverse (mapcar (lambda (x) (concat x "/share/man/"))
-                                  (split-string (or (getenv "NIX_PROFILES") ""))))
-                 woman-manpath)))
-
-;; Make tramp work for remote NixOS machines
-;;; NOTE: You might want to add 
-(eval-after-load 'tramp
-  '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index cc9e033cd416..2ce8b23203fe 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1336,10 +1336,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160905";
+        version = "20160912";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20160905.tar";
-          sha256 = "118xq8bsiwa6nfxm14ww5dmyf5r0cv69lf748cj39bcvg1qm94vn";
+          url = "https://elpa.gnu.org/packages/org-20160912.tar";
+          sha256 = "0g44hcyk9x0103mfkmkbrn4f36vlyrfxil1qd3fpwardcnaxr5w4";
         };
         packageRequires = [];
         meta = {
@@ -1529,10 +1529,10 @@
     rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "rudel";
-        version = "0.3";
+        version = "0.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rudel-0.3.tar";
-          sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1";
+          url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar";
+          sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz";
         };
         packageRequires = [ cl-generic cl-lib emacs ];
         meta = {
@@ -1687,10 +1687,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.1.el";
-          sha256 = "1d91ddak5whb7kln216vhcsl707h5kirc6aqbkw82skhpg4c3ap1";
+          url = "https://elpa.gnu.org/packages/stream-2.2.2.el";
+          sha256 = "00p24ipn8frlhhwzrz6za7dq4fkhs8i8cwp48yhsq9zpnj9y38xb";
         };
         packageRequires = [ emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index d5cbea302878..ca751b21fc01 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -2,12 +2,12 @@
     _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "_0blayout";
-        version = "20160826.1522";
+        version = "20160918.133";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "0blayout-mode";
-          rev = "3032dadf28ab63c132cd20abdd3a0008f6b72f9f";
-          sha256 = "1xq91wx2f0psj395jlrjb2viwdz4ai1xm34m5xvanip2vm085xgy";
+          rev = "2383bd5a71faaf451db24897f107728aa0626d61";
+          sha256 = "0238cavnwr1j06ablc3cznhiyrizns2ri599sk509858jyvcaz04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
@@ -590,8 +590,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ac-inf-ruby";
-          rev = "3a1e741b40b8dba0e9c235dad4b9907411d9dcd3";
-          sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
+          rev = "ee53fc9c61950da9a96df3ff5ef186f9a9faf151";
+          sha256 = "13xgv1c4gr075gffq95njra7bw1fkb5yp3xdlh3qndzw4bpary1l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby";
@@ -712,12 +712,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "20160628.422";
+        version = "20160910.1747";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5b463aba738648d0ac8e1d1000e849a858353ce8";
-          sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa";
+          rev = "b9e3d647d1724f50af5622be944ea94d04078194";
+          sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5b463aba738648d0ac8e1d1000e849a858353ce8";
-          sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa";
+          rev = "b9e3d647d1724f50af5622be944ea94d04078194";
+          sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -800,8 +800,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ac-slime";
-          rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112";
-          sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
+          rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e";
+          sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
@@ -964,12 +964,12 @@
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20160811.112";
+        version = "20160912.853";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "36770f464a0d15f8c666a55f8aedde26c238f4f4";
-          sha256 = "1rcpylzpqf06jss7kibm3jr1lpakhf236nqg39725bxqai63j6ci";
+          rev = "624c5ffeb98f7805768084b8a2530ea21a78cf38";
+          sha256 = "0s5zsa1asq5wcjkrcrpd82075irg9yzz1wj8hrir7bfxmwpmz1k5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1339,12 +1339,12 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20160815.1724";
+        version = "20160907.922";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "ce0804bfc4fcd6db07d1ffc96722e1e9e87f0871";
-          sha256 = "0cbb8389wd80hbfb084q3b3qlkzxmz5i682rd2sl0rgvk9aafik4";
+          rev = "6f7c62553a265d6b8b09df355bbd6bb36e9a15f7";
+          sha256 = "021chmk8xxf3pq0avw54n9683v6swkhpxk927mfpnlw1824pqkbf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1381,12 +1381,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160602.2341";
+        version = "20160917.613";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "b70a9458d7cb0cf191a660e7f27c73dc49d0278c";
-          sha256 = "1pfmpwma9k6l386v4m884gb5p2apl4k5m2vaxhmb7hnf9p27yrwl";
+          rev = "c9852e692b26f9cafa226b279c07c562ea41a000";
+          sha256 = "0f40q1s78j5j0l4hj5q73hssl86dbvjqpk09cq93zwgcsmr1ydi9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1504,6 +1504,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "all-the-icons";
+        version = "20160918.1";
+        src = fetchFromGitHub {
+          owner = "domtronn";
+          repo = "all-the-icons.el";
+          rev = "4386585272116656dd84558977df70d000aacc25";
+          sha256 = "0a3gm4wvy416vah5hwmyzh1m58246f4gy40vb0zl681bivz0a97m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
+          sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
+          name = "all-the-icons";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/all-the-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
     amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
     melpaBuild {
         pname = "amd-mode";
@@ -1558,12 +1579,12 @@
     ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ample-theme";
-        version = "20160906.643";
+        version = "20160913.544";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "ample-theme";
-          rev = "ad6b85dcc9bdc698d1a6ce657addd133c180eeea";
-          sha256 = "0c6jr8izks2x316xzcd962aiy7q4zmwfn8w4i85ans01a88249xf";
+          rev = "75bd5c7f2fd45d6f3f68ea6f06e95175a7b4e4ce";
+          sha256 = "0w753zs6xzbqaxym02dh4gfgab0cslqa74s7rlhlq0dzjm1sbn7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -2673,12 +2694,12 @@
     atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "atom-one-dark-theme";
-        version = "20160816.713";
+        version = "20160914.1337";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "0e20e451605a052ef4faecafbd4d9937a6daaf0c";
-          sha256 = "1q9c0ckrax5qvf3l3v8pxf1ygx380k803rdwrl9c8yb9wmxyn0ck";
+          rev = "7e2c683d2d45f0c4901c4c492004b78345425d41";
+          sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -2820,12 +2841,12 @@
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "20160228.623";
+        version = "20160909.50";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "451952126251b4eaf0418ffb50257b63510451a1";
-          sha256 = "03h5p4wbgj3gz3d94fwmc6s3gkxg7l77fscl3znkcb8f934rf6xn";
+          rev = "73bf5a83697f10fb9291ae30d58ae0f1f4f9f2c0";
+          sha256 = "0dqgxfw0c6zdnhfdsys8and60qxpd3vk459kx4xgbvmv0vljl83h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -2841,12 +2862,12 @@
     auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-async-byte-compile";
-        version = "20120322.1441";
+        version = "20160915.2154";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "auto-async-byte-compile";
-          rev = "73248feca5595d81cd8a3bd4a4810e3586076e0d";
-          sha256 = "17nv8rqjh3ynbk1r0njwjb5hd7sgii0vncsa1q19jyp3h30rj4in";
+          rev = "8681e74ddb8481789c5dbb3cafabb327db4c4484";
+          sha256 = "1g98gla9qdqmifsxakhkbxlljy2ln1s3wfahk9zycrwgzfjlsdf4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/auto-async-byte-compile";
@@ -3402,12 +3423,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20160430.1221";
+        version = "20160917.1423";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "05ea2283e73125dba1bb320929b879633e69a600";
-          sha256 = "1kb6h37qlhzxk3v45bn0m38bp244c3fpxr3lzr7f6rsy8bpc8w67";
+          rev = "4237f7b64d8eab7c0717f110a78bf689b06c99b5";
+          sha256 = "06ng67slv468a2sqqvr82hy2r90nk5nk75f60cc65qs4i4hf8b0c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3607,6 +3628,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avk-emacs-themes";
+        version = "20160909.1323";
+        src = fetchFromGitHub {
+          owner = "avkoval";
+          repo = "avk-emacs-themes";
+          rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260";
+          sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
+          sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144";
+          name = "avk-emacs-themes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/avk-emacs-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
@@ -3673,12 +3715,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20160818.725";
+        version = "20160908.1034";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "6e394af511274e906db027ea025ac95b4739b613";
-          sha256 = "00air40hslsiwm4h0kf3ynklx13hn5dziqw3xwcgf3cvjpchw7vy";
+          rev = "404cc625a374d183cc8bf2dc89d7bd77d5f54e3a";
+          sha256 = "0zj20wg3irdkydlqnlmb4idq9aa8kfgjpl42clckprlcrdmf3ca5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -3904,12 +3946,12 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160823.152";
+        version = "20160917.1018";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "dc3bf0ed7031e8d755e3c8ac733e69003715665a";
-          sha256 = "00r9gwmyrf8dd4l83mqw4m4qzj8ppy3082k94njhmyq1cx9bvx85";
+          rev = "9aa8bb4e387192211fde213f5344a017266e3974";
+          sha256 = "0k1ahcxj64s4g1c9w8qjyp23gskvp4b5nqbssspjhlcc46j99fpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
@@ -3946,12 +3988,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20160906.2114";
+        version = "20160914.1130";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "d97474f6188700556ac4e121b7ea8887e24a8c0b";
-          sha256 = "02pj78ccxzkbw7kgnqjpicyy672c1irlya0kq7q38yfmvnsjrxgc";
+          rev = "97359d48a00b30776c5416ea90735d8302687677";
+          sha256 = "0f0gg5kfzgii0rf75gh48wnwimkc88xzwbifkwdf745jhzkyqn6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -5068,7 +5110,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20160906.1010";
+        version = "20160910.2019";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
@@ -5087,12 +5129,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20160906.1203";
+        version = "20160917.657";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "bef6f50554209ccdfba9261fac9a1c40f08e47ef";
-          sha256 = "0z176l6bfpyr1z51k3zyfsgnz46mpabncf1pjyip9ddw08qr2ird";
+          rev = "477a3d9fa8b6e0eb726d731c4961bd311f0e7413";
+          sha256 = "1sabwcc51jlq0c031lm04qm0cr2bbimv1d464n6z85qd7yqrn3kj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6148,12 +6190,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20160906.1346";
+        version = "20160910.827";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "9ab9937f6c2abb94b24383603838d762909bb62c";
-          sha256 = "05a2nsr2pd679k5z9lj3q4pivvnd9xnnv49an90m6z9bvdcdp1kk";
+          rev = "45ec3ac3bce4aac6b832e158efc8cb784caaf5f2";
+          sha256 = "0jmdh4bllmr3jgv2v35d014pjcl4brffz9p9l17dvdi01pwkhan0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6549,8 +6591,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "52debcc0a272e8c6c0bda85a46b1880d8a7e5d60";
-          sha256 = "1nb5wmn04in8a4d2maqxmynbkhigi8r8pl6j72s4in694y0mnn61";
+          rev = "d084f691ba42cd34527be2c2e3a801776e275b87";
+          sha256 = "11ylkywjnf2xiv4gwhwa7x01gfwjvky8rp2z5kfc97rw7jpmvma7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6589,7 +6631,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11717";
+          rev = "11718";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -6898,12 +6940,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20160906.2229";
+        version = "20160915.1934";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "c17d7f3a16a2551d7c8e908186dcc361fad9ba40";
-          sha256 = "0vg1rxn3lwvmapw63i9i9iccs86xmjr83kx96w8gligacvnbgnzz";
+          rev = "dc7a7bfb2ed5f26d99bfe416f2586aba50082c64";
+          sha256 = "0rghbg1a8bqll5zn6r2gff94l8jn22q52aac7hpcw5n53ypqk4c1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7126,12 +7168,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160830.23";
+        version = "20160914.2335";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "bdbb2d25b9f3fccf2c586414c5dfce104c811713";
-          sha256 = "1k5s97inlm7igy5wp8rapy3l8k8mln0c3fqwn5w7pr09xb7bcqk9";
+          rev = "6d6595a06c3b075635b91540bd82a117db9a3f2f";
+          sha256 = "1aplq5w4skwfy4lisj9ws9qjshp4h9nwvvyvpfiq4cxvwwi10agc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7378,11 +7420,11 @@
     clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clang-format";
-        version = "20151116.438";
+        version = "20160912.302";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "280808";
-          sha256 = "0jli8vapg8frk12djhrgz4wfhl7pxka73wx0x41a4k45y9yijyfg";
+          rev = "281853";
+          sha256 = "1mz49n2jrfq5q2v4w0b74nrz7zsc9iw1kjzyklil8aygm9448bhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7503,12 +7545,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "20160502.1912";
+        version = "20160916.513";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9";
-          sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860";
+          rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4";
+          sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -7617,22 +7659,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "cljr-helm";
-        version = "20150425.1307";
+        version = "20160913.128";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "cljr-helm";
-          rev = "99c6dcc5228ecd2fe9e6e28a9512cbc3df0770ef";
-          sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
+          rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4";
+          sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
-        packageRequires = [ clj-refactor helm ];
+        packageRequires = [ cl-lib clj-refactor helm-core ];
         meta = {
           homepage = "https://melpa.org/#/cljr-helm";
           license = lib.licenses.free;
@@ -7956,12 +7998,12 @@
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "20160824.615";
+        version = "20160914.148";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "81863c2e16e2ddc6e1616d5585836e46ceee6401";
-          sha256 = "0rj4ww67v0r5wjf8siz6yy3hwxbwsnm9l5f8962sxrjillgf3kpg";
+          rev = "12b7460691dc502d27329d6ac11c51cc83cd098e";
+          sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
@@ -8023,8 +8065,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "f76bcee9a6a95b566e36b533a5fa45b496eb456b";
-          sha256 = "00k49iwbkc82wk3ik05al0xyj34vagdall2bqb6c4lv9plica189";
+          rev = "ca504042d1e28bfafa100d1be825928640cca7f6";
+          sha256 = "1q9k4gfkbbb6pgjk8sw2yyq9xd0a57b6wv7n5vvycsbgn7qwvvkd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8479,8 +8521,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-solarized";
-          rev = "6d1cf921881a0db6286ad6904aff2d17b2a335b3";
-          sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig";
+          rev = "99fb4753f071542690e7a17b3dd76b5f2a05e9fc";
+          sha256 = "1vhncjyw0qbglgsd04cgyqc3473kz97ks15586ljrpa14f8fnjk2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized";
@@ -8496,12 +8538,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20160829.2324";
+        version = "20160916.1758";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "6943ca134babe228fef975506826d7ac471c9ca2";
-          sha256 = "1cnd1fd4mi6jjy7fkldsk9vzgl6q67d5rajr9a5fzzanp4v08zr1";
+          rev = "81d8990085960824f700520d08027e6aca58feaa";
+          sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9054,12 +9096,12 @@
     company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flow";
-        version = "20160831.1929";
+        version = "20160915.2229";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "company-flow";
-          rev = "5439c4060ef0b8120ed6e9bb6c549d412eb809de";
-          sha256 = "1mdx07891gll4rkgm7y0vdp980g72rv07wpnmjdp4v26qy9jnakg";
+          rev = "a5bb9014de6ef1393cb12ff808dd4469da7ea648";
+          sha256 = "15yyg0qapmkc9m53fpxzpiq2rh6cxwanh1k79v0d0qqk97dxdr3y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -9142,8 +9184,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5";
-          sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms";
+          rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
+          sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9331,8 +9373,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
-          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
+          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
+          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
@@ -9348,12 +9390,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20160804.2131";
+        version = "20160910.1747";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5b463aba738648d0ac8e1d1000e849a858353ce8";
-          sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa";
+          rev = "b9e3d647d1724f50af5622be944ea94d04078194";
+          sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9606,12 +9648,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160821.1554";
+        version = "20160918.204";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193";
-          sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd";
+          rev = "83041d5da4ea4637dbd8b018a4762051175dba1d";
+          sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -9687,6 +9729,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
+    melpaBuild {
+        pname = "conda";
+        version = "20160916.719";
+        src = fetchFromGitHub {
+          owner = "necaris";
+          repo = "conda.el";
+          rev = "0d6d85568d662224c9facc196bca7d41a9f88659";
+          sha256 = "1gsppa28ivimwrsadk6gn1llh06a8x36xck9mbmnzgh6c94nblr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
+          sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y";
+          name = "conda";
+        };
+        packageRequires = [ dash emacs f pythonic s ];
+        meta = {
+          homepage = "https://melpa.org/#/conda";
+          license = lib.licenses.free;
+        };
+      }) {};
     config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-parser";
@@ -9920,12 +9983,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160906.750";
+        version = "20160914.642";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca";
-          sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x";
+          rev = "f180451217277e63b067aa3d06d5af69140e320d";
+          sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -9983,12 +10046,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20160507.1022";
+        version = "20160916.1319";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "e17c0845633e3d1fb6f8b84d97efa17227361a85";
-          sha256 = "1jzqhbw6mid7p5s88lwk1vjb12fmmxc3zfkhdkvxiglmanqghq6f";
+          rev = "b157a8d12c9c8e5fea5cf46cb6fe6561f08b284a";
+          sha256 = "0wja54camh4mx864b5ydc2kx2s50i4mg6zzgiz59adysz7aqvci7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10317,12 +10380,12 @@
     cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cryptol-mode";
-        version = "20140426.1004";
+        version = "20160819.1444";
         src = fetchFromGitHub {
           owner = "thoughtpolice";
           repo = "cryptol-mode";
-          rev = "a54d000d24757fad2a91ae2853b16a97ebe52771";
-          sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
+          rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f";
+          sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode";
@@ -10359,12 +10422,12 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20160901.319";
+        version = "20160909.1316";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "2275ddab415bcd790f603ccfb6f613142c6144f1";
-          sha256 = "16dabgcll453rwc7afigsbvk42dl9yb8ihgvvq01pv57y95jn5wf";
+          rev = "0183fc4ac9efa09d48174d01702247eb194af49d";
+          sha256 = "1kccpk47wsm4gmslrv7xc5yxbvx1nj0wgxn8mvg3shw5yb0gag40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -10585,12 +10648,12 @@
     cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cubicaltt";
-        version = "20160810.38";
+        version = "20160914.1356";
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "cdf88159a26e2e4b73f9fea0c88a6e1d16497218";
-          sha256 = "1x9qpil0fmhqld03aj5zxqcb7k4q35ca8w4plgblf5h30l9xzfzg";
+          rev = "16730466b6de68fd6b0261cf4539faebcf0f30d2";
+          sha256 = "1a0i1wbz6bpnkvs77zdkw5g2pkni65syqffg01d568m3jzg0g82v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -10874,8 +10937,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "f0091a9d6580785b868e4660b3a53027a2447a3e";
-          sha256 = "0wlvgpmj6rypgngkmf5wjy6hh45pws40b299r4j1rqk480px1d82";
+          rev = "d1be46e1ae4c0a9c94820e7db18c21fe749bc7a8";
+          sha256 = "0v6skbgvkhafz70zkq6hv7cb0pbmfxqcb43mz3bnckywws5d9dsk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11143,12 +11206,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20160820.48";
+        version = "20160918.716";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9";
-          sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip";
+          rev = "1267711e9701f91a2b08679a1abeb5c43eb820cd";
+          sha256 = "11b2yipp250a2cyigssy12dw489an4gkx7z6f4xkifah5kq81j8w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -11813,12 +11876,12 @@
     dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dfmt";
-        version = "20160827.211";
+        version = "20160911.228";
         src = fetchFromGitHub {
           owner = "qsimpleq";
           repo = "elisp-dfmt";
-          rev = "618274b841b0b6dbfebd79baa9fe05eab2bbd5c9";
-          sha256 = "1pvplsjcxl3m8fxix63ndwcwp54ga12kh0yv2y1bzbd51z08210a";
+          rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf";
+          sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt";
@@ -12130,8 +12193,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -12293,8 +12356,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -12314,8 +12377,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -12352,12 +12415,12 @@
     dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-k";
-        version = "20160817.823";
+        version = "20160917.826";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-dired-k";
-          rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74";
-          sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6";
+          rev = "22662c18af39add062bfc8aba9a294c111ca4886";
+          sha256 = "05i3k7d62rz2wczf5fxs8icsyx6xi2cggdcd36dq0kjimz3z2cd3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
@@ -12373,12 +12436,12 @@
     dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-launch";
-        version = "20160904.1533";
+        version = "20160914.756";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "1c24b5ea9d0b091fac58047cb1a1ca60a16a6594";
-          sha256 = "0cnj9ffphsq7rzq4hnlxaxi4ziij2d86zqll5pg0ggdsfjhq2dv6";
+          rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb";
+          sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -12394,12 +12457,12 @@
     dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-narrow";
-        version = "20160130.845";
+        version = "20160918.740";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -12419,8 +12482,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -12435,10 +12498,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20160826.2346";
+        version = "20160915.1039";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "0v5qi7gvqq52qb8wv2dqw3xq348ckfb1ps1l1sk52qp5iswl6995";
+          sha256 = "05fm87wjspgqjxip41g8z66q0zy4wyh6knid99ddlrn1k94l0y7d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -12479,8 +12542,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -12500,8 +12563,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -12597,8 +12660,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "230f81191824fa920016d9828a8672df402b4e12";
-          sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
+          rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415";
+          sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -12801,12 +12864,12 @@
     discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "discourse";
-        version = "20160811.2150";
+        version = "20160911.119";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "discourse-api";
-          rev = "a1c16af8f77986fb94fbc34c1e6ea36fcd97e00b";
-          sha256 = "0i2p97cgrqz65l0bc6zgixvb5bdya4ynq18ygrs3v66xp02rxqc1";
+          rev = "a86c7e608851e186fe12e892a573994f08c8e65e";
+          sha256 = "1p4crd7v94hmqzqh8bc7jx1pfhallmj4kn36f8l22z4r2mkyycxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse";
@@ -13319,22 +13382,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }:
+    docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20160816.105";
+        version = "20160911.1215";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "d5d6f8ecdc5fdae19ff03ad3b242fd50fd618c4a";
-          sha256 = "0sczy87n9ymckw64fh3lxbpjawfc26xsja4qylzaj5pjsixrnpjh";
+          rev = "7d9b72ed0e7afa992a6f15066bfd974d5f2e1696";
+          sha256 = "05pll1a7j9clgjn00llhra59svkwqhynyyjvsih0p3rhp3vg7297";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
-        packageRequires = [ dash docker-tramp emacs magit-popup s tablist ];
+        packageRequires = [
+          dash
+          docker-tramp
+          emacs
+          json-mode
+          magit-popup
+          s
+          tablist
+        ];
         meta = {
           homepage = "https://melpa.org/#/docker";
           license = lib.licenses.free;
@@ -13466,6 +13537,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom-themes";
+        version = "20160917.159";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-doom-theme";
+          rev = "246cc37a8739ac4343ddcc11a2f185cd42f07fb4";
+          sha256 = "1zgl87lk5783qn4s9fmh5hylwyvb33p94y6i0cbqkgkp1n0zpm4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
+          sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
+          name = "doom-themes";
+        };
+        packageRequires = [ all-the-icons dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/doom-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi";
         version = "20151231.1255";
@@ -13807,12 +13899,12 @@
     drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
     melpaBuild {
         pname = "drupal-mode";
-        version = "20160821.1324";
+        version = "20160915.245";
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "f425ba445ae201a16e3fc3b4f5fb8bea93579d39";
-          sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj";
+          rev = "eec2e557d769f3379e6c208334650f3041d28d54";
+          sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -13851,7 +13943,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1759610";
+          rev = "1761331";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14599,12 +14691,12 @@
     ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ecukes";
-        version = "20150717.648";
+        version = "20160913.5";
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "ecukes";
-          rev = "7dad2da09da33d8540f25bf7bb7dd62900669b80";
-          sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
+          rev = "1dcfebf13506e6ecc7e76e668665cff9cf79acda";
+          sha256 = "0grk10s0fzcdpcimdk1dblq5f8k999h7mlqhhjvvdwjbypmy9891";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -15070,12 +15162,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20160822.849";
+        version = "20160909.937";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "33b8df4e13257a0e893a4f49a1d6aa623e2bca72";
-          sha256 = "059vhx15rvp52s3bdvhz62jvkxi6ab9ly7pmab9cpdcpagqq9gaq";
+          rev = "ec36eacb1455b551a2084f8b7cc79981723dbd38";
+          sha256 = "0pv0a8d0czk3kyliynbwmcqmr3adaw0pis2wgbdy9qz07m2k64s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15131,12 +15223,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20160831.817";
+        version = "20160915.1214";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e";
-          sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
+          rev = "ef949a189d51d00f6ebf56870caf6e6917f11b4c";
+          sha256 = "0qhksfb4ngmncsi4yd19i8fqg97q5yhk4lyc7xh34mzn0bjz7xyk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein";
@@ -15194,12 +15286,12 @@
     ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20160603.742";
+        version = "20160916.33";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "a7509abcdf76408acc03f1f198450b9064bcd5c4";
-          sha256 = "0v7amrmzrmj3myikd0a3g30cmkjri84paxxi4qzldwshj1pwypn4";
+          rev = "2dfcbe4776551bf65ce3ea3a0c1689ae65236ad9";
+          sha256 = "1dwfkyblz7zdsirnvny4cm862i9j322kz7wz81g4clslrjs07x05";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -15236,12 +15328,12 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20160827.1305";
+        version = "20160913.1201";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "0ee06a6f8890d3a1eca913e42c7f22e9d1d507e2";
-          sha256 = "0dv4ags1hfv2fyypqn75cmnjgskwjkx6kjz5r1k93siz3grny8kf";
+          rev = "a6ad0bb2430a89d1711c7c3b1396fe864e2c9b87";
+          sha256 = "196m3lik015lbgnvhj7qb51cja65yd9sww83gnmak7g4hfx67pb8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -15570,8 +15662,8 @@
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "4f8ced25619b34ca6b36f8446071c2cb75e23906";
-          sha256 = "1lvlhjdprlw3dqz49h8gncw5q33mlpqwx9pgi7jj79hrsfq8fqml";
+          rev = "a23a5b92e0efba55314bc621502a373e28784d1a";
+          sha256 = "04dnkrrxim82ysdzwcqhvhqabxm3f97z8nqgn8g8idj0m1as4wm9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -15650,12 +15742,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20160826.1719";
+        version = "20160911.1353";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "85b59b9e580ab58a71852026698c6d61daa977e6";
-          sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps";
+          rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
+          sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -15724,8 +15816,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "85b59b9e580ab58a71852026698c6d61daa977e6";
-          sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps";
+          rev = "f45deed1694340df010e5c60776bfef3784a2c7f";
+          sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -15850,8 +15942,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elisp-slime-nav";
-          rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432";
-          sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
+          rev = "8a1c2717a6fb50b654b8d1ffa12a40420ee32990";
+          sha256 = "1nn97aqfawygvwybr5d51y82az4pj774d6qmwsqfpx7yppd45hsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav";
@@ -15909,12 +16001,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160906.36";
+        version = "20160917.429";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "7e0da96f483703930919f04943f60f6eca3cb842";
-          sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3";
+          rev = "bd85bd55a03512e2fe00b05faee8ffe0878ab4f1";
+          sha256 = "16x566c9ppfz6bhj1hwninpg5p93qf3ik10pkssibwj5igfg7cc8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16081,8 +16173,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elpa-audit";
-          rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc";
-          sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
+          rev = "727da50e626977351aff2675b6540a36818bbbe6";
+          sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit";
@@ -16119,12 +16211,12 @@
     elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-mirror";
-        version = "20160511.2204";
+        version = "20160917.10";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "d735bfaa848d93abde5848673f6bf8e50aaf8530";
-          sha256 = "1l1wnnmz62crr2gzpf0gzqp2pwmd50xp9knpswwz7l482gvfbzl7";
+          rev = "9cf096448b69c795b20aab89557e9add6029b13c";
+          sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -16144,8 +16236,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "c3fb8a8a4aaa7aafec6a38d22ffe1731e7a8cf20";
-          sha256 = "16c5pzrnnjg4dy1k07wn64nmvb8h86530krdyp5h5v4vlpwd3m67";
+          rev = "4137f5aa88fc219f84effc6a6f79def8249bff6e";
+          sha256 = "1jfn3pb0hh5sybgcfmgba7xairpwpcx56xg9gbrn0sviwbcmyjwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
@@ -16206,6 +16298,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "elscreen-fr";
+        version = "20160910.314";
+        src = fetchFromGitHub {
+          owner = "rocher";
+          repo = "elscreen-fr";
+          rev = "698b4028d5d15943c0701ac7b87d0fd9ae7e43fb";
+          sha256 = "005zj0sa60yyxp0vj8zy2mr217a9gvpxd3p1blk2zxdafqn0p8rm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr";
+          sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm";
+          name = "elscreen-fr";
+        };
+        packageRequires = [ elscreen seq ];
+        meta = {
+          homepage = "https://melpa.org/#/elscreen-fr";
+          license = lib.licenses.free;
+        };
+      }) {};
     elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen-mew";
@@ -16563,6 +16676,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    emaps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emaps";
+        version = "20160910.521";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "emaps";
+          rev = "728eb6eeae46194f32a01bafa349ece520bc7a10";
+          sha256 = "1asl6wkibfcxmf1kwnppbh8qpa454ssyxrqfh2d5dna3gxaa2cqm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps";
+          sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw";
+          name = "emaps";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/emaps";
+          license = lib.licenses.free;
+        };
+      }) {};
     ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ember-mode";
@@ -16921,12 +17055,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20160904.2344";
+        version = "20160918.444";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "f791ad4c741218668dad4ba8db65161da9a5b010";
-          sha256 = "172p422889wikj9hvq973whqz9jnkaxay8lsa5zdk26i0b6a2kk7";
+          rev = "f99320138355660c06e382d70a60bc1b6e407a36";
+          sha256 = "1grk1rbfjp11bvag2nimnzsb82fa2xdglszl9y7hx6vigcinyj8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -17143,12 +17277,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160905.704";
+        version = "20160913.609";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "adca2a4dc74edca2a017374543bdcb45a3ffcabc";
-          sha256 = "1wlm4c5pasvnh3mrkwvzhs5phyh3h1a6hyksm4lr7ynvgyn7nslz";
+          rev = "a38910d51226bffaf33b3b3c50a27a41123192ba";
+          sha256 = "1z3f4i8b0058bwdfyhb6lxs7l12myw0fqp0w1qrpzmvk8may28kw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -17424,11 +17558,11 @@
     erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "erc-hipchatify";
-        version = "20160504.1145";
+        version = "20160909.1503";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "b237cf8118fd";
-          sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8";
+          rev = "dbb74dd91c5a";
+          sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -17675,12 +17809,12 @@
     ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
     melpaBuild {
         pname = "ereader";
-        version = "20160904.854";
+        version = "20160918.749";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "emacs-ereader";
-          rev = "d85ff3601f5f6c4771a3e215640f6bc026e02822";
-          sha256 = "1i7599pddh5klad0a0lmkcb978ckc898nknlrbcbrh7r7gm70242";
+          rev = "822a84c5ea76b7ae7de8843ae143ba80bcf92cb8";
+          sha256 = "01k1kxyzrhrd93wysb44r5cb4m768bn005sk5x0g6zsgwca4hfsa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader";
@@ -17738,12 +17872,12 @@
     ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160720.1613";
+        version = "20160912.1007";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "6bb3eb24c8a7e881024d6d0becb01c84c37c95f0";
-          sha256 = "0pnv4q30aab18c65vqrd16dbvl9mfkni13zfcm4sgabpmhgh7r8h";
+          rev = "9eadbc060248ac20bc1f47b2c1f6f9661d464c70";
+          sha256 = "0l9qxqcskmdzjks234d9nf0l9pqaqpch60k278qdh3x6mwlg5p6r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -17784,8 +17918,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "b834a527c2f420a80806fbf36d4585c1e530061c";
-          sha256 = "0n1mrsgbk5r663i2zkxqn4q0dimpr2n156822yb6f38ay6b41c7m";
+          rev = "fde238fb52133a6c7a2a3f2a2e16f1c1bef62394";
+          sha256 = "1iiwrkbrwcc3kb7r0h7nr1y1qqmdsaxh7b9m477j09gjgkz6sbzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
@@ -18280,12 +18414,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20160905.1519";
+        version = "20160913.853";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "14e80d605a9f0d3912526f1eb4bfbeac9290d450";
-          sha256 = "0qlpl2an7qzq9q1ib29z2haqd2q2hqciblxvh982f3yghscn7wgr";
+          rev = "c83eed18866e3a14e75c3faf3028edca97cd1359";
+          sha256 = "13lv31x46cb0cmvxa2f4ibhkp034f3yy4cvv0fcx4w8ps46lfal3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19407,12 +19541,12 @@
     evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-search-highlight-persist";
-        version = "20151215.238";
+        version = "20160912.807";
         src = fetchFromGitHub {
           owner = "juanjux";
           repo = "evil-search-highlight-persist";
-          rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85";
-          sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
+          rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc";
+          sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist";
@@ -19491,12 +19625,12 @@
     evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20160501.1704";
+        version = "20160911.1224";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "eda6b0d6ca856d66f32b2718887ff02ea5c94d16";
-          sha256 = "0nqa5lqr2rplsinxh5nh1qkyl2b7lg64q6pxi2mn3rgvhdq7hrm9";
+          rev = "3812140e11a1b30878701cc028a4305ec3280a35";
+          sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround";
@@ -19512,12 +19646,12 @@
     evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-swap-keys";
-        version = "20160825.1024";
+        version = "20160909.1407";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-swap-keys";
-          rev = "064c7388995803ccf9959e09fe8aaa95c53e001b";
-          sha256 = "0nqj70yw0jalw8svkbh46240kr0bhs60yallrribxakiz5iqyb33";
+          rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133";
+          sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
@@ -19656,6 +19790,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-tutor-ja = callPackage ({ evil, evil-tutor, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-tutor-ja";
+        version = "20160916.1832";
+        src = fetchFromGitHub {
+          owner = "kenjimyzk";
+          repo = "evil-tutor-ja";
+          rev = "99af7d82e02ce3bcdfaff47c5c80b57327a7ea8d";
+          sha256 = "1cms98cy4p5dxwfc1zhgdaln8vr2nxzcj0d31imyabb4mwliabfw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c98605fd21b38aaa200c6a0ec4c18f8575b0d7a/recipes/evil-tutor-ja";
+          sha256 = "1yd8aij9q1jdmb387f1zjiq5mf68jvbgbyp5b49hmag4hw5h7vm2";
+          name = "evil-tutor-ja";
+        };
+        packageRequires = [ evil evil-tutor ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-tutor-ja";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
     melpaBuild {
         pname = "evil-vimish-fold";
@@ -19810,8 +19965,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "9700a076a932d4c8bc92d9e12f21978232056373";
-          sha256 = "11w0wn2q7c80h8czkbipp5j5vgj47jx0azfqk6xpw66dh4205zp3";
+          rev = "5836fb1656493be4152e8f20b5b0ec3d49ca2787";
+          sha256 = "1laii7pvw18pp71r0fssw67lgw7wb5wqbjrpdrg5xr7smx8fxccc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
@@ -20014,12 +20169,12 @@
     ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ez-query-replace";
-        version = "20140810.517";
+        version = "20160908.1329";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ez-query-replace.el";
-          rev = "1c0cab96d65105b780e32fdd29d2c6933be72ef6";
-          sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
+          rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3";
+          sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace";
@@ -20687,12 +20842,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20160809.526";
+        version = "20160909.1355";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "a32ab79cfef0e1c5c8d9055fb99d9cad005815de";
-          sha256 = "0gdsribyrvapinjkpm773rdn6sbrr9gsydpss5jw4p9a16nkl8a5";
+          rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d";
+          sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -21374,12 +21529,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160904.1622";
+        version = "20160915.515";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "f0f31ecb7a08111961961a0455f02d094c115619";
-          sha256 = "1ibrdzhbpwlfgaq5rf15177c7ahramgxmjbagwp54m5n3r6rmiz7";
+          rev = "4681aaacbd8f628d595ab53e7f3fca33f3d00f4e";
+          sha256 = "0cw6af8l3js0dbzxcprmjkfljinsny8zkvsgvs0ca6q50v6aqhda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -21819,8 +21974,8 @@
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "2e863429cc953cf4c14783e249df56d1ae669868";
-          sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw";
+          rev = "33cc9c2d7101e0448e5e49e23487c50df163f7db";
+          sha256 = "0fjm1ll2958rjs2kzn8zgdl9ifjah6rrcsgfb1razbhf57qwbc0i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
@@ -21882,8 +22037,8 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-hdevtools";
-          rev = "ee311ac8d8be5803f13c649b8260839c0024e729";
-          sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
+          rev = "fa9759f4d59764949539a0c37f037c80a6fb5e9c";
+          sha256 = "1d7r0virhlz2vg1cbmsi55gw51lzsj84svn3i19fk44svkkmx5yy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools";
@@ -21924,8 +22079,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-ledger";
-          rev = "78392ba2c0c177c47bb795a1a191c29846837f57";
-          sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
+          rev = "cba408d61e26cf7c31c4a6f82a28a3a32e145c05";
+          sha256 = "0ysc2hwz0xmmlwfwd70nfqvd81dvf4gfrynkrfgg9w6hp7y4z522";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
@@ -22067,12 +22222,12 @@
     flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-package";
-        version = "20160502.135";
+        version = "20160917.1722";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "aeae7de23483a44126740f452e79266fc6fd0d9b";
-          sha256 = "1x5lk6fdai5jvq4hlcgb88ljjncwkq1lkqs8d3wkqwyc3kh3rwjg";
+          rev = "086a98a100d7eab708e3951c60ee93454cf20e8e";
+          sha256 = "1pmsa8hp3cpqlsl1f4yk57gla1y9jhg28fr1n7qck1c955x6qrgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -22155,8 +22310,8 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "2ad60d92610596672b830328b5837b58350ca7cf";
-          sha256 = "0wca22jp0alknmllfl22j89aasiwms6ipqyv1pnvbrgmrbzcmlp7";
+          rev = "2a92f6e2f8cf6a1019358c69c14c7ca835d02955";
+          sha256 = "017869kcd4cjyv0hx4pkpfln96cxp6ra4ps7rx6xwrxa24f0bhrz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
@@ -22232,22 +22387,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
+    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-rust";
-        version = "20160816.236";
+        version = "20160910.956";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-rust";
-          rev = "2a0fb6bb82785fc717b0acc7427e801b08a13017";
-          sha256 = "0dyjamgmgdj0sw9l7ay9s4akba95n0apnza4l5qcbkmz28qw6gz5";
+          rev = "0f134b8c96d6913891b53262e275502814e2084d";
+          sha256 = "1alpi6s691za89j0lw0zv22ri2bkjc40yxc85wijny1k4nz907nv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
-        packageRequires = [ dash emacs flycheck let-alist seq ];
+        packageRequires = [ dash emacs flycheck seq ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-rust";
           license = lib.licenses.free;
@@ -22298,12 +22453,12 @@
     flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-tip";
-        version = "20160622.1906";
+        version = "20160908.1953";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "flycheck-tip";
-          rev = "2e8ec9818f25c57516c48612f8b0963df177123d";
-          sha256 = "0dblxsny6immyg9l1mraahqipbbybg3drny87gl5vsvqpd94g4px";
+          rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91";
+          sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
@@ -22319,12 +22474,12 @@
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "20160808.754";
+        version = "20160913.130";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193";
-          sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd";
+          rev = "83041d5da4ea4637dbd8b018a4762051175dba1d";
+          sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -23775,6 +23930,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fsbot-data-browser";
+        version = "20160918.213";
+        src = fetchFromGitHub {
+          owner = "benaiah";
+          repo = "fsbot-data-browser";
+          rev = "d1a61d1c4f6f4701c3ce98502ffafec5c9b9816d";
+          sha256 = "1scsxkdxqv99pdgpkqdvmabpx0mwr8jizlz428nmbwigcgwj9sji";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser";
+          sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5";
+          name = "fsbot-data-browser";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fsbot-data-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
@@ -23831,8 +24007,8 @@
         version = "20160825.254";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "98be09e8eab968cfd6c4c8d9ed0d894297aea82e";
-          sha256 = "0gyfi59rd61sxpgw0dz6xk5n2ickrxisgwh443zx9jainjrqk5f9";
+          rev = "c590ad120194f28634ee475a7f9b00610528b16f";
+          sha256 = "0mscfrbjdd06n2c4ldkrybgxxmiz7bm5yc706lz0p8219vnyzb2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -24073,12 +24249,12 @@
     fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fzf";
-        version = "20160714.557";
+        version = "20160908.806";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "022798e6ed0d03fcb896635d7322f0b79f6463ff";
-          sha256 = "1vc0lh6cr3d7fyg7w400750glk3jfas0y58qxh2wdsnfj8qvarc3";
+          rev = "383a050920e9b99d37c21d041deb7f38b202485c";
+          sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -24281,12 +24457,12 @@
     general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general-close";
-        version = "20160907.532";
+        version = "20160916.753";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "general-close";
-          rev = "e8913a9f57cde590cd932704ba6efd7429572435";
-          sha256 = "0djf7rz918z2xchf05ir8q0jc1zmrdvvmpmhl8a8qfav9146ffi3";
+          rev = "88223d95bf661b64c24b831d228375433b84b28f";
+          sha256 = "0wgwx2bcavyl6rlbai7cih884rb3b3jqr7y39nhpqn8rydrrl42f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close";
@@ -24386,12 +24562,12 @@
     ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ggtags";
-        version = "20160617.1840";
+        version = "20160909.813";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "b4ee572a6b2e70d3db6ce11f73e6f87b73a13273";
-          sha256 = "07gbnymgc6lfv1vd37kqfm5bwg5zn5603fs2amrcc6jz3jyqfn0p";
+          rev = "c697c1d55a95daa5bbe214153c8bbc71ba5b9ba9";
+          sha256 = "13j64bsnc2dgkmbdidw1kghyh0r0la3f4xbpzn0s41q2nmcq335m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -24453,8 +24629,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "8be4cdfe5f051f29a2488baae8a106a914d83ba8";
-          sha256 = "10f5492r6pb203669zgpy49csz2jfmjxp53pnyk2rwyzfy0ci3v6";
+          rev = "b7cda9e9b9515ac2cbf8a0cf0ffe7cd4ba52844b";
+          sha256 = "183ssyryfqzz4dacirkfn6ycigsm6mfvr6mx4hivav9jzyrd9n7x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -24743,12 +24919,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20160821.1338";
+        version = "20160917.2127";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75";
-          sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300";
+          rev = "1c05b110ef5629e607feea0384a19ac2c036cc51";
+          sha256 = "1pnbi1izp5ywd343hklkg9m4m1pbl2m98hi8gbva6r36vjlp9w44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -24911,12 +25087,12 @@
     git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20160813.1502";
+        version = "20160911.1640";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2";
-          sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260";
+          rev = "f5b62320b45cfdfaf8db5b4e91f536bf0043ff0f";
+          sha256 = "1s18x9cnmx4jjgyi7jnsg4qsvjlxq9aablg5c3z458w2fh25h3rg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -25205,12 +25381,12 @@
     gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "gitlab";
-        version = "20160519.303";
+        version = "20160909.56";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
+          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -25244,6 +25420,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitter";
+        version = "20160916.1128";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "gitter.el";
+          rev = "18dcb779350367af49d34b4a1c6c3f576657c327";
+          sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
+          sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv";
+          name = "gitter";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "https://melpa.org/#/gitter";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitty";
@@ -25619,6 +25816,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "go-add-tags";
+        version = "20160908.1754";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-add-tags";
+          rev = "86b51a94832b4533fa70f11e4244e5c041075b1d";
+          sha256 = "1jnj7wml7cynkkmp8bljdlnb8mhbammbycw9gr5cd5dmzip89yac";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
+          sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
+          name = "go-add-tags";
+        };
+        packageRequires = [ cl-lib emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/go-add-tags";
+          license = lib.licenses.free;
+        };
+      }) {};
     go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-autocomplete";
@@ -25626,8 +25844,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5";
-          sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms";
+          rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a";
+          sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -25772,8 +25990,8 @@
         version = "20160715.854";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064";
-          sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24";
+          rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09";
+          sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru";
@@ -25810,12 +26028,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20160715.205";
+        version = "20160913.944";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "737611ee2f8ffd6ae573e37cc04c4ad4abe7697d";
-          sha256 = "0wljlakm6gjgjrvinpi7vgs1n08xj87cvqq149gzzjwa9dq2gk15";
+          rev = "004575eb128ab01a11b4a4d278c544f91cf752fd";
+          sha256 = "0il6hbk1lvmqb6c45zima372g7my14bm13c9mlcsxghpp0hs1fj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode";
@@ -25897,8 +26115,8 @@
         version = "20160307.744";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064";
-          sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24";
+          rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09";
+          sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename";
@@ -26208,12 +26426,12 @@
     google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-translate";
-        version = "20160824.1707";
+        version = "20160909.1358";
         src = fetchFromGitHub {
           owner = "atykhonov";
           repo = "google-translate";
-          rev = "7e156e840d597f413ef3debd7629adf8de63da5d";
-          sha256 = "1yf7z7mwn4qq9q1phiap565nvs8yrw7p1y8i7wwi2xbi91mjc232";
+          rev = "a1e95d9f01550b5170db052887be3d45482dddc1";
+          sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
@@ -26373,12 +26591,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20160808.1810";
+        version = "20160909.1241";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "582151d8d15324ce497ee6d7c0297b2fd27701d5";
-          sha256 = "15g4p7hjimnapcdrl8r1cixjyj3glqw2fribk8mws3f4sbihw952";
+          rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1";
+          sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -26541,12 +26759,12 @@
     grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grandshell-theme";
-        version = "20160906.810";
+        version = "20160916.1139";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "grandshell-theme";
-          rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d";
-          sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7";
+          rev = "d9c54538b61d07935292bcb03377b58dbe9c5e2a";
+          sha256 = "1y0llafgmw0bp9h4zlrlazl3spz2c9mlsii86h397bsqd970zzcp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -26883,12 +27101,12 @@
     gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20160907.315";
+        version = "20160917.2225";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "b0e67e42a44374be7176e199414a40309cd8d6fb";
-          sha256 = "1h2whbp1qqlfgs3z7nxk31jgq7dqhsac8pxamr6wvxpy23wvj9x2";
+          rev = "9b0526be614190cfc78d06024b2254802fbc706d";
+          sha256 = "0xfansmy336g16smr47bf5pm8allzb6imzbyny4jry2mvk7q74p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -26985,6 +27203,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gulp-task-runner";
+        version = "20160911.430";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "gulp-task-runner";
+          rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2";
+          sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
+          sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7";
+          name = "gulp-task-runner";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gulp-task-runner";
+          license = lib.licenses.free;
+        };
+      }) {};
     guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guru-mode";
@@ -27030,12 +27269,12 @@
     habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "habitica";
-        version = "20160828.912";
+        version = "20160914.1903";
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "emacs-habitica";
-          rev = "eddd0ad1664b305e2b8c05daba3fd37971ee8d24";
-          sha256 = "1xwzdlbn19aq66v2b1i5kl6jk9zs6dk07ryy14yws26d1ajvm8rg";
+          rev = "038c69283bf54b902dc42de0b6ec7d567c4629cb";
+          sha256 = "15n32p8ap6a4da9hsq0hhcjaqfmy2y6x8j02sqgi13mh1rlp0g4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -27387,12 +27626,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160827.1033";
+        version = "20160915.741";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "80225e09bf06ab3962b24812f014f948218e0c80";
-          sha256 = "1vb6wp35l1vhzlyfs7h5hcnmm2mk47sxxx5waiclmafc7y8j35al";
+          rev = "365c2270ffe30fcfe2158701c3d83d00cf6f5a42";
+          sha256 = "0qjg6j0x4wb96zslchjvbp1fz81qa9ffwkacwyhrrlfpaq1f6lx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -27655,12 +27894,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160906.1118";
+        version = "20160916.2319";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404";
-          sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9";
+          rev = "7aeb35f0f5490f4d7cd7037880845ec885ce3d89";
+          sha256 = "0iygx5s6kpgni542qxqm826rnb6zb0yyxm0p9zrd4zf541687psz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -27739,12 +27978,12 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160809.337";
+        version = "20160917.2126";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "88e422ad5a76a7a0d8a5cd766d29c22206d8135e";
-          sha256 = "0fmhys3ikjcqnsld8fc04d9l0kbb8gs1n3yy06kxf5jzc8cnyi84";
+          rev = "4086ec0bf3f680a0e1eca0b3f514e82514da4365";
+          sha256 = "1hbgm3aywh14cpzyn7437nr3xnyfqxy5yvgbgwr2100kqbxcvyhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -27844,12 +28083,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160823.900";
+        version = "20160917.342";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960";
-          sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89";
+          rev = "e3351d11469df31104ac27faffbb93ff97a6740b";
+          sha256 = "17d5yrdsv2ax2mbs6s0p3bsy25c46r2s953b5i2jdcznh4s2fvzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -28033,12 +28272,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20160902.2037";
+        version = "20160912.1935";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "375b5666e333398a60e9ddb9a38cad677e2f60a0";
-          sha256 = "0vh3whp4qr56ijjkx24g4yis3qvkjgzhzx535hl7kqnrpf4apjry";
+          rev = "eab25fb6bc151b467a1d6a16b8d7a9e39f6ccdac";
+          sha256 = "1hrvlj38rifyh1fsjcl4l77xlvnjavgff9wx5i6da20zkz2kqzf1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -28201,12 +28440,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160906.1004";
+        version = "20160913.219";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404";
-          sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9";
+          rev = "7aeb35f0f5490f4d7cd7037880845ec885ce3d89";
+          sha256 = "0iygx5s6kpgni542qxqm826rnb6zb0yyxm0p9zrd4zf541687psz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -28306,12 +28545,12 @@
     helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-descbinds";
-        version = "20160806.913";
+        version = "20160916.713";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-descbinds";
-          rev = "7771aa53d4f2828022504132114fa99e178be892";
-          sha256 = "0dp540vah2lnza4g1p65ping09jk944fvpq7yp965dj62gsjbjgn";
+          rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c";
+          sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds";
@@ -28793,8 +29032,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
+          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -28875,14 +29114,14 @@
         pname = "helm-growthforecast";
         version = "20140119.1944";
         src = fetchFromGitHub {
-          owner = "daic-h";
+          owner = "daichirata";
           repo = "helm-growthforecast";
           rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b";
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/935d4c6bff4adab531536ab6a695cb690c72e0ae/recipes/helm-growthforecast";
-          sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/helm-growthforecast";
+          sha256 = "1qlyp263rl0892hr53kgc16jlx3jylw2pplbzlx05a60k5348jjv";
           name = "helm-growthforecast";
         };
         packageRequires = [ helm ];
@@ -28894,12 +29133,12 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "20160726.844";
+        version = "20160917.2238";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "fb0079054518b966a1b8a42f5d970e5fbc522d37";
-          sha256 = "1nw0drvyqdjwdq4q5ypj1pqjvkgmgz64i70r7dnwnyjpgvk3d1dc";
+          rev = "1dd22dcc97a593f920f10acd7afd167f0e060f7b";
+          sha256 = "0sixfcs6114x9af9m8frjj0cz1krzrm5z704crlfjlbw8a8a16l1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags";
@@ -28978,12 +29217,12 @@
     helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hoogle";
-        version = "20150919.32";
+        version = "20160913.1022";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "helm-hoogle";
-          rev = "f4a02784dd7c3f6e8ecda31dea23b2faae260636";
-          sha256 = "1l85kip4zd08d38sk7cdafmx0v68dh419cs86g7x0mgi0wn00kfc";
+          rev = "882b729b9f0f23d35e808e0dcd51047954486135";
+          sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle";
@@ -29233,7 +29472,7 @@
         version = "20150717.39";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "152395";
+          rev = "152787";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
@@ -29313,12 +29552,12 @@
     helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
     melpaBuild {
         pname = "helm-mt";
-        version = "20160803.713";
+        version = "20160917.2152";
         src = fetchFromGitHub {
           owner = "dfdeshom";
           repo = "helm-mt";
-          rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed";
-          sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw";
+          rev = "d2bff4100118483bc398c56d0ff095294209265b";
+          sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt";
@@ -29359,8 +29598,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
-          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
+          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
+          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
@@ -29422,8 +29661,8 @@
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "598e88f0c0dcb37a0af8ee890be71d8522bd2748";
-          sha256 = "0ab083b5n2jxqxbcvrriyw896j3gsb86k3ngwmjvvfk4bdyzgabp";
+          rev = "48b77b5154547aab641b4ba5f77cb5946f1b92d2";
+          sha256 = "1l4z8y5dfp09ic368fcqh0akgn4y5adk2pg8dnlnh3hl9468q2a7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -29457,22 +29696,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-package";
-        version = "20151210.48";
+        version = "20160917.2232";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-package";
-          rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
-          sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
+          rev = "dec1600da71301d14a7c17052286ac4a25378b7c";
+          sha256 = "0qg7q01i48x8igfv3sh3gx77af76hj3yrwwc7f878r56k3w9d2ca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-package";
           license = lib.licenses.free;
@@ -29520,22 +29759,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm-perldoc = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-perldoc";
-        version = "20160712.2137";
+        version = "20160917.2256";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-perldoc";
-          rev = "90a0ce4d2f4c77c486869ed3ecdbcb3f2014005e";
-          sha256 = "0xkxl07y9z6zdh41m3dg9q35df2lsgbp298svlfygdm6rl5i2z0v";
+          rev = "1979f9f67814c11ec9498502237c89a5e1153100";
+          sha256 = "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
-        packageRequires = [ cl-lib deferred helm-core ];
+        packageRequires = [ deferred emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-perldoc";
           license = lib.licenses.free;
@@ -29565,12 +29804,12 @@
     helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-proc";
-        version = "20160514.718";
+        version = "20160917.138";
         src = fetchFromGitHub {
           owner = "markus1189";
           repo = "helm-proc";
-          rev = "0a75a86e4f381143134e0cdcd8c84c5b5b0fb2d6";
-          sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2";
+          rev = "a096066d352174cdc71f3107b089913d6b0b588d";
+          sha256 = "02rzbjzfvpszgh6gdnklsgmcxyzl1w4j88fkh7jkk3jdrrapysdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc";
@@ -29688,22 +29927,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-pydoc";
-        version = "20151008.724";
+        version = "20160917.2242";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-pydoc";
-          rev = "8eebf6535b4669b5d9e50bbe4f319cd54a2878c7";
-          sha256 = "0admgfy0p13nilb4fi3dq8pm48w1fib8h8avi7h9ybi9k5h6x4ii";
+          rev = "85480a29b56dacde425655bc8f5a597c785afdf5";
+          sha256 = "1wrs2d84xzjnsmw255bmnd1wcpwd36m0vyni48aa7661d4dh10x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
-        packageRequires = [ cl-lib helm-core ];
+        packageRequires = [ emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-pydoc";
           license = lib.licenses.free;
@@ -30066,22 +30305,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-themes";
-        version = "20151008.2321";
+        version = "20160917.2245";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-themes";
-          rev = "a6449a40c5a219b43a92c975917a07337f864b4f";
-          sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
+          rev = "1160af42590b0d845a55e65e1e782d9e4027fd6e";
+          sha256 = "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
-        packageRequires = [ helm-core ];
+        packageRequires = [ emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-themes";
           license = lib.licenses.free;
@@ -30236,10 +30475,10 @@
       }) {};
     help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-fns-plus";
-        version = "20151215.637";
+        version = "20160917.1126";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
-          sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
+          sha256 = "12hjki054sm7gaky7q3b3sp8y4lxpnaq1vphjg85pfvad72rz71p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
@@ -30979,8 +31218,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "4ef059b127d54cb9dcb3b6ecfbc7f8bc1681a0af";
-          sha256 = "0vcyxzd9wr15mqqfcnshm3xlc4pqv7r3slzfrbrac0a9n6xns0g5";
+          rev = "2580027fe01f3c76a01e2695411f0b0b4b60e1c4";
+          sha256 = "0f0n36rwvw72shiyb8zfzfyjil64k55brh9r33x7r2kksmrbfxys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -31021,8 +31260,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "hippie-expand-slime";
-          rev = "432de36799fffc920e5bff7a4691f3c67236e59c";
-          sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
+          rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f";
+          sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
@@ -31552,12 +31791,12 @@
     ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ht";
-        version = "20160806.1753";
+        version = "20160911.1900";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ht.el";
-          rev = "62d77713ecb99871f2b05c111474445c15781164";
-          sha256 = "07n1xh6q2v25jarjlkgjzn40niz958jw0r69d5c2mf66fr7n0b8g";
+          rev = "addf09885e019a7c279ecd3693c35eda1c642e25";
+          sha256 = "1kjlppsrddgvljd3qqfa198h1dlpkvqh97b7g0z2cqfjlsn6sxk9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -31864,12 +32103,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20160828.154";
+        version = "20160913.216";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "3527b321ce02b796e22a4adb2b4c3f17899ca935";
-          sha256 = "04r8bpznqfv5xlg9y9f1b690943117hhpxxfif398j8yyx0d8jpi";
+          rev = "dd5f703d5257e5fbedf3e2a400a68f2e7663077c";
+          sha256 = "1h4lyr0mflvmv53x1w9i2dln090q2a4nfdj5p7vzpvran8hxrrwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -33109,12 +33348,12 @@
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20160606.2318";
+        version = "20160913.1754";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c";
-          sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f";
+          rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7";
+          sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -33564,6 +33803,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "intellij-theme";
+        version = "20160915.1707";
+        src = fetchFromGitLab {
+          owner = "fommil";
+          repo = "emacs-intellij-theme";
+          rev = "8e86c414aebb37543656f672e6afab0d54aa40ba";
+          sha256 = "1iqzcjyawj02ayzff3h19abc7fxwi074yjd17yj4rzfqcy67kbd1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
+          sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g";
+          name = "intellij-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/intellij-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interaction-log";
@@ -33609,12 +33869,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20160905.137";
+        version = "20160907.748";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "a82fdea78717047cec33c3b3c2b5fc5739e21022";
-          sha256 = "18p7dmiymmw63dcn2v1wfy3i0prg6ldvbjdk98irvjg4mrfif1nb";
+          rev = "fcac7d023c123f8b510b64bd68d2201cb1162493";
+          sha256 = "0rxmrg2dvcrp9kddpa7687yqqqb37q52wg7i0m274snjf8dxik12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -33858,12 +34118,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20160825.1209";
+        version = "20160912.904";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "03cf7216c93dcd907ce9e13e52b6de545a5593bc";
-          sha256 = "17a6mpyk2pj479jjzxc68v2c62d07609ys959kb33c719w9djpb9";
+          rev = "51e11dbb4219f9bdf185c4a37d3fc9855ecf6baf";
+          sha256 = "1k1smdzm4mbm3i6iqwzwcgdylzn05pp503r09d0s83d0jbhz682h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -34146,12 +34406,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20160905.940";
+        version = "20160913.535";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca";
-          sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x";
+          rev = "f180451217277e63b067aa3d06d5af69140e320d";
+          sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -34167,12 +34427,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20160823.900";
+        version = "20160917.342";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960";
-          sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89";
+          rev = "e3351d11469df31104ac27faffbb93ff97a6740b";
+          sha256 = "17d5yrdsv2ax2mbs6s0p3bsy25c46r2s953b5i2jdcznh4s2fvzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -34188,12 +34448,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20160905.353";
+        version = "20160914.536";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "568e639a31828e4e7155c96d3b9e0f10fba4c2cd";
-          sha256 = "0y1w84v4pfj4fazz0k43l6v6as5jpd1ccpnb4z2dih0460rgbddz";
+          rev = "7382e07a887d4aa3485e52ced8238de828f549c4";
+          sha256 = "1v4n1rkkhrf48l28ps22lxa4b03bndp7rdzb0l1gh0wz8iqv2hxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -34213,8 +34473,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "2ed2e36dd023c12545f00b41d01bca326048656e";
+          sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -34234,8 +34494,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca";
-          sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x";
+          rev = "f180451217277e63b067aa3d06d5af69140e320d";
+          sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -34290,6 +34550,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-xcdoc";
+        version = "20160917.355";
+        src = fetchFromGitHub {
+          owner = "hex2010";
+          repo = "emacs-ivy-xcdoc";
+          rev = "5ea22af36c4c2737fb0bec53432c233482d8b314";
+          sha256 = "1m5ljx395yw70fx643pnf7pk709s9v5b77zvvv3j21d0cjnppqz5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fd855c098ca65293d84c3b526b0c39f7b07ade/recipes/ivy-xcdoc";
+          sha256 = "1my45325ys2m2l5y8pmi5jnbplqm16b1n7zll37163vv16zwnd53";
+          name = "ivy-xcdoc";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-xcdoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
     melpaBuild {
         pname = "ix";
@@ -34417,12 +34698,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20160913.816";
+        version = "20160916.1606";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "5d9c5cc88a4601700adba558aab2818591fcf02c";
-          sha256 = "1jfwns1jk0ixpxcf2rk49mr008bnnzq8g591vyd31lb5n10kwyc2";
+          rev = "8b654ed00d4854c82c97a3c331709bb34f83c97e";
+          sha256 = "1fdr0hnq4fjmc74flsypf0jwmcwb0i6mk9v06qv11p4jma1aaqdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -35104,22 +35385,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
+    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "20160622.2316";
+        version = "20160907.1705";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "83978912073d554f3dc1185a8a46222317a90539";
-          sha256 = "0h0dfq2rrnlvdbm39l2wqmhzrps6z6ha65j26bnblwa03jr608l9";
+          rev = "2f293bde7ad99fa1f3c8eccf2c4d4782b90c515e";
+          sha256 = "1maxypb349k5aw8q72k46zr4j3wmw2c81lghpb5j2jq70ndnpj4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
-        packageRequires = [ nvm ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/js-comint";
           license = lib.licenses.free;
@@ -35212,12 +35493,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20160525.113";
+        version = "20160915.544";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "987ed3be5f78d412fb73906cc0d077ddfc15f02d";
-          sha256 = "0yzlcnana3ildshzmv60vfgfjkmxki42r7waxsmphjz2hcknbmfg";
+          rev = "87dd27a3f4a673c1bebe82eac67c66b17a321a70";
+          sha256 = "15vgvhfpkg6a1cm790fjzjxh7zw34rjpv9hzvycm0f4d1i23mzn1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -36238,8 +36519,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "20eeefed81847f52b8d003fdfaa20cc6a927b311";
-          sha256 = "0b6dgpl592fgz54j5hnhv6hylqjj0773j9zn7mk275m5c10is3cp";
+          rev = "3a6b569a48eef9d7295690496d4b0dd013599b2c";
+          sha256 = "17l5807hl1wsdlg6nhb334kcy07v51w615b97qjqb01c3nv36d98";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37091,12 +37372,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20160827.205";
+        version = "20160913.1431";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "a41db665be150c8d4435dad6b4d15824034f296b";
-          sha256 = "05avd08kvi74ivi0dwdygwi984ga1vxb1xc3cqpx4ircknilbc9a";
+          rev = "e33f4dcfc5c38ddd66c583f725d68eb3c88fa443";
+          sha256 = "0myx4slbj3i4ik8c7n4sya6r14yns2zqwy1yv4p5kj30zkmds0va";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -37155,8 +37436,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "c097741baa2a6757c94d01857139e8401b018294";
-          sha256 = "1kamlps1bzsvz4kc7c0fzv1930zg92w2zgj20ghwmlsk9bl14zpx";
+          rev = "ecca274eabf1a6ee60145382aeab9522ba3bce25";
+          sha256 = "0wlnb8g52qp34a089wa7923x2fvgrzbdm3spdrwlw8g7396gfw5l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -37468,12 +37749,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20160906.743";
+        version = "20160915.435";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "2360ae987f8c7a10bfbd716592982777bf6745b3";
-          sha256 = "0skzfh26qwjbaxmspdmzma5bgqbibxqj8i24b8kmljdmij8z0gzn";
+          rev = "9c5d64324fdc0f15687b7db68bc4246e47d03e69";
+          sha256 = "0wgfjav689cr5lxzm7dnbnr9gvqqns7n6w7xi6wwr2lsmi1r68r5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -37868,8 +38149,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "9313182d938463d6fa1ba7ee75d002af37a0bd01";
-          sha256 = "1m8ah6r8c1wscnrv3vbk9f02bls509zz5fmwrkgjrsylp3963vx9";
+          rev = "305b3f3b5aa3e18be856fd5bd9c289145310188c";
+          sha256 = "0dvncv0l4azqi40yf827mp27vi533pnn5mrhzs8q7zajndgsphww";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -38487,12 +38768,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160902.1451";
+        version = "20160918.722";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75";
-          sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300";
+          rev = "7da77eeb5b75278f6ef99d4fcfc0f38882759355";
+          sha256 = "0c5zm4iyxgvbn1qg6a19yjgavxsbrbmakxjn871p4qvzp03zn8br";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -38666,8 +38947,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75";
-          sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300";
+          rev = "7da77eeb5b75278f6ef99d4fcfc0f38882759355";
+          sha256 = "0c5zm4iyxgvbn1qg6a19yjgavxsbrbmakxjn871p4qvzp03zn8br";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -38764,6 +39045,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "magithub";
+        version = "20160918.117";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "magithub";
+          rev = "d73b18b64fb89a86f11422e30082cadedabb76a4";
+          sha256 = "0zg9g1h0m03l5x3102ha27m7rabpn0fjjy8r39zpp2pph0d139cr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
+          sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
+          name = "magithub";
+        };
+        packageRequires = [ emacs git-commit magit with-editor ];
+        meta = {
+          homepage = "https://melpa.org/#/magithub";
+          license = lib.licenses.free;
+        };
+      }) {};
     magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magma-mode";
@@ -39439,12 +39741,12 @@
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "20160516.844";
+        version = "20160908.1538";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "f9e2c7f86f94cb9a23be6bb618cb31304a491841";
-          sha256 = "0nh016z84hx86rd09xvwajm44259viwgl1dx33d6z9dcjpp7f1mm";
+          rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40";
+          sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
@@ -39767,6 +40069,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "meghanada";
+        version = "20160916.2239";
+        src = fetchFromGitHub {
+          owner = "mopemope";
+          repo = "meghanada-emacs";
+          rev = "3c7ffe201735d4b6dbc1e449248194eaa40e6c07";
+          sha256 = "15yc312lixa2kv8fij6yp52dqgwi4pdf6w4b776flbqd14y23amd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
+          sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
+          name = "meghanada";
+        };
+        packageRequires = [ cl-lib company emacs flycheck yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/meghanada";
+          license = lib.licenses.free;
+        };
+      }) {};
     mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mellow-theme";
@@ -40492,6 +40815,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mips-mode";
+        version = "20160913.1514";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-mips-mode";
+          rev = "8d9298d09d63223fb5dbd567f2dfc7af7499e025";
+          sha256 = "1mkav9n5zspbplfsbqkyfgh9ha71bgfaxclabi3b3y75cc651zwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
+          sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7";
+          name = "mips-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mips-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-cmds";
         version = "20160719.1606";
@@ -40719,12 +41063,12 @@
     mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "mocha-snippets";
-        version = "20160211.832";
+        version = "20160912.514";
         src = fetchFromGitHub {
           owner = "cowboyd";
           repo = "mocha-snippets.el";
-          rev = "ac1f196bc0214cf7ec99bf34aafcbe13d53dffc4";
-          sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx";
+          rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71";
+          sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
@@ -40902,12 +41246,12 @@
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20160814.2212";
+        version = "20160907.727";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "c27112439d1567421922bd582ea525f4597ccc5c";
-          sha256 = "16f4dphpnwpq5kw8k5pchq3l909b4qcgzqnycqfjgdr7ssjp5n4i";
+          rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23";
+          sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -40962,6 +41306,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monitor";
+        version = "20160914.923";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "monitor";
+          rev = "a7141cd2043625d3b2e1421f501ffecddd956c3d";
+          sha256 = "1lv1cn8lcnbv9468kc19cicfr7kimp1ww1shx3hd4yn3zpiqhqah";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor";
+          sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643";
+          name = "monitor";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/monitor";
+          license = lib.licenses.free;
+        };
+      }) {};
     monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monky";
@@ -41299,8 +41664,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "73a8154b79b0b8db6cf8e11d6f1e750709c17518";
-          sha256 = "1vn4i0cj60izng4zvpjgbdrlv3v6wilpkzxvb9mz5a8adf3myv5h";
+          rev = "d44d0644bf6d73d1d32e55115e2463526a1427c0";
+          sha256 = "0zzmrqrx69hw1ycsirw7w16nrzka805dmnpfrqrn1m2nky7ykj4a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -41484,12 +41849,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20160814.145";
+        version = "20160909.918";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "12d3c458e8a45440776f6560c5f22a090ff24769";
-          sha256 = "0iy3lslr3w4npfqasgn3bv5akdc7h7csx7amcybb21dzwi38bi23";
+          rev = "9e21a31f3a3dba0c6a7c496d8503299b625f0575";
+          sha256 = "1jppxzi9pya7ap92j8d6j8v6zmnwlx3jnj1araivs02hgml34695";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -41505,12 +41870,12 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20160604.243";
+        version = "20160911.41";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "04872b79273ec81670e0ea19ed2c90ba74467c57";
-          sha256 = "00ylq8ay7j21winii1g3c3hcaihcnq209mngs7g1cgykh1fpbblg";
+          rev = "b695dcf4688e288488a6dd1583de3782df0a4549";
+          sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
@@ -41586,12 +41951,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "20160831.1826";
+        version = "20160908.1139";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "e698e94ff34ab432bed9a11626c3a0277bd45fe7";
-          sha256 = "1rq4bpa9bfyc9r3hwa6ik3yk74aizz2k1crwmafqy2wqlr6zx04q";
+          rev = "7c03bfb2fc1c682ad78689325eac9cf302970ea0";
+          sha256 = "1lb3kal8747z61l55dfpfzcn8m5114vrwgm8ar126rqp7hxa97xa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -42185,12 +42550,12 @@
     nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nameless";
-        version = "20160403.1113";
+        version = "20160916.728";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "Nameless";
-          rev = "49225f379efedf228636985a92ca6fb84cfdea5a";
-          sha256 = "1g8852c68ca4b4wf781aiyhbgk2a3g39jw1mijzpp0lmmnsbmmwc";
+          rev = "e5e2f0a23c56cba750f93e74442104222f7f30c5";
+          sha256 = "06xvh0r4589kxb6pr8a4xxr4msxl4jfp3dh3f9xxvp1icwlf4j9b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -42622,12 +42987,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160906.739";
+        version = "20160918.751";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "f2cec77d0c6ea843e37c584470b2c65561a457a7";
-          sha256 = "09ll5l0vd4iybmgp43jdf55crgn0rcdcqs42v6yfknf9n6wf8w4f";
+          rev = "d3ef20cb25f1e0f48318e50cd36b72f161a31725";
+          sha256 = "1rs7x2vj6k8kp3anbfabxvy2a1jvmpcvr2qhpjzyirzzkii79f1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -42664,12 +43029,12 @@
     netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "netrunner";
-        version = "20160622.642";
+        version = "20160910.1632";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "netrunner";
-          rev = "202ddb1005ca54da3884f38627c6d1e5ba85d56d";
-          sha256 = "0xj52211ca7fgr6zkwaf3rgn6zl8c3w2j3lfc4fkm2wlkhb9xcks";
+          rev = "c64672992175c8c1073c0f56c2e471839db71a0f";
+          sha256 = "1jj8qsq4xa93h3srskhw1l6igzf9jhwl8hfa73zvqr8dhqhp149k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a8b1d8c31383b6ec3788ad6c9adf0117190484c9/recipes/netrunner";
@@ -42745,6 +43110,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }:
+    melpaBuild {
+        pname = "ng2-mode";
+        version = "20160910.820";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "ng2-mode";
+          rev = "7ae7b79e6f42dde659334d7b153e69010ae365cf";
+          sha256 = "1l0g7psl6w2rskdq418am8xdrlahr3dkv2byjj12bbw9fafr3484";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
+          sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r";
+          name = "ng2-mode";
+        };
+        packageRequires = [ typescript-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ng2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nginx-mode";
@@ -42829,22 +43215,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20160827.1217";
+        version = "20160913.1422";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "208f42612b66b2d2cfc25381035f94b75c6364f2";
-          sha256 = "0rcvfkknvy6pwvgl9h66lky5kw4kcjanpj7lisva9s5a4iq8z0jb";
+          rev = "04507a391fcce5689890a1d9801f13ccf965e33b";
+          sha256 = "13v2da45vn4p8xb081m920kk4hslhybxvr68qjjylkn1an92s2qx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
-        packageRequires = [ commenter company emacs epc flycheck let-alist ];
+        packageRequires = [ commenter emacs epc flycheck let-alist ];
         meta = {
           homepage = "https://melpa.org/#/nim-mode";
           license = lib.licenses.free;
@@ -42899,8 +43285,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "312bab008d835dd9c8939b803d2bc7af4f82a811";
-          sha256 = "1vj7dwrv0x4zjaxpn5baiy1dhzdhabdcj28yp2dykdvymmp3zx8x";
+          rev = "0d38b4c7926890decbe2b03ed8f84584a5ce9b8a";
+          sha256 = "16fkh4bxdmhrxcb1srz8bf9snv4kjd97q48swrzzsyy042v7f9hm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -42916,12 +43302,12 @@
     nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "nix-sandbox";
-        version = "20160223.553";
+        version = "20160914.1324";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
-          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
+          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
+          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox";
@@ -42941,8 +43327,8 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
-          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
+          rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de";
+          sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
@@ -43165,11 +43551,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20160904.423";
+        version = "20160918.657";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "fce8146a8b738f2317034fee6236cdbd3597849b";
-          sha256 = "04iscnc83c1yhzwid83m71bgawnqkzwvikffgqd6kiwj140ahx2r";
+          rev = "a448879e49fb838a302b4e68d73e63c6b75d9175";
+          sha256 = "0apq1fani13ddv3lmq1d9nd0x8hxyfj9ii3xg37b1lyahhh6s67z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -43515,6 +43901,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-applescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-applescript";
+        version = "20160914.1327";
+        src = fetchFromGitHub {
+          owner = "stig";
+          repo = "ob-applescript.el";
+          rev = "bc708af6cf45707d4e8d8f00ea59a7e413bfaca7";
+          sha256 = "08q0kglajvgpjvzij89z9xiz65r15ddxz16bjk2b59p0vzzy51ij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23b075774be913539c3f057dcb7f24fbc05c37a4/recipes/ob-applescript";
+          sha256 = "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc";
+          name = "ob-applescript";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-applescript";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-axiom";
@@ -43706,12 +44113,12 @@
     ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-ipython";
-        version = "20160703.639";
+        version = "20160917.1053";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "ob-ipython";
-          rev = "12e764aa231d029368056796452f644a3adba856";
-          sha256 = "0k1jmacvfl2kxbc9xan93nivvnc3j3k17qp7xjmhrlrx1gdx63lr";
+          rev = "6b7644a06af90fd51f7396e980a0ed505238a1a5";
+          sha256 = "0szcdp49y2j0m63wmc1lz7yj84r3fgh6n886ysgh8acyd6z7hvzz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -43916,12 +44323,12 @@
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
-        version = "20160903.25";
+        version = "20160913.1700";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "56bb9a20ffa257db484616eeb62380deadaa5856";
-          sha256 = "0mnkinwnjmzz9245ja0zf51cxxq3agk7j25aqvsdxj6p9bxpavfc";
+          rev = "02955d24bd204d330891ec57921edd56f854f721";
+          sha256 = "02bz2jgpvrhqwp6jrdb8msr272mz0g2q6857m06yg7vcxpj4xlkz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -44315,12 +44722,12 @@
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "20160905.220";
+        version = "20160912.1758";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "696c19550f50e1960327e007750c4b80bd3f14bf";
-          sha256 = "12d6icnhmvpvpnfyai1ni5d5g3dqg1d7775rm5vd12hf9nafidj1";
+          rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
+          sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -44513,12 +44920,12 @@
     omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "omtose-phellack-theme";
-        version = "20160820.812";
+        version = "20160909.505";
         src = fetchFromGitHub {
           owner = "franksn";
           repo = "omtose-phellack-theme";
-          rev = "2c2da8950d7429e710dc785c92d38fe9ba254a4b";
-          sha256 = "0zzj1kjzqdjjvgm5yq44fyh4gb8gqkx9wjzxd0yzz3ihklgz3d09";
+          rev = "e28c8a72cd6893cdd565f3f790145d2749600a89";
+          sha256 = "18r6x1pgn4wyyfcnyl4y40gprcpl579k6b5n9l0fy7b2r10x1fj3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme";
@@ -44636,12 +45043,12 @@
     open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "open-junk-file";
-        version = "20160514.1525";
+        version = "20160912.1859";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "open-junk-file";
-          rev = "249e0b39208224f540c982fc13d35dc7f4628891";
-          sha256 = "0r5rsghqgy99jwjf3dqkw1q10smsvs242aafmz142l4ipsqr3gi3";
+          rev = "31b6a88001d66cda95eabb444df188a61bde6346";
+          sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file";
@@ -44883,6 +45290,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-board";
+        version = "20160917.1011";
+        src = fetchFromGitHub {
+          owner = "scallywag";
+          repo = "org-board";
+          rev = "77fe2a8e2c163c15c7faf282615d6d1a407edfd7";
+          sha256 = "1w4n1mmplim5wqj908k85xhnwlb5dnbs3jgy9hmcrjk5qjzykxgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
+          sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4";
+          name = "org-board";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-board";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-bookmark-heading";
@@ -45180,12 +45608,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20160814.237";
+        version = "20160907.1021";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "ec2dc69b7a49054bc0d34c6533cdcadba708db67";
-          sha256 = "1fdzn8qfhalk15g5cfyywi99wmmgx6ck6b24zsgsr38jphcih0k1";
+          rev = "115433394221da8071dedf7e3f056e37f097a272";
+          sha256 = "1y2654ihc0py9nhl8178bmqvaqwx2wydyfqydd6vsis31hahxmnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -45261,6 +45689,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-easy-img-insert = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-easy-img-insert";
+        version = "20160915.1308";
+        src = fetchFromGitHub {
+          owner = "tashrifsanil";
+          repo = "org-easy-img-insert";
+          rev = "9f8aaa7f68ff1f0d8d7b1e9b618abb15002f971e";
+          sha256 = "1p0hzfzlcdmd8d01a4xqg27n7qcnv7a03n8wiicv0dnicx179952";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/512db70609fc451972405acb4b186a9b3c6944fa/recipes/org-easy-img-insert";
+          sha256 = "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54";
+          name = "org-easy-img-insert";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-easy-img-insert";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
     melpaBuild {
         pname = "org-ehtml";
@@ -45303,6 +45752,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
+    melpaBuild {
+        pname = "org-evil";
+        version = "20160915.934";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "org-evil";
+          rev = "a8d7dbe5553f8fda196154ff497d6b5c25fc21d1";
+          sha256 = "1jmydmkw6ccdr66s8rd4nnassb3dypaj6y10qy6v2f97gl0l8s9k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
+          sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn";
+          name = "org-evil";
+        };
+        packageRequires = [ dash evil monitor org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-fstree";
@@ -45539,8 +46009,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b";
-          sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx";
+          rev = "a1f51c8655e5e41f3be8eda58654ed6f8bcce799";
+          sha256 = "0d0qrchq2hng4yyhp1ralkmf203nif40jddxc0k2s8rnvbs6ayii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -45559,8 +46029,8 @@
         version = "20160808.220";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b";
-          sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx";
+          rev = "a1f51c8655e5e41f3be8eda58654ed6f8bcce799";
+          sha256 = "0d0qrchq2hng4yyhp1ralkmf203nif40jddxc0k2s8rnvbs6ayii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -45794,12 +46264,12 @@
     org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-preview-html";
-        version = "20160906.2327";
+        version = "20160913.526";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "org-preview-html";
-          rev = "0a6bf43046b2bff794f9d414b7171132dd23cecc";
-          sha256 = "0xwwkgj4i28dr2wxq5fw7badpn9vk40hnfa83f3ay7c8z2rcz8ci";
+          rev = "2b6afbaf1fcf781bcd53074ee62895f15f5282e5";
+          sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html";
@@ -45926,12 +46396,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160907.551";
+        version = "20160912.941";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "873337642b9b312803ae743d0d636947e74470b1";
-          sha256 = "07s5n35qinihzg4lq2aazdidx48zmzi36vrd3iri50r149ks1gfm";
+          rev = "7751354df310fb4047286c54049297aa79202b5d";
+          sha256 = "0g9f6pcajiipvw9ija8869hln7ssq75l1ahcx88gh8cfpwhirvvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -45982,8 +46452,8 @@
         src = fetchFromGitHub {
           owner = "brabalan";
           repo = "org-review";
-          rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5";
-          sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb";
+          rev = "058e75b7f28d2ad2390290fe17a63d98ef5ab763";
+          sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review";
@@ -46678,12 +47148,12 @@
     osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-lib";
-        version = "20160830.1149";
+        version = "20160912.956";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "osx-lib";
-          rev = "448dd983427a6130ff5606d3eff4198efedd54da";
-          sha256 = "0g7iybibja08babmvdkdhdya97lxxyhywwy5ngis2zh7jkazsy3h";
+          rev = "36425bd15073118b6271a0c94c5e3846f6c371da";
+          sha256 = "0iyg6aqvcx65kp1p8mc64zg1v50bsakyxmkpd9fhsp9x3gpwx52q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib";
@@ -46703,8 +47173,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "osx-location";
-          rev = "110aee945b53ea550e4debe69bf3c077d940ec8c";
-          sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
+          rev = "84e9269f6c66e52e8bbe8a0cd55932e7b3e7977e";
+          sha256 = "0yixzqx2b5pnc4qs2qas0jm7sxls511x9ahasqizsawcnqd43apg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location";
@@ -47018,8 +47488,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "652b43a77aab502498656117aa278f8f09a517db";
-          sha256 = "11xgz0fl8biimkffmbfccinb0gr3zb5a57lrb7br1j22ncdacmyh";
+          rev = "bf128a3b60d36cb68e18519bde5d8f58ffe8c22b";
+          sha256 = "1lysc7qd9czr720cgii8698slbgqz5g5ai4a71f757zra0jashag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -47375,8 +47845,8 @@
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "ox-tufte";
-          rev = "fe7e7cec0559acdaeb89d6dc99e50ad698723207";
-          sha256 = "0fm0qmqcq6alk2sw3vlybqjlkwxp14zaqgi5r2lnmq4z0lsxa5sv";
+          rev = "12277da990095faa423f0ec0cde258d90784a7cf";
+          sha256 = "1xgvg2qr2v0fq0r6ixrwryw6gzpwcvq0mw419jpwaxl4gwzckyir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte";
@@ -47392,12 +47862,12 @@
     ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-twbs";
-        version = "20160820.604";
+        version = "20160915.207";
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "ca98e2c312c6be1165b956f655a4becc89776634";
-          sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3";
+          rev = "d9847c7e7c1df384088726217e65a6c0067a67c7";
+          sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs";
@@ -47648,8 +48118,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "page-break-lines";
-          rev = "67b5928a7f14568baf2716b5741e13659a86b9ea";
-          sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12";
+          rev = "9229260e88fe84b53d384677fe5eda4a6652f015";
+          sha256 = "11gg3bc41cn1fa04b6gf6r6bf5di1ffwbagmh2bb0n0i42idlcw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines";
@@ -47895,8 +48365,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "paredit-everywhere";
-          rev = "79ecbfc15d2cb338f277f3da50d8e757f07151e9";
-          sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
+          rev = "94c92095c2096713fb3e2f7662ddd994f4b694c6";
+          sha256 = "120m6vs6bb9cav88wpv97kd7s8vvmg6pry6pmf7jk6i7l1wj0iaw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere";
@@ -48812,12 +49282,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160830.228";
+        version = "20160917.1147";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "2c559083fa316b97b76e25c491a45aec5f2fe501";
-          sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh";
+          rev = "dfa6c66a038d84d9b7f17e0bc1471f3efea7acb6";
+          sha256 = "1nplmw0n8ap1sbshb7p1mrdw835f7a4ih1zxjg13wx0dls65zpa2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -49232,12 +49702,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20160831.819";
+        version = "20160910.1801";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "182c0b583216ec02e259dc5bdb16c72fb92814b8";
-          sha256 = "1zni6yb83bj09pw9p9p6i4jwq2l0k62bnc114jd8cbsmr55axla3";
+          rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36";
+          sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -49635,8 +50105,8 @@
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "pkg-info.el";
-          rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5";
-          sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
+          rev = "76ba7415480687d05a4353b27fea2ae02b8d9d61";
+          sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info";
@@ -49943,8 +50413,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "9c38baf93e46a2223b524f91ff744cff2a0e1157";
-          sha256 = "1gghn58k2i887sib2m1agj3d94dm3ac3gr2gxxqyx08cqdm1sxpy";
+          rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4";
+          sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -50974,12 +51444,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160830.138";
+        version = "20160917.2336";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "3e56c2f3c6ca4e28997320480a4115e4edf1a63c";
-          sha256 = "0hxv2p8bwxz86mzq7dw8jdxai71ny5g0ig7171p51bvxx34xm7f8";
+          rev = "076edbc8150ce0bb1c6cbfe8d4fd1b3afd2cab9f";
+          sha256 = "1fa0xkjqc527an3f3wnradwas5fa5q6563z3rhgppscsnzp9lx1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -51118,6 +51588,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "projectile-variable";
+        version = "20160910.1005";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "projectile-variable";
+          rev = "810394eabf330325a86ec6f60c69e160eb837ac3";
+          sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
+          sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+          name = "projectile-variable";
+        };
+        packageRequires = [ cl-lib emacs projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/projectile-variable";
+          license = lib.licenses.free;
+        };
+      }) {};
     projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "projector";
@@ -51202,6 +51693,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    prompts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prompts";
+        version = "20160916.341";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "prompts.el";
+          rev = "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26";
+          sha256 = "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2395402e72d9b0f7ce2ca5fcb4497919f90a8fe2/recipes/prompts";
+          sha256 = "1fz5sbc45jiq64y89lm8nj6lsanq3lzyjzahxzrgqvr7655pphzm";
+          name = "prompts";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/prompts";
+          license = lib.licenses.free;
+        };
+      }) {};
     prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prop-menu";
@@ -51272,8 +51784,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "74638a253ea76baa0aed78491b92d157326295a6";
-          sha256 = "18xz1ic5cz2vlypxwxz81z3m2cf36wl8dqw7fbbgq20z6c3zl76h";
+          rev = "c44ca26fe89ed8a81d3ee475a2ccc1797141dbce";
+          sha256 = "0r6k1ivy3b8gr3vijifq8f2wpg5klb48yhd0v06iir96gca34l8m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -51289,12 +51801,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160720.1502";
+        version = "20160911.544";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "78df84316807f0efc0f39450172cc2e2f17c9acd";
-          sha256 = "0z725mmwkb9b9py65vfs3pkn8pqd39ayc84v56y49gsqd0krdqhf";
+          rev = "3f605b16e792b098eae127441046e690bc4818f6";
+          sha256 = "02i8yf169b2g65cfvpnbc04vbaa9na9hv4ss1rl2ps3lwkijng84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -51415,12 +51927,12 @@
     pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pug-mode";
-        version = "20160723.2236";
+        version = "20160915.252";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "4a25f6b0ba51b87d882d4062de1601c49b2a822d";
-          sha256 = "13rkmi7ckchd42zjl6lm7wdf6402xwjxvi1839lkzlmlb49xf47b";
+          rev = "bff32a818ccc9e400210b942bd5e67fa21551148";
+          sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -52006,8 +52518,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "537885ec90ba7d949a929ac560760d0f4199a936";
-          sha256 = "0cpalx34w2jhrmyc04a3108in8xv0qfsia388ksid373l7zaqd5z";
+          rev = "e83d50da12642cbd8e18472e04a828516142fa45";
+          sha256 = "18zvwjahqjc5rbp9ajsisr0i2zrik7wcj35pr9ikcdrd5yql7vnw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -52149,12 +52661,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160901.1048";
+        version = "20160911.1032";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "ef8df01d62097e38ec76940822440c9cc1e895b4";
-          sha256 = "1yfcv70yv73cqmnwlvgqpda18xxkd7cdqn3jjp8bicillnpl04xz";
+          rev = "a9cf4f5183228a6c6a31f676e3f5a47d7322a213";
+          sha256 = "1yisakjmzd75mbdq2wrwdq06dkvyfzxkqg02llwv9wg8s2pbbn30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -52317,12 +52829,12 @@
     quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quasi-monochrome-theme";
-        version = "20150801.1325";
+        version = "20160913.638";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-quasi-monochrome";
-          rev = "cc363fc72b6824122aadf6b7d27dfeac38f61901";
-          sha256 = "0y7mdizx6km3000cqjrirlgwzkq56asnzl8n1bl56pk5d9grfx9h";
+          rev = "75c515a30a77aa4661e41d67e5bba13f422bdf60";
+          sha256 = "1932vjindz0mkfizbs1d19af9p78kl9cd05isjbd5sjwzs420bd9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
@@ -52447,8 +52959,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "cd9052132dbde7c8526309a0c21fc5a60c709a46";
-          sha256 = "17l9kdfc2zc4d4alg4pfi7s6wlk51yxll6bdlcr4rbn67nj5lacj";
+          rev = "487a74c7db513ceba86e849c8f42f834234c1f7b";
+          sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
@@ -52884,12 +53396,12 @@
     rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rc-mode";
-        version = "20160906.1227";
+        version = "20160913.1218";
         src = fetchFromGitHub {
           owner = "mrhmouse";
           repo = "rc-mode.el";
-          rev = "70b1e93f40d2f24dfb5619605fedbb1dc05cbe60";
-          sha256 = "0jpsp8zbcdf7yrfakv9dycw606yqcb497k9w5aj16a8r37xg089l";
+          rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f";
+          sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode";
@@ -53391,12 +53903,12 @@
     rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rectangle-utils";
-        version = "20160427.1024";
+        version = "20160914.2108";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "rectangle-utils";
-          rev = "5ee8a0955967181629393e1fd6589a6e2590a56e";
-          sha256 = "0i336qakdkvxgyhjfq6b957xqlll156i1a8g1f5xap46v35d6gh3";
+          rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a";
+          sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils";
@@ -53493,12 +54005,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20160905.1415";
+        version = "20160912.1847";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "80cce07e97ef1816c86c851b525461c6dd505849";
-          sha256 = "1vk6hqjsc6dr9n1hf4wjhihimb9pyi0qyqfwrj8y5b1cv2rzvc01";
+          rev = "bf3529c1f4b21bd1ae037fafa20af1096fcf4d78";
+          sha256 = "0vsykyy93fx9n0063k94l0s78phhl5m0ikmggvw34s57iqks0z30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -53618,12 +54130,12 @@
     regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "regex-tool";
-        version = "20131104.1434";
+        version = "20160907.2129";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "regex-tool";
-          rev = "62b292d93f29e4c4767b0800d53c656b9f626892";
-          sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
+          rev = "0de0716dc26b1182f7f986d8442345aad135019e";
+          sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool";
@@ -54080,8 +54592,8 @@
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "be789b13ff6358e13a2b7d57224072fb1b108f09";
-          sha256 = "1a2myx5isiwr29yhplmv07bisc8rvrabzz9dn239jf4gvr8x89ry";
+          rev = "0dc6d689cd7fa080fe7c19431863bf7186f910e9";
+          sha256 = "082izk2wmsdspyizfbvqw34rigvbfwq2963zf4iqlniqv05p88pd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -54511,16 +55023,16 @@
     rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rotate";
-        version = "20160214.2318";
+        version = "20160909.136";
         src = fetchFromGitHub {
-          owner = "daic-h";
+          owner = "daichirata";
           repo = "emacs-rotate";
-          rev = "868122fa807db32762a68defcf69654a28a5a39f";
-          sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m";
+          rev = "091b5ac4fc310773253efb317e3dbe8e46959ba6";
+          sha256 = "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/771195f360543eab5c49da546bab0c7235f92ab5/recipes/rotate";
-          sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/rotate";
+          sha256 = "11a0svvfq29cb4630jq0hz19xk9jfhfjnssm7vg0dnlzpxqi3vif";
           name = "rotate";
         };
         packageRequires = [];
@@ -54637,12 +55149,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160904.1233";
+        version = "20160915.901";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "046372ccbf5b6a4367a873d23a784810f2bbda1b";
-          sha256 = "1b5sfbvgyr2pa74fm24wmmiwmrrqfwawrfva9y8cj0fcnvvb198r";
+          rev = "92a7c74b73d8ab6a83a256f526f278583c52722f";
+          sha256 = "0sdk4l3x0x2244q5iz1gwklf491qslgh49frkk2snzpnn1q3rnm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -54700,11 +55212,11 @@
     ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "ruby-additional";
-        version = "20160607.157";
+        version = "20160911.333";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56093";
-          sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m";
+          rev = "56184";
+          sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional";
@@ -54783,8 +55295,8 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "56093";
-          sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m";
+          rev = "56184";
+          sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric";
@@ -54867,8 +55379,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ruby-hash-syntax";
-          rev = "d73a498143a3a8d6d3a7720104f2f14e70b2e2ae";
-          sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
+          rev = "13288a29478a9e45ab4fd2188aea8d4894e08848";
+          sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -55010,12 +55522,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20160820.255";
+        version = "20160909.935";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "5cfb9197af67e00ebd5bbcb05c28545c9014ea32";
-          sha256 = "1pvb6imh89pnmxzdlivyidqqd7f1va29dvjhy5znw2qhw1myf4hn";
+          rev = "1587839ba493b5ab98fb8415338172a9a22f224b";
+          sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -55136,12 +55648,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20160907.418";
+        version = "20160913.553";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "sage-shell-mode";
-          rev = "5dd85a064304af51c676b4a95b1f298e297756d5";
-          sha256 = "114ja5gyhpv9xi1gxsxylxbbmnmjrqlwd4daww4a5xc2avi6flxq";
+          rev = "00881a50b5c8a9994e318e107e7848c1c9f119df";
+          sha256 = "0w1ba3rky07p7qsh2f59xfrhfip3k2db33pblyvs7z0fd0qwwsv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode";
@@ -55346,12 +55858,12 @@
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20160816.1353";
+        version = "20160914.818";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "cb9940f0e8b1346f4297ff6c2c90b406c92abab0";
-          sha256 = "10bq04xm3b8awjnfq0mg52zm3rds1kr7q0jfrvhjkbd9rwd1y9bz";
+          rev = "420044bc305bd4fe38d2f3af1f76b29172b06ff9";
+          sha256 = "02h71mh0w8g9gz1pslgqmk40b5fb5q3g6jl5150cq608m4apyk75";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -55371,8 +55883,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "31211c6b7f4767f5e7611c6ed7844dbbb3600ee1";
-          sha256 = "0yafxig7wvlps8fsl26n46hyfiqhyzjhi1k2lgwmacf3v7lhjqhv";
+          rev = "a5e4def690dc460efced2035d9d67b9a749ecace";
+          sha256 = "1l1238qvs6mnckwcbz7qq6c5va2x71l8cnwf18cwz2gajfbxgb80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -56278,6 +56790,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sexy-monochrome-theme";
+        version = "20160915.353";
+        src = fetchFromGitHub {
+          owner = "nuncostans";
+          repo = "sexy-monochrome-theme";
+          rev = "64570387a30ec5ac685cb11824ee24f8890572e1";
+          sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
+          sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg";
+          name = "sexy-monochrome-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sexy-monochrome-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shackle";
@@ -56344,12 +56877,12 @@
     shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shakespeare-mode";
-        version = "20160609.1028";
+        version = "20160908.1511";
         src = fetchFromGitHub {
           owner = "CodyReichert";
           repo = "shakespeare-mode";
-          rev = "ad5f4de2e0b51723deea2c68a2b5aa862bf38022";
-          sha256 = "1daqh496m72l71x24czvzwf92rk310lzxp16l50qxlxif7rgpr78";
+          rev = "0406a5ac4c98fcd171f0539c5cd88050aa351ea8";
+          sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode";
@@ -57189,12 +57722,12 @@
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20160318.603";
+        version = "20160916.622";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "a0941475c5fd71a31280f3219424af4586288719";
-          sha256 = "0k16sjbrhxbv3fj5rzjzvs03230nwlzmvw18dhdhzzblk08f28dp";
+          rev = "c59bbbc96cea8fb2e9c4f4f7d471faccae2c67ed";
+          sha256 = "0mf22mcvhpm5wcsylph2sd4x6bi8101jnqpib6ppjkwha5c2x8yg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -58109,12 +58642,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20160828.1136";
+        version = "20160918.126";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "6b4832412a896213f3e3d45ef75acaf2aeeab97a";
-          sha256 = "06l9ngm37lzqf22ywg20na0bnfq2bcwab9rkfc5w8m51j5z6gn6x";
+          rev = "de5d4f39ad1055b18c74ac516244b5ba4a6d45ce";
+          sha256 = "1qgcv64jhxagcb3bdw4lpq0qpjd7bzfnwabqq9frbcxx4zbiw210";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -58444,12 +58977,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20160902.1855";
+        version = "20160913.2031";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "a28ff63f4c3a6492dea38c028e47bb6431ab4c84";
-          sha256 = "1vb9b4wclmhqj4p9xqz3zhrh7id1s03k2041nx6pcwr7918dfpjs";
+          rev = "2bceb7f266f71cd85f9b328de02797eb457da17c";
+          sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -58651,6 +59184,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sort-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sort-words";
+        version = "20160909.358";
+        src = fetchFromGitHub {
+          owner = "dotemacs";
+          repo = "sort-words.el";
+          rev = "8ca4cfca859f9cb4f2d51d5af9ad663261152101";
+          sha256 = "1g3hlx33x52wsxw45p8dxphmkydqks2z4c2vs1vy7v7y0vwifszf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0a4bd566392d7cebe8a891d787439512e8d34cf9/recipes/sort-words";
+          sha256 = "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka";
+          name = "sort-words";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sort-words";
+          license = lib.licenses.free;
+        };
+      }) {};
     sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "sos";
@@ -58871,12 +59425,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160801.211";
+        version = "20160914.711";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "34ee477b3dbc0d81dc44c82cc092f006899cba70";
-          sha256 = "10kwjlngp0xsgzj7gpglmzyx0l2vmfl3f6q7gwwad4kymsbh4s8p";
+          rev = "679bdaa22b4155d515c9cc1bc42f793cf53adcc8";
+          sha256 = "0xdkk1ig70ys4hs68fg5wa4pqjr2nf07jc0ckdlfvs3r1fafs7a3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -58892,12 +59446,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20160820.1041";
+        version = "20160909.445";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "6d96877d228af73a2c4c656c9bc33734feacc887";
-          sha256 = "0aj0aazky2l8c59kn11qhj8xch40mqxjp6a9gfbyfbfcqnmrvlqg";
+          rev = "e339866186a6687e9ae63db927ba3cc4bc75e88e";
+          sha256 = "0hkygs57xybwx1shhjm2650aw36plskfvf8h24zah91xjnnsadn6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -59116,6 +59670,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sphinx-mode";
+        version = "20160911.558";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "sphinx-mode";
+          rev = "c6e0e29fb0b64c05488b0bcf9f0b78335da4a49d";
+          sha256 = "05n8kifpkijsiywrnw6m4wckv68a4xk3wdblc2c1gj9wz6s72lyl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode";
+          sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b";
+          name = "sphinx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sphinx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spice-mode";
@@ -59473,12 +60048,12 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "20160904.838";
+        version = "20160911.1911";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f";
-          sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2";
+          rev = "da9273d9da8f84827b840776f398d24ea4c46b76";
+          sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -59596,12 +60171,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20160831.2219";
+        version = "20160917.447";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "2257f951fef62080a97d5e3083889afd53b5648d";
-          sha256 = "0c6pmvq7ck3hqcilb7cbb7gc7gi9wzjcb93qkgxy5mlv4m5w328m";
+          rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d";
+          sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -60318,12 +60893,12 @@
     sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-edit";
-        version = "20160905.2153";
+        version = "20160908.2310";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "d7fce267b58614e2b56d2fd260151b7b4d0c7f1b";
-          sha256 = "0j0pyvm6pfkk0mq4vm8ajxwclllmsyj6d8wd3sf2yfxy45qacl2n";
+          rev = "beb584ca418dcd061641026662d9796f66a5a5a2";
+          sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -60360,12 +60935,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20160903.806";
+        version = "20160917.905";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "b0d7826ba295fc20f3346d6beb52c169d892a06f";
-          sha256 = "0lkny47kjw4q0khndb9swmgiy5j22473djk32yjwy7b6qnfgwcwf";
+          rev = "59bffb26368c9e8135548670c0923fdc5299d018";
+          sha256 = "0137gbkfqa1kagff1dkg721w35j946ip1zcvhgd4g23y7ldzmbrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -60669,12 +61244,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20160124.236";
+        version = "20160918.658";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "1563e8b248bc74613f381e7bd82a43df90064a68";
-          sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
+          rev = "0e24233686980c2a40172c4f2cab8c5f28fa1532";
+          sha256 = "13j2a8bxz1d3pfvr0bbkajbgr7by91g7mgvb55z481zihyqsvykl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -60687,15 +61262,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swift3-mode";
+        version = "20160918.550";
+        src = fetchFromGitHub {
+          owner = "taku0";
+          repo = "swift3-mode";
+          rev = "4e51265c6905e17d8910e35b0b37cf51e20ecdfe";
+          sha256 = "0wqwjzr3z9gzsjiyyr0ds4c5zvgifb9hbjadb7vkbbpzdy6qd9s1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode";
+          sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520";
+          name = "swift3-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/swift3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160905.940";
+        version = "20160915.914";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca";
-          sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x";
+          rev = "f180451217277e63b067aa3d06d5af69140e320d";
+          sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -61399,12 +61995,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20160608.215";
+        version = "20160915.2124";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "3aad9b4f41985d8da90432885380d94c24dd772a";
-          sha256 = "04baqjk3vg09x3p5v1mnn9yn4wzb4qa2ag9jc8baabrp19xbcl2v";
+          rev = "85ee42a8e19b913865387d6662d41177fb0803ce";
+          sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -61802,8 +62398,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "dcd808f985e7b0f562467e2145dcd1e901347999";
-          sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg";
+          rev = "a36a20c36265430c36235371957f07c8c89fee44";
+          sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -61823,8 +62419,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "dcd808f985e7b0f562467e2145dcd1e901347999";
-          sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg";
+          rev = "a36a20c36265430c36235371957f07c8c89fee44";
+          sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -62232,8 +62828,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "ddc53c32486cc23dfa63ed4e5abb19923b8d13e6";
-          sha256 = "0gq2zwy1isrb4r1xv1j34ni6byyyy7x4mpvcfw6g2z9h36x7bcsb";
+          rev = "205dc19556eac3c0ab2d1965c4636b78f8922fae";
+          sha256 = "0hw7rhw0vi9qq07ih8h0v1w3grh5xj8igbp3h5x7k501zilmkx38";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -62289,12 +62885,12 @@
     tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20160830.2120";
+        version = "20160911.2207";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "170bce9067a6467f190418284377559a9f43c667";
-          sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg";
+          rev = "80e62305a91dff5f4ca7534f9f694dcd12ae4282";
+          sha256 = "023vgr56j5z0zzi6vb5xpin4vf7k9miyckh5q4aj5ym2qsq7hs2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -62619,12 +63215,12 @@
     todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "todotxt";
-        version = "20150513.1929";
+        version = "20160917.1048";
         src = fetchFromGitHub {
           owner = "rpdillon";
           repo = "todotxt.el";
-          rev = "fc83f954aea75065aa9788ee07027c94e76a9364";
-          sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
+          rev = "e74a3acf45029e114154c6471339dcd3c787783f";
+          sha256 = "0zx2kg3q5325j21x0vdn7rmd2xx1d4lk22pblh5ra52vr1wgxf5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f934da448463e672de3c87b2ee514a370f67107d/recipes/todotxt";
@@ -62808,12 +63404,12 @@
     toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toml-mode";
-        version = "20160718.2217";
+        version = "20160910.1810";
         src = fetchFromGitHub {
           owner = "dryman";
           repo = "toml-mode.el";
-          rev = "609d7101cc50b2ce350dad0d6adbd476d20fc811";
-          sha256 = "068jcxadwpxk4rk4kix2y5g5dm7g3pd3d1v6dj5jimjkp9zvy1h9";
+          rev = "0bbf0618fde844cd2e12765c8ca566df09066445";
+          sha256 = "129yws71h5wy2y4z2ayl9kys22xa4hhxkybb7hhp2b3y8wq0717z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode";
@@ -64011,8 +64607,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "a88ba489b47429653c98d72ae8e0b2bcbed02faa";
-          sha256 = "1gmwdja53x3mzpfxjjqs41vy7prfyz7a1iy3cf5fx3k1yw9vcfkb";
+          rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
+          sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -64918,12 +65514,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20160810.525";
+        version = "20160916.1421";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7";
-          sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42";
+          rev = "c93d080df2e47702a7952420101cf2d1d3b38bfd";
+          sha256 = "12rbhgx350x46lj7777rgjv8akfjs59x86bfm95dwsq4mva7q2cl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -65580,12 +66176,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20160906.1507";
+        version = "20160912.242";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "2b717828f1878a05759701c249fffff6642fe1e1";
-          sha256 = "084g3cn0s7n78s3zg0ln0sh445281pmn8fbr101y8akvp33b9aaz";
+          rev = "f7bb1a662893b5aacd3f358f927c05ee47d08a5e";
+          sha256 = "1kpz8501w8axr0p0r5p2yl06n5kwjc7712g90fkdcxxcw39lsjm6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -66104,12 +66700,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160831.1655";
+        version = "20160911.1302";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "ad9b0e43bc07b44094686ed521a4e107aa8efd2e";
-          sha256 = "097q45vn3f1bmr67qwy71sn4acxwhb20bs6lif7zxahbd7iaxcv3";
+          rev = "c493e0b4bb53c524d99c6ad071ba0a22259f8f38";
+          sha256 = "0gngmryqhkhsd6wjvg24fcxdmag3sp6mvp3r6swz1hg2j905lrf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -66164,6 +66760,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    white-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "white-theme";
+        version = "20160917.1043";
+        src = fetchFromGitHub {
+          owner = "anler";
+          repo = "white-theme.el";
+          rev = "e9e6d5b9d43da6eb15e86f5fbc8b1ba83abe8c78";
+          sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/621e32e54be9e1ac7936bf6f4b9d74e2dd27df6e/recipes/white-theme";
+          sha256 = "0nmxn35x6pngns1xqnsq8nm69f549c1gmvisd01in3qfvnpr0mic";
+          name = "white-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/white-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whitespace-cleanup-mode";
@@ -66171,8 +66788,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whitespace-cleanup-mode";
-          rev = "14eaf40e0e67539106d3636af440a167105be296";
-          sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
+          rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f";
+          sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
@@ -66273,8 +66890,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "cbff3b029c7dc850676c288b5cd0d570a1906519";
-          sha256 = "0vj02m8b29vwqv8k54h75s801sh6xz8vxsazqjmhx6a7cgm2l0k8";
+          rev = "69b041f240dc1b6239f51159ee4bd97e596ee7d5";
+          sha256 = "19b2h6camn6p5vjj5gqamlpc24ika5x61v11fqvpx11smkfki6y2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -66952,12 +67569,12 @@
     ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ws-butler";
-        version = "20150126.759";
+        version = "20160913.1902";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "7e2f32dcfcd7986fcee07f1413c6d8eae7ceb8f4";
-          sha256 = "1ld5s45f9xh20z9z9k1fhlllzl6jgflcqkzys4x09vvax3mmynr8";
+          rev = "b59e36b2451193bf96176f5a006bf506770a40f3";
+          sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
@@ -67183,12 +67800,12 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160906.1341";
+        version = "20160911.2224";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "59a4980eabb96361626d275c813fff336b17ae65";
-          sha256 = "0yriyizfyp9bd83d4069rdbps4f6hyi3hf6w47xxxsjmvn9s9c2i";
+          rev = "54b00b7c5907d875f6c07f2fe73335231e9b286b";
+          sha256 = "0bw4xdd5ajhf57zjbrca68sx12mdg8k31923bja1knfldms2sf48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -67267,12 +67884,12 @@
     xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20160713.1858";
+        version = "20160913.1512";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "b427b84923d349174464d7a15b0f86639f046248";
-          sha256 = "1l43crr7balay139xvm3mxz22z516mcz84433vfdb8yczdya2sjq";
+          rev = "d26e73bdefd6e0a53559c433b576aa663008308c";
+          sha256 = "1gvdx1nvmxxvbbkr4hz4ar7k52cyyc77vcbm1yqw4r167i468knf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -67940,8 +68557,8 @@
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "yapfify";
-          rev = "756ebae981208f4b9a8038c415107e1191be9b9d";
-          sha256 = "0mfp3wpdk0hsrh93lg3gdym85g5g1f7wj08m7j5919dgx745n094";
+          rev = "0931e0f4ee3ed060be87f529cac4950af534ffac";
+          sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -68144,12 +68761,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160905.1720";
+        version = "20160918.708";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193";
-          sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd";
+          rev = "83041d5da4ea4637dbd8b018a4762051175dba1d";
+          sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -68320,12 +68937,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20160724.2141";
+        version = "20160914.135";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "d80c7cb91cce840c533d2261de44222c82c002b8";
-          sha256 = "1hm0xlbi98czj7s5hb1f9n0c0kqglz95s45jwrljxxx5nxpnl238";
+          rev = "e20756e1b78de58d3f82ba4a9d7c0772cb37482d";
+          sha256 = "0mm4qx9c6v9r708p6yq6spzznbjy43qpn5k2479plnxixp8dh664";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -68382,12 +68999,12 @@
     zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20160830.659";
+        version = "20160909.729";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "1dbe8f3b202a1d958c9568a15d72059844277490";
-          sha256 = "09kz6yx3ysmdsgrjabq5n30n48r13pi6mp3b5arl9y760k62kds5";
+          rev = "493c9510a776954f88a0ecc8e109400d71249640";
+          sha256 = "0v3911ylxrggk11x5mdbvjclr27iibvp6dw1p2lxxz83qgfzyv05";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -68734,12 +69351,12 @@
     zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoutline";
-        version = "20160906.743";
+        version = "20160915.503";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "zoutline";
-          rev = "47231c6a82f0b718b0bec09f34e40ce68ca050de";
-          sha256 = "0jd7izvpc4z3ivp5mdzbmz5vrlwnjxp2r16f3zs0cfbym998i25c";
+          rev = "714c10a25112b3da62696585bea289c3f8e74158";
+          sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 5667e54fb4e1..ec183960ac16 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1648,12 +1648,12 @@
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "1.0.4";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "209663c772105ae87d244cce9247695823914a00";
-          sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2";
+          rev = "7b399fd7eb4a19f32d93ec6dc0eb3a344d2687aa";
+          sha256 = "021iqwn4lwpsx02m3ns8l3bn5dvssii5sk9vg32mh56fjpbi2dkj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3565,12 +3565,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "0.3.1";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9";
-          sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860";
+          rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4";
+          sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -3636,22 +3636,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "cljr-helm";
-        version = "0.7";
+        version = "0.11";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "cljr-helm";
-          rev = "916d070503d0f484f36626c7a42f156b737e3fab";
-          sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
+          rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4";
+          sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
-        packageRequires = [ clj-refactor helm ];
+        packageRequires = [ cl-lib clj-refactor helm-core ];
         meta = {
           homepage = "https://melpa.org/#/cljr-helm";
           license = lib.licenses.free;
@@ -3807,12 +3807,12 @@
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "1.2";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c";
-          sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5";
+          rev = "12b7460691dc502d27329d6ac11c51cc83cd098e";
+          sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
@@ -4692,6 +4692,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
+    melpaBuild {
+        pname = "conda";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "necaris";
+          repo = "conda.el";
+          rev = "d5bfe6ef6c2adecd1791ed87e3efb55208c0c7c1";
+          sha256 = "1pvhm8j49ixlp9jd1zfjzw0rnhjyy1jyipacagsqcyssq6p6khyw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
+          sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y";
+          name = "conda";
+        };
+        packageRequires = [ dash emacs f pythonic s ];
+        meta = {
+          homepage = "https://melpa.org/#/conda";
+          license = lib.licenses.free;
+        };
+      }) {};
     conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "conkeror-minor-mode";
@@ -5031,12 +5052,12 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "0.8.12";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "b4fb58af022a60c1c8161475e9c3fa023a0f9816";
-          sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
+          rev = "6c0a0d6cf602666d63a06c3652ce522b3a5a7661";
+          sha256 = "1pw96s0675rf35hwaxdzids9s8ynkb0g66yximiiz6ryh4ama0wn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -5260,12 +5281,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "0.1.44";
+        version = "0.1.48";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9";
-          sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip";
+          rev = "a9891537f5d49fae2deb631fea0752ab61d3852e";
+          sha256 = "19gwhhspkyrnyf277g8kpk57f9l0fp16jaj8va0j1qh1n64fxazn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -6220,6 +6241,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom-themes";
+        version = "1.0.8";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-doom-theme";
+          rev = "45022da883e7ba84a1f832c266e9f2c9a01b393c";
+          sha256 = "1mgd6pqqnq28714bvfn70nbfdypw7q57y9a3hgg9v4b60mhjhd7f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
+          sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
+          name = "doom-themes";
+        };
+        packageRequires = [ all-the-icons dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/doom-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "downplay-mode";
@@ -7039,12 +7081,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.8.1";
+        version = "0.10.0";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "9fc8dd3be4a556d7abf6977c889887a38232929f";
-          sha256 = "0w2j0bbqnba1wr12f0zk87zwnxf6xhchx224fwgwqd3kg0x5z0r3";
+          rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e";
+          sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein";
@@ -7501,12 +7543,12 @@
     elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-mirror";
-        version = "1.2.2";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "940c17f757ddaf9c076503af2bb15d04f299692c";
-          sha256 = "0h2xhys3cc9z61ax0ymg5fbsjg6192hwdvfhgmyq7vwibi402r1f";
+          rev = "9cf096448b69c795b20aab89557e9add6029b13c";
+          sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -8303,8 +8345,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "b237cf8118fd";
-          sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8";
+          rev = "dbb74dd91c5a";
+          sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -8446,12 +8488,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.0.5";
+        version = "19.0.7";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "71894a879d6254693791585246ce340dd7414b82";
-          sha256 = "0s0s94jsqqpny5z2qdbb62h45cz8lh2if65q26jlcgbyz2729j77";
+          rev = "33b39b559a31c38465dfc038218f432c9c60a9ad";
+          sha256 = "1swcakbd3m8c7yzh8h1mdbxd1hyxpza1cb993ixqv4ydhz9bppn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang";
@@ -9830,12 +9872,12 @@
     fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fill-column-indicator";
-        version = "1.81";
+        version = "1.87";
         src = fetchFromGitHub {
           owner = "alpaker";
           repo = "Fill-Column-Indicator";
-          rev = "5cbc077083775d4719a294455a8a8a53bb3151f8";
-          sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
+          rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
+          sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -11388,6 +11430,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fsbot-data-browser = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fsbot-data-browser";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "benaiah";
+          repo = "fsbot-data-browser";
+          rev = "d8d441fafe1c9a8402269841a4b2285f6625ca82";
+          sha256 = "0lljfn31lhp52n0dp6lpd0mx4jdrhpkivjjghk6yka1659vz0s32";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser";
+          sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5";
+          name = "fsbot-data-browser";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/fsbot-data-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
@@ -12562,6 +12625,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "go-add-tags";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-add-tags";
+          rev = "a6a879889729d579297935598d26b985f900ef29";
+          sha256 = "1s4jwpwxlqxi9h5qqjcvxz3i8rgfrs874rpadp6lhizdhpjjp82y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
+          sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
+          name = "go-add-tags";
+        };
+        packageRequires = [ cl-lib emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/go-add-tags";
+          license = lib.licenses.free;
+        };
+      }) {};
     go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-autocomplete";
@@ -12775,12 +12859,12 @@
     google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-translate";
-        version = "0.11.10";
+        version = "0.11.13";
         src = fetchFromGitHub {
           owner = "atykhonov";
           repo = "google-translate";
-          rev = "84d75daa644c0e73289fc428ff35acdc0943cbbb";
-          sha256 = "0dzr1nb1s1sh8rv5wr9xfjd5xna54vp03y3h4q59vmnynsn64m9b";
+          rev = "c859592c3fda01594b270e388414a79373b5587b";
+          sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
@@ -12880,12 +12964,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.8.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "c0c7ce63df7edd78e713257b924c89d9a2dac119";
-          sha256 = "1yj4iimwfv3d4m24ifmncc2z09dlmxjr1dhryh4afkpgj48x4lcv";
+          rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1";
+          sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -13006,12 +13090,12 @@
     grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grandshell-theme";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "grandshell-theme";
-          rev = "6bf34fb1a3117244629a7fb23daf610f50854bed";
-          sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
+          rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d";
+          sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -13537,22 +13621,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "13.20.1";
+        version = "16.1";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "9eef80d1a16ac3b41b62b8d79ecbafa62e00c6c9";
-          sha256 = "1xckvi2s62hwrrrd6g446gszyqdk6bmd2hcrc6m0qfnyjkvg6jf0";
+          rev = "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359";
+          sha256 = "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/haskell-mode";
           license = lib.licenses.free;
@@ -13767,6 +13851,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
+    melpaBuild {
+        pname = "helm-bibtex";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "helm-bibtex";
+          rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca";
+          sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
+          sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z";
+          name = "helm-bibtex";
+        };
+        packageRequires = [ biblio cl-lib dash f helm parsebib s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-bm";
@@ -14337,12 +14442,12 @@
     helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
     melpaBuild {
         pname = "helm-mt";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "dfdeshom";
           repo = "helm-mt";
-          rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed";
-          sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw";
+          rev = "d2bff4100118483bc398c56d0ff095294209265b";
+          sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt";
@@ -16517,6 +16622,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
+    melpaBuild {
+        pname = "ivy-bibtex";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "helm-bibtex";
+          rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca";
+          sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
+          sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2";
+          name = "ivy-bibtex";
+        };
+        packageRequires = [ biblio cl-lib dash f parsebib s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-gitlab";
@@ -16686,12 +16812,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "0.19";
+        version = "0.20";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "94f53bbd8aa8719b3d83ce038f68e74695b86ed4";
-          sha256 = "0c40pg9f9w90fb1gwpl4z5wxhi0ng8j2fr6kf60yhbwg65x92w2k";
+          rev = "856846322ea8077ffe6215b54f2f3676db5ccf61";
+          sha256 = "03ckvamv61hpk1lcw6z66wsyg471qy979vm3wf8brq9zwapfknia";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -18713,6 +18839,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magithub";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "magithub";
+          rev = "c94ff69749dd14200956e0b59a3757618c594730";
+          sha256 = "12z9gl5lrvdfvhvk213phhgddvvr3y3hpigpzzcq0jla65db367b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
+          sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
+          name = "magithub";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magithub";
+          license = lib.licenses.free;
+        };
+      }) {};
     make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "make-color";
@@ -19052,12 +19199,12 @@
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "b465a4f2112240df9e65f8326160d0c3e09a5a89";
-          sha256 = "05cjgjmawndmgw2dl71sx5msj8csn0jr72rfxnw7jx24p4c33nkk";
+          rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40";
+          sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
@@ -19217,6 +19364,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "meghanada";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mopemope";
+          repo = "meghanada-emacs";
+          rev = "3c7ffe201735d4b6dbc1e449248194eaa40e6c07";
+          sha256 = "15yc312lixa2kv8fij6yp52dqgwi4pdf6w4b776flbqd14y23amd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
+          sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
+          name = "meghanada";
+        };
+        packageRequires = [ cl-lib company emacs flycheck yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/meghanada";
+          license = lib.licenses.free;
+        };
+      }) {};
     melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "melpa-upstream-visit";
@@ -19532,6 +19700,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mips-mode";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-mips-mode";
+          rev = "dcde079176c1419ec24df08b62dd77a897892437";
+          sha256 = "0jvbcld3abm45qzsbcaf6f1zd71hgdg5y47v6c0ri4xgwgcwqrvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
+          sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7";
+          name = "mips-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mips-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "mmm-mako";
@@ -19930,22 +20119,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "83e6232b43902c7124fea16145de0da881bfe865";
-          sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
+          rev = "75ee79ed663bde0bd52f09c5b444cbd9e13a738a";
+          sha256 = "09sywhf1g8yqadzp19djar2gm3fmilqi3pbdm0hvm9b7xpq1gg44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
-        packageRequires = [ alert emacs s ];
+        packageRequires = [ alert emacs ht s ];
         meta = {
           homepage = "https://melpa.org/#/mu4e-alert";
           license = lib.licenses.free;
@@ -20581,11 +20770,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.22.1";
+        version = "0.22.2";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "b824ecc48f1e838ab19e346b0eec17ff02432493";
-          sha256 = "08jwa7fg2wnk5nhzd56lyvsgi6icgmzmb30mpvpvm4v2afwlhbvj";
+          rev = "da5029e2ac8dfd8a839de1f6a4701237d0b34db1";
+          sha256 = "0fryxrgz8l9397jcink5cybn4l57lzav6a4ar8p6rj5p9f7lr0d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -20832,12 +21021,12 @@
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
-        version = "0.2.4";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "98560075eb0a9dc5ad1e3102ac1154543692d74d";
-          sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja";
+          rev = "02955d24bd204d330891ec57921edd56f854f721";
+          sha256 = "02bz2jgpvrhqwp6jrdb8msr272mz0g2q6857m06yg7vcxpj4xlkz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -21000,12 +21189,12 @@
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "1.5.3";
+        version = "1.5.6";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "1553934954ea47e4d2de676c42324ed4790cfd14";
-          sha256 = "1n978yv19bsy5876lnp16xs1qg1frdbicf9c9h2rvil5myrljhyj";
+          rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
+          sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -23184,12 +23373,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "2.7";
+        version = "2.8";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "2c559083fa316b97b76e25c491a45aec5f2fe501";
-          sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh";
+          rev = "dfa6c66a038d84d9b7f17e0bc1471f3efea7acb6";
+          sha256 = "1nplmw0n8ap1sbshb7p1mrdw835f7a4ih1zxjg13wx0dls65zpa2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -24165,6 +24354,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "projectile-variable";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "projectile-variable";
+          rev = "810394eabf330325a86ec6f60c69e160eb837ac3";
+          sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
+          sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+          name = "projectile-variable";
+        };
+        packageRequires = [ cl-lib emacs projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/projectile-variable";
+          license = lib.licenses.free;
+        };
+      }) {};
     projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "projekt";
@@ -24336,12 +24546,12 @@
     pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pug-mode";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "48d5977e5efcf3650a1628b5cbffffdd164cd773";
-          sha256 = "1wiiarxh0lcxvy56f1rxdbk1iwhdynl2xn6v8nr35bw1l82b1j9g";
+          rev = "bff32a818ccc9e400210b942bd5e67fa21551148";
+          sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -25008,12 +25218,12 @@
     rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rc-mode";
-        version = "1.0.6";
+        version = "1.0.13";
         src = fetchFromGitHub {
           owner = "mrhmouse";
           repo = "rc-mode.el";
-          rev = "b9b48e24a55083e4911f2b497ed4d9676a192e88";
-          sha256 = "06ln916fim58q44g67zlnsipfxcramyrqbm9adh52mdbk44j4bf9";
+          rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f";
+          sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode";
@@ -25974,12 +26184,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "sage-shell-mode";
-          rev = "26303698cbd807b4cbaa241b0671f7e542a3bbe4";
-          sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr";
+          rev = "00881a50b5c8a9994e318e107e7848c1c9f119df";
+          sha256 = "0w1ba3rky07p7qsh2f59xfrhfip3k2db33pblyvs7z0fd0qwwsv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode";
@@ -26307,6 +26517,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sexy-monochrome-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "nuncostans";
+          repo = "sexy-monochrome-theme";
+          rev = "64570387a30ec5ac685cb11824ee24f8890572e1";
+          sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
+          sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg";
+          name = "sexy-monochrome-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sexy-monochrome-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shackle";
@@ -27546,6 +27777,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sphinx-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "sphinx-mode";
+          rev = "3d6e3059350593dc077f06f54c33869b9e28f7bc";
+          sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode";
+          sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b";
+          name = "sphinx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sphinx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "splitjoin";
@@ -28215,6 +28467,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swift3-mode";
+        version = "2.1.1";
+        src = fetchFromGitHub {
+          owner = "taku0";
+          repo = "swift3-mode";
+          rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9";
+          sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode";
+          sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520";
+          name = "swift3-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/swift3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
@@ -30950,12 +31223,12 @@
     ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ws-butler";
-        version = "0.3";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "106d313c0dad532c2da3cc78770a8a2f0396aa85";
-          sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
+          rev = "b59e36b2451193bf96176f5a006bf506770a40f3";
+          sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 700e494cfa73..fd9cfdc68a29 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160905";
+        version = "20160912";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20160905.tar";
-          sha256 = "01zm7s5qbh1xvxddd93i6cmz3m7x2s67zwzah5q5l3hgnvbx750q";
+          url = "http://orgmode.org/elpa/org-20160912.tar";
+          sha256 = "1xawj0pdvqrgzlixxgbfa01gzajfaz47anr5m4aw035rhc6s02r7";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20160905";
+        version = "20160912";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20160905.tar";
-          sha256 = "1wx51iqg1cfrf220yslp2lq9s7klbv6bbxq0d2ygj47yjikkf39r";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20160912.tar";
+          sha256 = "15id0gz60hqbhr183vnz4winpisa2kwrh47zqz37a5yx5b8fc84r";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/emacs-24/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch
index 2d8099b73736..2d8099b73736 100644
--- a/pkgs/applications/editors/emacs-24/at-fdcwd.patch
+++ b/pkgs/applications/editors/emacs/at-fdcwd.patch
diff --git a/pkgs/applications/editors/emacs-25/builder.sh b/pkgs/applications/editors/emacs/builder.sh
index 545520cca7c0..545520cca7c0 100644
--- a/pkgs/applications/editors/emacs-25/builder.sh
+++ b/pkgs/applications/editors/emacs/builder.sh
diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs/default.nix
index a8d994012e27..4a729ba3da3f 100644
--- a/pkgs/applications/editors/emacs-25/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
+, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
-, autoconf, automake
 , withX ? !stdenv.isDarwin
+, withGTK2 ? true, gtk2 ? null
 , withGTK3 ? false, gtk3 ? null
 , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null
-, withGTK2 ? true, gtk2
+, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
 }:
 
 assert (libXft != null) -> libpng != null;      # probably a bug
@@ -19,71 +19,68 @@ assert withXwidgets -> withGTK3 && webkitgtk24x != null;
 
 let
   toolkit =
-    if withGTK3 then "gtk3"
-    else if withGTK2 then "gtk2"
+    if withGTK2 then "gtk2"
+    else if withGTK3 then "gtk3"
     else "lucid";
 in
-
 stdenv.mkDerivation rec {
-  name = "emacs-25.1-rc2";
-
-  builder = ./builder.sh;
+  name = "emacs-25.1";
 
   src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
-    sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v";
+    url = "mirror://gnu//emacs/${name}.tar.xz";
+    sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
-    ./at-fdcwd.patch
-  ];
+  patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch;
 
-  postPatch = ''
-    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
-  '';
+  nativeBuildInputs = [ pkgconfig ]
+    ++ lib.optionals srcRepo [ autoconf automake texinfo ];
 
   buildInputs =
-    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext
-      autoconf automake ]
-    ++ stdenv.lib.optional stdenv.isLinux dbus
-    ++ stdenv.lib.optionals withX
+    [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
+    ++ lib.optional stdenv.isLinux dbus
+    ++ lib.optionals withX
       [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
         imagemagick gconf ]
-    ++ stdenv.lib.optional (withX && withGTK2) gtk2
-    ++ stdenv.lib.optional (withX && withGTK3) gtk3
-    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo
-    ++ stdenv.lib.optionals withXwidgets [webkitgtk24x wrapGAppsHook glib_networking];
+    ++ lib.optional (withX && withGTK2) gtk2
+    ++ lib.optional (withX && withGTK3) gtk3
+    ++ lib.optional (stdenv.isDarwin && withX) cairo
+    ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ];
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
 
   hardeningDisable = [ "format" ];
 
-  configureFlags =
-    (if stdenv.isDarwin
+  configureFlags = [ "--with-modules" ] ++
+   (if stdenv.isDarwin
       then [ "--with-ns" "--disable-ns-self-contained" ]
     else if withX
       then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
       else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
              "--with-gif=no" "--with-tiff=no" ])
-    ++ stdenv.lib.optional withXwidgets "--with-xwidgets";
+    ++ lib.optional withXwidgets "--with-xwidgets";
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX)
-    "-I${cairo.dev}/include/cairo";
+  preConfigure = lib.optionalString srcRepo ''
+    ./autogen.sh
+  '' + ''
+    substituteInPlace lisp/international/mule-cmds.el \
+      --replace /usr/share/locale ${gettext}/share/locale
 
-  preBuild = ''
-    find . -name '*.elc' -delete
+    for makefile_in in $(find . -name Makefile.in -print); do
+        substituteInPlace $makefile_in --replace /bin/pwd pwd
+    done
   '';
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
     cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications
     mv nextstep/Emacs.app $out/Applications
   '';
 
   meta = with stdenv.lib; {
-    description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
+    description = "The extensible, customizable GNU text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix
index 885538dc8837..885538dc8837 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs/macport-24.5.nix
diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index 023d6412ed84..023d6412ed84 100644
--- a/pkgs/applications/editors/emacs-24/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 41994563ee3d..72a4bfe57b89 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem
 , ncurses, libtermkey, lpeg, lua
 , acl ? null, libselinux ? null
-, version ? "2016-07-15"
-, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08"
-, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd"
+, version ? "2016-08-24"
+, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e"
+, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp"
 }:
 
 stdenv.mkDerivation rec {
-  name = "vis-nightly-${version}";
+  name = "vis-unstable-${version}";
   inherit version;
 
   src = fetchFromGitHub {
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
     owner = "martanne";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   buildInputs = [
-    unzip pkgconfig
     ncurses
     libtermkey
     lua
@@ -34,18 +33,38 @@ stdenv.mkDerivation rec {
   LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
 
   postInstall = ''
+    mkdir -p "$out/share/applications"
+    cp $desktopItem/share/applications/* $out/share/applications
     echo wrapping $out/bin/vis with runtime environment
     wrapProgram $out/bin/vis \
       --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \
       --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \
-      --prefix VIS_PATH : "$out/share/vis"
+      --prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
   '';
 
+  desktopItem = makeDesktopItem rec {
+    name = "vis";
+    exec = "vis %U";
+    type = "Application";
+    icon = "accessories-text-editor";
+    comment = meta.description;
+    desktopName = "vis";
+    genericName = "Text editor";
+    categories = stdenv.lib.concatStringsSep ";" [
+      "Application" "Development" "IDE"
+    ];
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "text/plain" "application/octet-stream"
+    ];
+    startupNotify = "false";
+    terminal = "true";
+  };
+
   meta = with stdenv.lib; {
     description = "A vim like editor";
     homepage = http://github.com/martanne/vis;
     license = licenses.isc;
-    maintainers = [ maintainers.vrthra ];
+    maintainers = with maintainers; [ vrthra ramkromberg ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.1.nix
new file mode 100644
index 000000000000..6bd572e99bba
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/5.1.nix
@@ -0,0 +1,120 @@
+{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
+
+# For `digitaglinktree`
+, perl, sqlite
+
+, qtbase
+, qtxmlpatterns
+, qtsvg
+, qtwebkit
+
+, kconfigwidgets
+, kcoreaddons
+, kdoctools
+, kfilemetadata
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+
+, bison
+, boost
+, eigen
+, exiv2
+, flex
+, jasper
+, lcms2
+, lensfun
+, libgphoto2
+, libkipi
+, liblqr1
+, libusb1
+, marble
+, mysql
+, opencv
+, threadweaver
+
+# For panorama and focus stacking
+, enblend-enfuse
+, hugin
+, gnumake
+
+, oxygen
+}:
+
+stdenv.mkDerivation rec {
+  name    = "digikam-${version}";
+  version = "5.1.0";
+
+  src = fetchurl {
+    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7";
+  };
+
+  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
+
+  buildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kdoctools
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    bison
+    boost
+    eigen
+    exiv2
+    flex
+    jasper
+    lcms2
+    lensfun
+    libgphoto2
+    libkipi
+    liblqr1
+    libusb1
+    marble.unwrapped
+    mysql
+    opencv
+    threadweaver
+
+    oxygen
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
+    "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
+    "-DENABLE_MYSQLSUPPORT=1"
+    "-DENABLE_INTERNALMYSQL=1"
+  ];
+
+  fixupPhase = ''
+    substituteInPlace $out/bin/digitaglinktree \
+      --replace "/usr/bin/perl" "${perl}/bin/perl" \
+      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
+
+    wrapQtProgram $out/bin/digikam \
+      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
+
+    wrapQtProgram $out/bin/showfoto
+  '';
+
+  meta = {
+    description = "Photo Management Program";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 775d344643e3..fbb10bc9ceb6 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,32 +1,72 @@
-{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file
-, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
-, libctemplate, libglade
-, libiodbc
-, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql
-, pango, pcre, pkgconfig, sqlite, sudo
-, pythonPackages
+{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig
+, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo
+, mysql, libxml2, libctemplate, libmysqlconnectorcpp
+, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs
+, libXdmcp, libuuid, libzip, libgnome_keyring, file
+, pythonPackages, jre, autoconf, automake, libtool
+, boost, glibmm, libsigcxx, pangomm, libX11, openssl
+, proj, cairo, libglade
 }:
 
 let
   inherit (pythonPackages) pexpect pycrypto python paramiko;
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "5.2.47";
+  version = "6.3.7";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirror.cogentco.com/pub/mysql/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
-    sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
+    url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
+    sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544";
   };
 
-  buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool
-    libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa
-    mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
+  buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
+    paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file
+    libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf
+    automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl
+    proj cairo cairo.dev makeWrapper libglade ] ;
+
+  prePatch = ''
+    for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ;
+    do
+      sed -i 's@#include <gdal/@#include <@' $f ;
+    done
+
+    sed -i '32s@mysqlparser@mysqlparser sqlparser@' library/mysql.parser/CMakeLists.txt
+
+    cat <<EOF > ext/antlr-runtime/fix-configure
+    #!${stdenv.shell}
+    echo "fixing bundled antlr3c configure" ;
+    sed -i 's@/usr/bin/file@${file}/bin/file@' configure
+    sed -i '12121d' configure
+    EOF
+    chmod +x ext/antlr-runtime/fix-configure
+    sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt
 
-  preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv"
+    substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib"
+    patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser
+    patchShebangs $(pwd)/tools/get_wb_version.sh
   '';
 
+  NIX_CFLAGS_COMPILE = [
+    "-I${libsigcxx}/lib/sigc++-2.0/include"
+    "-I${pangomm}/lib/pangomm-1.4/include"
+    "-I${glibmm}/lib/giomm-2.4/include"
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
+    "-DCTemplate_INCLUDE_DIR=${libctemplate}/include"
+    "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include"
+    "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include"
+    "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include"
+    "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include"
+  ];
+
   postInstall = ''
     patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh
 
@@ -52,7 +92,7 @@ in stdenv.mkDerivation rec {
 # used because we cannot clean up after ourselves due to the exec call.
 
 # Start gnome-keyring-daemon, export the environment variables it asks us to set.
-for expr in $( gnome-keyring-daemon --components=ssh,pkcs11 --start ) ; do eval "export "$expr ; done
+for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done
 
 # Prepare fifo pipe.
 FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo"
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index bd7e256bfa9d..23f06569fa95 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -157,9 +157,7 @@ in rec {
           fi
         '';
 
-        impureEnvVars = [
-          "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-        ];
+        impureEnvVars = lib.fetchers.proxyImpureEnvVars;
       };
 
     in {
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index cd6cbf667f13..5df2387ec7f1 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -113,6 +113,14 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       "$out/bin/firefox" --version
     '';
 
+  postFixup =
+    # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
+    ''
+      patchelf --set-rpath "${lib.getLib libnotify
+        }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \
+          "$out"/lib/firefox-*/libxul.so
+    '';
+
   meta = {
     description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
     homepage = http://www.mozilla.com/en-US/firefox/;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index cf51cc26a457..40955d0aeb0a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -98,6 +98,10 @@ stdenv.mkDerivation rec {
       mkdir -p $(dirname $preload)
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
       echo $preload > $plugins/extra-ld-preload
+
+      # Prevent a dependency on gcc.
+      strip -S $preload
+      patchELF $preload
     '';
 
   dontStrip = true;
diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
index d258c493aa1a..1caf1ce0bc8e 100644
--- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
+++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
@@ -10,9 +10,5 @@ stdenv.mkDerivation {
 
   buildInputs = [ curl ];
 
-  # We borrow these environment variables from the caller to allow
-  # easy proxy configuration.  This is impure, but a fixed-output
-  # derivation like fetchurl is allowed to do so since its result is
-  # by definition pure.
-  impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 }
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
new file mode 100644
index 000000000000..fbb08a9bd225
--- /dev/null
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "machine-${version}";
+  version = "0.8.1";
+
+  goPackagePath = "github.com/docker/machine";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "docker";
+    repo = "machine";
+    sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7";
+  };
+
+  postFixup =  ''
+    mv $bin/bin/cmd $bin/bin/docker-machine
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://docs.docker.com/machine/;
+    description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ offline tailhook ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index f8d5dd2c9d6f..b6fcbaafbb10 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -10,9 +10,5 @@ stdenv.mkDerivation {
 
   buildInputs = [ curl ];
 
-  # We borrow these environment variables from the caller to allow
-  # easy proxy configuration.  This is impure, but a fixed-output
-  # derivation like fetchurl is allowed to do so since its result is
-  # by definition pure.
-  impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 }
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
new file mode 100644
index 000000000000..f047bb42e7c6
--- /dev/null
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32
+, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.1";
+  name = "corebird-${version}";
+
+  src = fetchFromGitHub {
+    owner = "baedert";
+    repo = "corebird";
+    rev = version;
+    sha256 = "1a7b6hinl5p7yanf75a0khki2fvd04km1xlkwnspgx75cmnbnn5z";
+  };
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
+
+  buildInputs = [
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
+
+  meta = {
+    description = "Native Gtk+ Twitter client for the Linux desktop";
+    longDescription = "Corebird is a modern, easy and fun Twitter client.";
+    homepage = http://corebird.baedert.org;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jonafato ];
+  };
+}
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 5b8140bfa51c..f37f10d5209b 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "errbot-${version}";
   version = "4.2.2";
 
@@ -23,7 +23,7 @@ pythonPackages.buildPythonPackage rec {
     webtest bottle threadpool rocket-errbot requests2 jinja2
     pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
     daemonize pygments-markdown-lexer telegram irc slackclient
-    pyside sleekxmpp hypchat
+    pyside sleekxmpp hypchat pytest
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index e771db3795b5..f0b74370c3c7 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -4,7 +4,7 @@
 pythonPackages.buildPythonApplication rec {
   name = "blink-${version}";
   version = "2.0.0";
-  
+
   src = fetchurl {
     url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
     sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05";
@@ -15,8 +15,7 @@ pythonPackages.buildPythonApplication rec {
     sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
   '';
 
-  propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted
-    ];
+  propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ];
 
   buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
 
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 24c1b9768df6..980d21572cc0 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "xmpp-client-${version}";
-  version = "20160110-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
+  version = "20160916-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
 
   goPackagePath = "github.com/agl/xmpp-client";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "agl";
+    repo = "xmpp-client";
     inherit rev;
-    url = "https://github.com/agl/xmpp-client";
-    sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
+    sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 0be5e0bd57eb..d5bda113ba8c 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, ncurses, which, perl, autoreconfHook
+{ stdenv, fetchurl, ncurses, which, perl
 , gdbm ? null
 , openssl ? null
 , cyrus_sasl ? null
 , gpgme ? null
-, aclocal ? null
 , headerCache  ? true
 , sslSupport   ? true
 , saslSupport  ? true
 , gpgmeSupport ? true
 , imapSupport  ? true
-, withSidebar  ? false
-, withTrash    ? false
+, withSidebar  ? true
 }:
 
 assert headerCache  -> gdbm       != null;
@@ -22,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.6.2";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65";
+    sha256 = "0idkamdiwj9fgqaz1vzkfg78cnmkzp74skv0ibw2xjfq6ds9hghx";
   };
 
   buildInputs =
@@ -34,8 +32,7 @@ stdenv.mkDerivation rec {
     ++ optional headerCache  gdbm
     ++ optional sslSupport   openssl
     ++ optional saslSupport  cyrus_sasl
-    ++ optional gpgmeSupport gpgme
-    ++ optional withSidebar  autoreconfHook;
+    ++ optional gpgmeSupport gpgme;
 
   configureFlags = [
     (enableFeature headerCache  "hcache")
@@ -60,18 +57,6 @@ stdenv.mkDerivation rec {
   ] ++ optional sslSupport  "--with-ssl"
     ++ optional saslSupport "--with-sasl";
 
-  patches =
-    optional withTrash (fetchpatch {
-      name = "trash.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/trash.patch?h=mutt-sidebar";
-      sha256 = "1hrib9jk28mqd02nzv0sx01jfdabzvnwcc5qjc3810zfglzc1nql";
-    }) ++
-    optional withSidebar (fetchpatch {
-      name = "sidebar.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/sidebar.patch?h=mutt-sidebar";
-      sha256 = "1l63wj7kw41jrh00mcxdw4p4vrbc9wld42s99liw8kz2aclymq5m";
-    });
-
   meta = {
     description = "A small but very powerful text-based mail client";
     homepage = http://www.mutt.org;
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index cba5488e1a45..5483e9420761 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q";
   };
 
+  prePatch = ''
+    substituteInPlace "libfreerdp/freerdp.pc.in" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
+  '';
+
   patches = [
   ] ++ stdenv.lib.optional (pcsclite != null)
       (substituteAll {
@@ -38,7 +42,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"
     ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON";
 
-
   meta = with stdenv.lib; {
     description = "A Remote Desktop Protocol Client";
     longDescription = ''
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index c1907c44e584..3190d999a912 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
+{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }:
 
 let
   inherit (python3Packages) python dbus-python keyring;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a";
   };
 
-  buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfsFuse encfs ];
+  buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ];
 
   installFlags = [ "DEST=$(out)" ];
 
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix
index 4ec939a01290..059c68b77e65 100644
--- a/pkgs/applications/office/antiword/default.nix
+++ b/pkgs/applications/office/antiword/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f";
   };
 
-  preInstall = ''
+  prePatch = ''
     sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h
   '';
 
diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md
new file mode 100644
index 000000000000..eb21fe2f441e
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/README.md
@@ -0,0 +1,10 @@
+LibreOffice
+===========
+
+To generate `libreoffice-srcs.nix`:
+
+    nix-shell default-gen-shell.nix --run generate
+
+To generate `libreoffice-srcs-still.nix`:
+
+    nix-shell still-gen-shell.nix --run generate
diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/pkgs/applications/office/libreoffice/default-gen-shell.nix
new file mode 100644
index 000000000000..366030971237
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/default-gen-shell.nix
@@ -0,0 +1,29 @@
+{ pkgs ? (import <nixpkgs> {}) }:
+
+with pkgs;
+
+let
+
+  primary-src = callPackage ./default-primary-src.nix {};
+
+in
+
+stdenv.mkDerivation {
+  name = "generate-libreoffice-srcs-shell";
+
+  buildCommand = "exit 1";
+
+  downloadList = stdenv.mkDerivation {
+    name = "libreoffice-${primary-src.version}-download-list";
+    inherit (primary-src) src version;
+    builder = ./download-list-builder.sh;
+  };
+
+  buildInputs = [ python3 ];
+
+  shellHook = ''
+    function generate {
+      python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix
+    }
+  '';
+}
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
new file mode 100644
index 000000000000..2af9e4337893
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -0,0 +1,17 @@
+{ fetchurl }:
+
+rec {
+  major = "5";
+  minor = "2";
+  patch = "1";
+  tweak = "2";
+
+  subdir = "${major}.${minor}.${patch}";
+
+  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+  src = fetchurl {
+    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+    sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1";
+  };
+}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 88a9a6baf147..d929bc99b101 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -19,14 +19,14 @@
 }:
 
 let
+  primary-src = import ./default-primary-src.nix { inherit fetchurl; };
+in
+
+with { inherit (primary-src) major minor subdir version; };
+
+let
   lib = stdenv.lib;
   langsSpaces = lib.concatStringsSep " " langs;
-  major = "5";
-  minor = "2";
-  patch = "1";
-  tweak = "2";
-  subdir = "${major}.${minor}.${patch}";
-  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
   fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
     inherit name md5;
@@ -64,10 +64,7 @@ let
 in stdenv.mkDerivation rec {
   name = "libreoffice-${version}";
 
-  src = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1";
-  };
+  inherit (primary-src) src;
 
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh
new file mode 100644
index 000000000000..c054e2c72cbe
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/download-list-builder.sh
@@ -0,0 +1,3 @@
+source $stdenv/setup
+
+tar --extract --file=$src libreoffice-$version/download.lst -O > $out
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
new file mode 100755
index 000000000000..9af2ef2fd88a
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python3
+
+"""
+Converts the LibreOffice `download.lst` file into a Nix expression.
+
+Requires an environment variable named `downloadList` identifying the path
+of the input file, and writes the result to stdout.
+
+todo - Ideally we would move as much as possible into derivation dependencies.
+"""
+import collections, itertools, json, re, sys, os
+
+def main():
+
+    print('[')
+
+    for x in get_packages():
+
+        print('{')
+
+        print('  name = "{}";'.format(x['tarball']))
+        print('  md5 = "{}";'.format(x['md5']))
+        print('  brief = {};'.format('true' if x['brief'] else 'false'))
+
+        if 'subdir' in x:
+            print('  subDir = "{}";'.format(x['subdir']))
+
+        print('}')
+
+    print(']')
+
+
+def get_packages():
+    """
+    All of the package data: What's parsed from download.lst,
+    plus our additions.
+    """
+    return apply_additions(get_packages_from_download_list(),
+                           get_additions())
+
+
+def get_additions():
+    """
+    A mapping from package name (the all-caps identifiers used in
+    `download.lst`) to a dict of additional attributes to set on the package.
+    """
+    with open('./libreoffice-srcs-additions.json') as f:
+        return json.load(f)
+
+
+def apply_additions(xs, additions):
+    for x in xs:
+        yield dict_merge([x,
+                          additions.get(x['name'], {})])
+
+
+def get_packages_from_download_list():
+    """
+    The result of parsing `download.lst`: A list of dicts containing keys
+    'name', 'tarball', 'md5', 'brief'.
+    """
+
+    def lines():
+        for x in sub_symbols(parse_lines(get_lines())):
+
+            interpretation = interpret(x)
+
+            if interpretation == 'unrecognized':
+                print_skipped_line(x)
+            else:
+                yield dict_merge([x,
+                                  interpretation])
+
+    def cluster(xs):
+        """
+        Groups lines according to their order within the file, to support
+        packages that are listed in `download.lst` more than once.
+        """
+        keys = ['tarball', 'md5', 'brief']
+        a = {k: [x for x in xs if k in x['attrs']] for k in keys}
+        return zip(*[a[k] for k in keys])
+
+    def packages():
+        for (name, group) in groupby(lines(), lambda x: x['name']):
+            for xs in cluster(group):
+                yield {'name': name,
+                       'attrs': dict_merge(x['attrs'] for x in xs),
+                       'index': min(x['index'] for x in xs)}
+
+    for x in sorted(packages(), key=lambda x: x['index']):
+        yield dict_merge([{'name': x['name']},
+                          x['attrs']])
+
+
+def dict_merge(xs):
+    """
+    >>> dict_merge([{1: 2}, {3: 4}, {3: 5}])
+    {1: 2, 3: 4}
+    """
+    return dict(collections.ChainMap(*xs))
+
+
+def groupby(xs, f):
+    """
+    >>> groupby([1, 2, 3, 4], lambda x: x % 2)
+    [(0, [2, 4]), (1, [1, 3])]
+    """
+    for (k, iter) in itertools.groupby(sorted(xs, key=f), f):
+        group = list(iter)
+        yield (f(group[0]), group)
+
+
+def get_lines():
+
+    download_list = os.getenv('downloadList')
+
+    with open(download_list) as f:
+        return f.read().splitlines()
+
+
+def print_skipped_line(x):
+
+    print('Skipped line {}: {}'.format(x['index'],
+                                       x['original']),
+          file=sys.stderr)
+
+
+def parse_lines(lines):
+    """
+    Input: List of strings (the lines from `download.lst`
+    Output: Iterator of dicts with keys 'key', 'value', and 'index'
+    """
+    for (index, line) in enumerate(lines):
+
+        x = { 'index': index, 'original': line }
+
+        result = parse_line(line)
+
+        if result == 'nothing':
+            pass
+        elif result == 'unrecognized':
+            print_skipped_line(x)
+        else:
+            yield dict_merge([x,
+                             result])
+
+
+def parse_line(line):
+    """
+    Input: A string
+    Output: One of 1. A dict with keys 'key', 'value'
+                   2. 'nothing' (if the line contains no information)
+                   2. 'unrecognized' (if parsing failed)
+    """
+
+    if re.match('\s*(#.*)?$', line):
+        return 'nothing'
+
+    match = re.match('\s*export\s+([^:\s]+)\s*:=\s*(.*)$', line)
+
+    if match:
+        return {
+            'key': match.group(1),
+            'value': match.group(2).strip()
+        }
+    else:
+        return 'unrecognized'
+
+
+def sub_symbols(xs):
+    """
+    Do substitution of variables across all lines.
+
+    >>> sub_symbols([{'key': 'a', 'value': 'x'},
+    ...              {'key': 'c': 'value': '$(a)yz'}])
+    [{'key': 'a', 'value': 'x'}, {'key': 'c': 'value': 'xyz'}]
+    """
+
+    xs = list(xs)
+
+    symbols = {x['key']: x for x in xs}
+
+    def get_value(k):
+        x = symbols.get(k)
+        return x['value'] if x is not None else None
+
+    for x in xs:
+        yield dict_merge([{'value': sub_str(x['value'], get_value)},
+                          x])
+
+
+def sub_str(string, func):
+    """
+    Do substitution of variables in a single line.
+
+    >>> sub_str("x = $(x)", lambda k: {'x': 'a'}[k])
+    "x = a"
+    """
+
+    def func2(m):
+        x = m.group(1)
+        result = func(x)
+        return result if result is not None else x
+
+    return re.sub(r'\$\(([^\$\(\)]+)\)', func2, string)
+
+
+def interpret(x):
+    """
+    Input: Dict with keys 'key' and 'value'
+    Output: One of 1. Dict with keys 'name' and 'attrs'
+                   2. 'unrecognized' (if interpretation failed)
+    """
+    for f in [interpret_md5, interpret_tarball_with_md5, interpret_tarball]:
+        result = f(x)
+        if result is not None:
+            return result
+
+    return 'unrecognized'
+
+
+def interpret_md5(x):
+    """
+    >>> interpret_md5("ODFGEN_MD5SUM", "32572ea48d9021bbd6fa317ddb697abc")
+    {'name': 'ODFGEN', 'attrs': {'md5': '32572ea48d9021bbd6fa317ddb697abc'}}
+    """
+
+    match = re.match('^(.*)_MD5SUM$', x['key'])
+
+    if match:
+        return {'name': match.group(1),
+                'attrs': {'md5': x['value']}}
+
+
+def interpret_tarball(x):
+    """
+    >>> interpret_tarball("FREEHAND_TARBALL", "libfreehand-0.1.1.tar.bz2")
+    {'name': 'FREEHAND',
+     'attrs': {'tarball': 'libfreehand-0.1.1.tar.bz2', 'brief': True}}
+    """
+
+    match = re.match('^(.*)_TARBALL$', x['key'])
+
+    if match:
+        return {'name': match.group(1),
+                'attrs': {'tarball': x['value'], 'brief': True}}
+
+
+def interpret_tarball_with_md5(x):
+    """
+    >>> interpret_tarball_with_md5("CLUCENE_TARBALL",\
+        "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz")
+    {'name': 'CLUCENE',
+     'attrs': {'tarball': 'clucene-core-2.3.3.4.tar.gz',
+               'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}}
+    """
+
+    match = {'key': re.match('^(.*)_TARBALL$', x['key']),
+             'value': re.match('(?P<md5>[0-9a-fA-F]{32})-(?P<tarball>.+)$',
+                               x['value'])}
+
+    if match['key'] and match['value']:
+        return {'name': match['key'].group(1),
+                'attrs': {'tarball': match['value'].group('tarball'),
+                          'md5': match['value'].group('md5'),
+                          'brief': False}}
+
+
+main()
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
deleted file mode 100755
index 2367fa1c7f44..000000000000
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/run/current-system/sw/bin/bash
-
-# Ideally we would move as much as possible into derivation dependencies
-
-# Take the list of files from the main package, ooo.lst.in
-
-# This script wants an argument: download list file
-
-cat <<EOF
-[
-EOF
-
-write_entry(){
-  echo '{'
-  echo "  name = \"${name}\";"
-  echo "  md5 = \"${md5}\";"
-  echo "  brief = ${brief};"
-  eval "echo -n \"\$additions_${name%%[-_.]*}\""
-  eval "test -n \"\$additions_${name%%[-_.]*}\" && echo"
-  echo '}'
-  saved_line=
-}
-
-saved_line=
-cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
-while read line; do
-  case "$line" in
-    EVAL\ *)
-      echo "${line#* }" >&2;
-      eval "${line#* }";
-      saved_line=
-      ;;
-    \#*)
-      echo Skipping comment: "$line" >&2;
-      ;;
-    *_MD5SUM\ :=*)
-      if test -n "$saved_line"; then
-        tbline="$saved_line"
-      else
-        read tbline;
-      fi;
-      line=${line##* };
-      line=${line##*:=};
-      if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
-         verline=${tbline##* };
-         read tbline;
-         tbline=${tbline##* };
-         tbline=${tbline##*:=};
-         md5=$line
-         name=$tbline;
-         name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}"
-      else
-         tbline=${tbline##* };
-         tbline=${tbline##*:=};
-         md5=$line
-         name=$tbline;
-      fi
-      brief=true;
-      write_entry;
-      ;;
-    *_TARBALL\ :=*)
-      line=${line##* };
-      line=${line##*:=};
-      line="${line#,}"
-      md5=${line:0:32};
-      name=${line:33};
-      name="${name%)}"
-      brief=false;
-      if test -n "$name"; then
-        write_entry;
-      else
-        saved_line="$line";
-      fi
-      ;;
-    *)
-      echo Skipping: "$line" >&2;
-      ;;
-  esac
-done
-
-echo ']'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
new file mode 100644
index 000000000000..75d4cced92a6
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
@@ -0,0 +1,3 @@
+{
+  "LIBGLTF": {"subdir": "libgltf/"}
+}
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
deleted file mode 100644
index d505aa7a4cbb..000000000000
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
+++ /dev/null
@@ -1 +0,0 @@
-EVAL additions_libgltf='  subDir = "libgltf/";'
diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/pkgs/applications/office/libreoffice/still-gen-shell.nix
new file mode 100644
index 000000000000..c5c17c2aaad0
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/still-gen-shell.nix
@@ -0,0 +1,29 @@
+{ pkgs ? (import <nixpkgs> {}) }:
+
+with pkgs;
+
+let
+
+  primary-src = callPackage ./still-primary-src.nix {};
+
+in
+
+stdenv.mkDerivation {
+  name = "generate-libreoffice-srcs-shell";
+
+  buildCommand = "exit 1";
+
+  downloadList = stdenv.mkDerivation {
+    name = "libreoffice-${primary-src.version}-download-list";
+    inherit (primary-src) src version;
+    builder = ./download-list-builder.sh;
+  };
+
+  buildInputs = [ python3 ];
+
+  shellHook = ''
+    function generate {
+      python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix
+    }
+  '';
+}
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
new file mode 100644
index 000000000000..33ba558ed298
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -0,0 +1,17 @@
+{ fetchurl }:
+
+rec {
+  major = "5";
+  minor = "1";
+  patch = "5";
+  tweak = "2";
+
+  subdir = "${major}.${minor}.${patch}";
+
+  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+  src = fetchurl {
+    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+    sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
+  };
+}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 2b3d4ad2ec6e..383e43a74aad 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -19,14 +19,14 @@
 }:
 
 let
+  primary-src = import ./still-primary-src.nix { inherit fetchurl; };
+in
+
+with { inherit (primary-src) major minor subdir version; };
+
+let
   lib = stdenv.lib;
   langsSpaces = lib.concatStringsSep " " langs;
-  major = "5";
-  minor = "1";
-  patch = "5";
-  tweak = "2";
-  subdir = "${major}.${minor}.${patch}";
-  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
   fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
     inherit name md5;
@@ -64,10 +64,7 @@ let
 in stdenv.mkDerivation rec {
   name = "libreoffice-${version}";
 
-  src = fetchurl {
-    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
-  };
+  inherit (primary-src) src;
 
   # we only have this problem on i686 ATM
   patches = if stdenv.is64bit then null else [
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index b9db4174c094..19f769e4365c 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, groff, utillinux }:
+{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }:
 
 with stdenv.lib;
 let
@@ -7,7 +7,6 @@ let
     BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
     USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
     TERMCONTROL=-DUSE_TERMIOS \
-    NROFF=groff
   '';
 in
 stdenv.mkDerivation rec {
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg";
   };
 
-  buildInputs = [ makeWrapper readline ncurses groff utillinux ];
+  buildInputs = [ makeWrapper readline ncurses utillinux ];
 
   configurePhase = ''
     sed -i 's/all: check_include/all:/' Makefile
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index a736bdad2ea1..808af776e28b 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     homepage = "https://root.cern.ch/";
     description = "A data analysis framework";
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh
new file mode 100644
index 000000000000..197dc78c3c2c
--- /dev/null
+++ b/pkgs/applications/science/misc/root/setup-hook.sh
@@ -0,0 +1,9 @@
+thisroot () {
+    # Workaround thisroot.sh dependency on man
+    if [ -z "${MANPATH}" ]; then
+        MANPATH=:
+    fi
+    source @out@/bin/thisroot.sh
+}
+
+envHooks+=(thisroot)
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index da6e0cb2805d..9b8035fcefe7 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
-, cmake, makeWrapper, libjpeg }:
+, cmake, makeWrapper, libjpeg, python }:
 
-let version = "4.1.0"; in
+let version = "4.9.0"; in
 stdenv.mkDerivation rec {
   name = "tulip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/auber/${name}_src.tar.gz";
-    sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig";
+    sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3";
   };
 
-  buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
+  buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ];
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index c98d84dab438..22072ca742c1 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "9.4.0";
+  version = "9.4.2";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "0bmr0cnxp56flak6fjcn0ld5238h3ngrvy09yqp4790g8xwif35v";
+    sha256 = "1dyhlpik8d9z78dg47cha313r0dm9fcjg6hzkmzd2ng9yrq5pmdy";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
index a5e7acaf159f..0e1b147f6e18 100644
--- a/pkgs/build-support/docker/pull.nix
+++ b/pkgs/build-support/docker/pull.nix
@@ -26,17 +26,11 @@ let layer = stdenv.mkDerivation {
   outputHash = sha256;
   outputHashMode = "recursive";
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
     # This variable allows the user to pass additional options to curl
     "NIX_CURL_FLAGS"
   ];
-  
+
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.
   preferLocalBuild = true;
diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix
index ac7a442de315..4d759e6f7f18 100644
--- a/pkgs/build-support/fetchadc/default.nix
+++ b/pkgs/build-support/fetchadc/default.nix
@@ -1,15 +1,5 @@
 { stdenv, curl, adc_user, adc_pass }:
 
-let
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-  ];
-in
-
 { # Path to fetch.
   path
 
diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix
index 223d2098c770..3e0d5d566ad7 100644
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@@ -17,12 +17,6 @@ stdenv.mkDerivation {
 
   eggName = name;
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-  ];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 }
 
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 7f98c97fc55b..105b3d56bf42 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -56,13 +56,9 @@ stdenv.mkDerivation {
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
-    ];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
+    "GIT_PROXY_COMMAND" "SOCKS_SERVER"
+  ];
 
   preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 214e9b1387b6..79f610166a79 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   buildInputs = [mercurial];
 
-  impureEnvVars = [
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-  ];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 
   # Nix <= 0.7 compatibility.
   id = md5;
diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix
index daead9ad6d2d..1dc14e8cab13 100644
--- a/pkgs/build-support/fetchmtn/default.nix
+++ b/pkgs/build-support/fetchmtn/default.nix
@@ -19,12 +19,7 @@ stdenv.mkDerivation {
   dbs = defaultDBMirrors ++ dbs;
   inherit branch cacheDB name selector;
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-    ];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+
 }
 
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 90dc13439a0f..85ec52c4bde0 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -33,13 +33,6 @@ stdenv.mkDerivation {
   
   inherit url rev sshSupport openssh ignoreExternals;
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-    ];
-
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
   preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index a7c76737e1ad..00f485ce6975 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -20,13 +20,7 @@ let
   # "gnu", etc.).
   sites = builtins.attrNames mirrors;
 
-  impureEnvVars = [
-    # We borrow these environment variables from the caller to allow
-    # easy proxy configuration.  This is impure, but a fixed-output
-    # derivation like fetchurl is allowed to do so since its result is
-    # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
-
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
     # This variable allows the user to pass additional options to curl
     "NIX_CURL_FLAGS"
 
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 1b4983e32597..0c9625e51405 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
   preferLocalBuild = true;
 }
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 86dd001374fa..4fae5378463f 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fira-code-${version}";
-  version = "1.201";
+  version = "1.203";
 
   src = fetchurl {
     url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
-    sha256 = "11hwpdqj41wvzc8l8zgfb132cxn8kxpxbgiqc2kinc25x2l1ikji";
+    sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1";
   };
 
   sourceRoot = "otf";
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index b8b3d82ccb60..d3aadbcd5a1e 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.18.0";
+  version = "1.18.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806";
+    sha256 = "08njx6wd505as1vn0yp4mnmf6mb2v28jsipxxx4zhf78v18d2sqc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index bbb540ec10fc..4bb961b8d2e7 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -1,11 +1,11 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake-2_8, automoc4, perl, pkgconfig
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig
 , release, branch, ignoreList, extraSubpkgs
 }:
 
 let
   inherit (stdenv.lib) filter fold;
   inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-  cmake = cmake-2_8;
+  cmake = cmake_2_8;
 in
 rec {
   manifest = import (./. + "/${release}.nix");
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 3166b94adaa7..980cc9ac25c8 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -57,6 +57,7 @@ let
     libkexiv2 = callPackage ./libkexiv2.nix {};
     libkipi = callPackage ./libkipi.nix {};
     libkomparediff2 = callPackage ./libkomparediff2.nix {};
+    marble = callPackage ./marble.nix {};
     okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
     spectacle = callPackage ./spectacle.nix {};
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index b3c71c44fcf8..c23d8a4d7572 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/desktops/kde-5/applications/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.08.1/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/desktops/kde-5/applications/marble.nix
new file mode 100644
index 000000000000..8d6ee5a0f7c5
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/marble.nix
@@ -0,0 +1,24 @@
+{ kdeApp, lib, kdeWrapper
+, ecm, qtscript, qtsvg, qtquickcontrols
+, gpsd
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "marble";
+      meta.license = with lib.licenses; [ lgpl21 gpl3 ];
+
+      nativeBuildInputs = [ ecm ];
+      propagatedBuildInputs = [
+        qtscript qtsvg qtquickcontrols
+        gpsd
+      ];
+
+      enableParallelBuilding = true;
+    };
+in
+kdeWrapper unwrapped {
+  targets = [ "bin/marble-qt" ];
+  paths = [ unwrapped ];
+}
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index 4da2717031ff..e3ecd24b6dbf 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -1,2069 +1,2069 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
 { fetchurl, mirror }:
 
 {
   akonadi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-16.08.0.tar.xz";
-      sha256 = "0xml678j47f9xd2dvyvw2v93yklwkvxamrp2v3739iqp03qfc210";
-      name = "akonadi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-16.08.1.tar.xz";
+      sha256 = "1km4qis98z19b5vy0g8r52mnd4i301ycf9l96a4vw4q56wmss2f1";
+      name = "akonadi-16.08.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-calendar-16.08.0.tar.xz";
-      sha256 = "0g61sbj1ifkw349xmwch6hkazs1n6m92jhc1gm8az4zfnipms8yw";
-      name = "akonadi-calendar-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-calendar-16.08.1.tar.xz";
+      sha256 = "12bz190cww8r34j0543wavf4d9ydkwszxh1ayxkg6hlf67yv2jpf";
+      name = "akonadi-calendar-16.08.1.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-contacts-16.08.0.tar.xz";
-      sha256 = "1c50nnfk8r351a1pc0hyl03gbmnzqvicj6533gbl60104zg0cl49";
-      name = "akonadi-contacts-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-contacts-16.08.1.tar.xz";
+      sha256 = "09dx4vi1329fgr2gya833p3zwasz4y8vh4fwlis3669zns6nvn6w";
+      name = "akonadi-contacts-16.08.1.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-mime-16.08.0.tar.xz";
-      sha256 = "0b541y6ir78f5acdlzzr0bv9q8gd1p4rklrm0pcddvs1d28s5ng2";
-      name = "akonadi-mime-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-mime-16.08.1.tar.xz";
+      sha256 = "16hyz28gjp1b0w6l33cgdrli4b777yanryfr8nn1mp4y8p2375fp";
+      name = "akonadi-mime-16.08.1.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-notes-16.08.0.tar.xz";
-      sha256 = "0xwrj9y071g1svmwj1nrfff3vr371va7rm8mmx5hw6ringakgxn6";
-      name = "akonadi-notes-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-notes-16.08.1.tar.xz";
+      sha256 = "1m95zckfr9wlcjsf3h6v2fg7rbivd28gjj2yddrrv7wx57xmky4j";
+      name = "akonadi-notes-16.08.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/akonadi-search-16.08.0.tar.xz";
-      sha256 = "12lpgm5111dd2ny6fdhcxish397x54mcnma504f3ibk7f3brwnmf";
-      name = "akonadi-search-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/akonadi-search-16.08.1.tar.xz";
+      sha256 = "1qdqzb9achabb3vs7dm3pi3pk3l8rmk6ymmzlxr79l98cfmw39bk";
+      name = "akonadi-search-16.08.1.tar.xz";
     };
   };
   analitza = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/analitza-16.08.0.tar.xz";
-      sha256 = "1j8axc4618jb45vxp0ii51sr2wh6vmr1f8ycn3xqnd9ln936qqyz";
-      name = "analitza-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/analitza-16.08.1.tar.xz";
+      sha256 = "1l08g9gzi6aabzh62cg2k4731nbw8hnfb7qy1mjb4yn2gap0c4cd";
+      name = "analitza-16.08.1.tar.xz";
     };
   };
   ark = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ark-16.08.0.tar.xz";
-      sha256 = "1a8aklvpk5s319665s1c0mnbzknbyhbq2lm79hflal3r28g3acvj";
-      name = "ark-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ark-16.08.1.tar.xz";
+      sha256 = "1g9qvxw26hqngvbp4i82lmhpbr4nxidv7pj0sg1ji48jzycjbd3q";
+      name = "ark-16.08.1.tar.xz";
     };
   };
   artikulate = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/artikulate-16.08.0.tar.xz";
-      sha256 = "1j57y5zwp6zpd2hzh01a13m49rbgkzkf3ncfx122d7vih9f8kzvd";
-      name = "artikulate-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/artikulate-16.08.1.tar.xz";
+      sha256 = "1rbs6yf3pmhp9xj3lpr0h14pb4mylffhav2nb8sb42hw7c3pjycb";
+      name = "artikulate-16.08.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/audiocd-kio-16.08.0.tar.xz";
-      sha256 = "0ndb7b67yssmsxlnphpkyk4yx9n3xx2w20q4fz55r6zrp7yphm1a";
-      name = "audiocd-kio-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/audiocd-kio-16.08.1.tar.xz";
+      sha256 = "15x9nv014sdvc80vqldsgxrgickrrda6hrm26jcvp483qzvpjp82";
+      name = "audiocd-kio-16.08.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/baloo-widgets-16.08.0.tar.xz";
-      sha256 = "0daf0wkz14p82fl7731r1dhcy2w1zqlia722jskzmn4g86c9lf7d";
-      name = "baloo-widgets-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/baloo-widgets-16.08.1.tar.xz";
+      sha256 = "0lb42ci06xka82147awcwdhw35d1spvhdkfiq3qpbbyq8ajqxq18";
+      name = "baloo-widgets-16.08.1.tar.xz";
     };
   };
   blinken = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/blinken-16.08.0.tar.xz";
-      sha256 = "16x0l7fajrdgqm6pwhkn1za8bwliw556z6fc4bxm2jgcmdih7znq";
-      name = "blinken-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/blinken-16.08.1.tar.xz";
+      sha256 = "0xk39mcyad8s8haj2rmg2m7x46qzayl8zivc8v8h28vn80lvhk4v";
+      name = "blinken-16.08.1.tar.xz";
     };
   };
   bomber = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/bomber-16.08.0.tar.xz";
-      sha256 = "05j7xrcxs0lvniprd9818ck0jrjn6j8hjf773riqzsqr463v183h";
-      name = "bomber-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/bomber-16.08.1.tar.xz";
+      sha256 = "0rsgwr8vlnfli8zb77l9vdqn60k7kpdxpsaq16nhxxwl2n3780gn";
+      name = "bomber-16.08.1.tar.xz";
     };
   };
   bovo = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/bovo-16.08.0.tar.xz";
-      sha256 = "184h61fbkrasp9hik21pa45fxhgvvqmsf424n46i93m48fa7vwzl";
-      name = "bovo-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/bovo-16.08.1.tar.xz";
+      sha256 = "1vc4dv5gh2vif98fz4rcdb8zv20sashq4xbgfvk0xq3ls9j3qdyi";
+      name = "bovo-16.08.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/calendarsupport-16.08.0.tar.xz";
-      sha256 = "04sbgp75vdg69jdjp9wgkcblzcwa7v5hwsdyb2ahz9ga27qsxgan";
-      name = "calendarsupport-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/calendarsupport-16.08.1.tar.xz";
+      sha256 = "08xvnmlpkwrsdz5fawcddcd5s7dn3zczfk5shk9a00734nc4akkb";
+      name = "calendarsupport-16.08.1.tar.xz";
     };
   };
   cantor = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/cantor-16.08.0.tar.xz";
-      sha256 = "0j798qxa8j8f6fjkvpag48gcqjrifgxhcm8raccx3bqlxz7145gh";
-      name = "cantor-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/cantor-16.08.1.tar.xz";
+      sha256 = "1cawdhpmyfb5qgbxil38szghi8q7hslpljzgsn7ma3gy6sqv3k9s";
+      name = "cantor-16.08.1.tar.xz";
     };
   };
   cervisia = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/cervisia-16.08.0.tar.xz";
-      sha256 = "0azjsigiz26y9fn1i8gaqdzw2bhvdn9v63ii51iazggjb49sk17v";
-      name = "cervisia-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/cervisia-16.08.1.tar.xz";
+      sha256 = "0apb29k4r2wsf6hn3rl2h1yvmy8npi4dmvjhr02j3gqfxic68vf1";
+      name = "cervisia-16.08.1.tar.xz";
     };
   };
   dolphin = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/dolphin-16.08.0.tar.xz";
-      sha256 = "0xqyb1qdxg19sp7xwkys9x92cx5wnbjz3sdmr2yc4j56fjqhih3j";
-      name = "dolphin-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/dolphin-16.08.1.tar.xz";
+      sha256 = "022mnq1x9la8yxim3svf3vj2x43gdp5qd6fwr50lvxw4i4gc8giy";
+      name = "dolphin-16.08.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/dolphin-plugins-16.08.0.tar.xz";
-      sha256 = "12pxw5vzznzkd9mr6dshh18mlgk0pmmkqic1mn1i53w0sj9r1zl2";
-      name = "dolphin-plugins-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/dolphin-plugins-16.08.1.tar.xz";
+      sha256 = "1vi0pwvz76w13gglpbn1dwxbzr5hmwjhdpi64nmbqjgi71i9x2sa";
+      name = "dolphin-plugins-16.08.1.tar.xz";
     };
   };
   dragon = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/dragon-16.08.0.tar.xz";
-      sha256 = "0vjhrdyshd7rd4i7yn6v1ldi0fsyabwph1pjjdylq1cz4clc7mzi";
-      name = "dragon-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/dragon-16.08.1.tar.xz";
+      sha256 = "1441jgg8bwvqghz31xnkwwlsayw134q0jiffgh1nis4rxm2rln8h";
+      name = "dragon-16.08.1.tar.xz";
     };
   };
   eventviews = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/eventviews-16.08.0.tar.xz";
-      sha256 = "1gms9q04icycjcazqkhg0i6mlf01rg45pp3zyndw6l7y3v9gcnq2";
-      name = "eventviews-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/eventviews-16.08.1.tar.xz";
+      sha256 = "0hp282if9fzw1xv4zdwrvar7wkchi9psl373r1594a7rjz9iby5j";
+      name = "eventviews-16.08.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ffmpegthumbs-16.08.0.tar.xz";
-      sha256 = "0nymi6g51xal5cllnp6rqxr7gcanp07njvpc7w02i2daan6cf5li";
-      name = "ffmpegthumbs-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ffmpegthumbs-16.08.1.tar.xz";
+      sha256 = "08gna4lcz6ipjkm2vx862n1w61cxzkskaapsd22zxfmgfhmqyp73";
+      name = "ffmpegthumbs-16.08.1.tar.xz";
     };
   };
   filelight = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/filelight-16.08.0.tar.xz";
-      sha256 = "1dynl9b4vp8qas23ysbbjmrf71k36z5cwnb2av3k0b53vf8h694p";
-      name = "filelight-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/filelight-16.08.1.tar.xz";
+      sha256 = "0l059q0vh4yp2y5m0alvcz74g4amiks6yfhh45bd38vkvfay8073";
+      name = "filelight-16.08.1.tar.xz";
     };
   };
   gpgmepp = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/gpgmepp-16.08.0.tar.xz";
-      sha256 = "0ydwl5qkvxnmzr3f375giykbhj8mm6kv1hywb6kyzafxcwn9ryqf";
-      name = "gpgmepp-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/gpgmepp-16.08.1.tar.xz";
+      sha256 = "1fqxjfn3mqkar8akpfh0i2lr30bvf99fm2ldsx34x7fq3kh29ys5";
+      name = "gpgmepp-16.08.1.tar.xz";
     };
   };
   granatier = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/granatier-16.08.0.tar.xz";
-      sha256 = "16j2xap43jpj6v6bclf99805rgpfzxcxnb715malcx69krqacfy2";
-      name = "granatier-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/granatier-16.08.1.tar.xz";
+      sha256 = "1k270rqcyf37gl1r4086q4r49ssvawy56d32y1n02ph289m3dgl6";
+      name = "granatier-16.08.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/grantleetheme-16.08.0.tar.xz";
-      sha256 = "152b8brnd4q7zmxg4a3xizm56cqxy67aa7gc0znjcg8ga11szrpx";
-      name = "grantleetheme-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/grantleetheme-16.08.1.tar.xz";
+      sha256 = "10xajrlmkjpz6xl3jg47mdvpf478vvxx3rcwcvd2zxaza9yyakms";
+      name = "grantleetheme-16.08.1.tar.xz";
     };
   };
   gwenview = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/gwenview-16.08.0.tar.xz";
-      sha256 = "0in10ssq543snsdm4dks2z4hspqiwr0hygc2y8mpcg9kvq11j1w1";
-      name = "gwenview-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/gwenview-16.08.1.tar.xz";
+      sha256 = "1i55zd0pbgg2xinqzhxpsqx0vqp3dwn4z7bbf85m5cldbi070yv8";
+      name = "gwenview-16.08.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/incidenceeditor-16.08.0.tar.xz";
-      sha256 = "102chdy0siwnpv9rbxfy7aj1rz4gbwqq6sws7i92paj1k57ln361";
-      name = "incidenceeditor-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/incidenceeditor-16.08.1.tar.xz";
+      sha256 = "0wl89kwbnqrafflrdphczrn3l5gjgl5fqxvz4z995ri9m98kvgin";
+      name = "incidenceeditor-16.08.1.tar.xz";
     };
   };
   jovie = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/jovie-16.08.0.tar.xz";
-      sha256 = "0npcs6pq3w6r6wlg4j6dkl4zk9adm8fi84sh8vw89p9iksa2bgjm";
-      name = "jovie-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/jovie-16.08.1.tar.xz";
+      sha256 = "0nkrcvdsjcpba2awgvk0nv8ni3b5596p2jygxa906w50sjkcf5bk";
+      name = "jovie-16.08.1.tar.xz";
     };
   };
   juk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/juk-16.08.0.tar.xz";
-      sha256 = "051zsjlq4bfiynkwb6gfx221j0fyvbd01dgx4adjgi15arw0l4kh";
-      name = "juk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/juk-16.08.1.tar.xz";
+      sha256 = "1kj5iw3hfgqwz08imcfjicgm5m4v7m1fny6da8jidvwzyn46nll4";
+      name = "juk-16.08.1.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kaccessible-16.08.0.tar.xz";
-      sha256 = "1z9i0ylkph3ws5w8qh0h70ykhyjigmjlmmlrnjvxq36mszi2ph5v";
-      name = "kaccessible-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kaccessible-16.08.1.tar.xz";
+      sha256 = "086spk1aignmb2bry6hbw11nssm99dk38mnk4s89f444ydczs3fs";
+      name = "kaccessible-16.08.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kaccounts-integration-16.08.0.tar.xz";
-      sha256 = "0fs5y06j0psg0y97z54yv6mv1w88zm1dbvrmzwdckap9iyhgdk5w";
-      name = "kaccounts-integration-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kaccounts-integration-16.08.1.tar.xz";
+      sha256 = "0pjj0d8pnnz5zjmkjzb0x157msv0r0hk4h5vdji1jr0bwwhmwaw9";
+      name = "kaccounts-integration-16.08.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kaccounts-providers-16.08.0.tar.xz";
-      sha256 = "1sphbdfiqyjcyxvdpbrsfx8jci2k8w1vh56v6hpnv7dn042dmmim";
-      name = "kaccounts-providers-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kaccounts-providers-16.08.1.tar.xz";
+      sha256 = "1ji88wgvymdh63ykmv12n5gnr0zwmsch56n7wpwn5wvxs34wimqx";
+      name = "kaccounts-providers-16.08.1.tar.xz";
     };
   };
   kajongg = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kajongg-16.08.0.tar.xz";
-      sha256 = "0ydl7pdlp9nrfpxnkznaj6mwdq8w660flf5y3bgvv8jdxnaz7cyn";
-      name = "kajongg-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kajongg-16.08.1.tar.xz";
+      sha256 = "0z8kin497631fa7wls6bi42q32ijqgy674cigcmz9jfgn2hwkbc0";
+      name = "kajongg-16.08.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kalarmcal-16.08.0.tar.xz";
-      sha256 = "0ai9h67w6dwsnw18hkxxwmpar4nf3k0zpv6fd1f1y9mvk2xdr6vw";
-      name = "kalarmcal-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kalarmcal-16.08.1.tar.xz";
+      sha256 = "10r31l6ak6dbksfj5444ndv06qx0jl4si634hv3i77q20jys1j26";
+      name = "kalarmcal-16.08.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kalgebra-16.08.0.tar.xz";
-      sha256 = "0ypwsp8pd72v4h99wcjpjkara3dbzidbjf8xksk7zskyp5c5rqxn";
-      name = "kalgebra-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kalgebra-16.08.1.tar.xz";
+      sha256 = "1wfiqlhhm36p137wcgpbvnhr6idqwkdann99pb1y463jblrdibv6";
+      name = "kalgebra-16.08.1.tar.xz";
     };
   };
   kalzium = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kalzium-16.08.0.tar.xz";
-      sha256 = "0vfylw7nw0f4dfi62ala5v1gkg4zf2g36pdl57afbbq1pc8v1qpf";
-      name = "kalzium-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kalzium-16.08.1.tar.xz";
+      sha256 = "09rz69cqqmicmwm9dj9yzq4l3j4w74ih8wcw0xyky948p3x6dh2r";
+      name = "kalzium-16.08.1.tar.xz";
     };
   };
   kamera = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kamera-16.08.0.tar.xz";
-      sha256 = "0l0nk3q8m6lww7r8gqdkkhl4s7mv7saxjxs7jkypll1q0686pmk7";
-      name = "kamera-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kamera-16.08.1.tar.xz";
+      sha256 = "01fvdbwi10pnhwg9q7w5lyr027mpy67mzdwpcwv4h1js6dsi68nz";
+      name = "kamera-16.08.1.tar.xz";
     };
   };
   kanagram = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kanagram-16.08.0.tar.xz";
-      sha256 = "180hpi4zhmhbmkn9166zpxk9pp3w08pryj33pkq6qcsbsflmnmic";
-      name = "kanagram-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kanagram-16.08.1.tar.xz";
+      sha256 = "0a2rk092sgp1ysaw7h47y6lmw9z269j7llnw5vzq3mblc2ay2sda";
+      name = "kanagram-16.08.1.tar.xz";
     };
   };
   kapman = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kapman-16.08.0.tar.xz";
-      sha256 = "1jhiwvi9hx46h1gwf1qmpi6cvyncybhfjsf0m51329cgx2hdfzl5";
-      name = "kapman-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kapman-16.08.1.tar.xz";
+      sha256 = "0x7b1d6hhl0nwyz8qzcz9nnjv8477ghifzgiyw3g1bx8044wqlsk";
+      name = "kapman-16.08.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kapptemplate-16.08.0.tar.xz";
-      sha256 = "1zdaafrynh083vqr2b587c862qz0220hinmf9dc345gfss244zzf";
-      name = "kapptemplate-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kapptemplate-16.08.1.tar.xz";
+      sha256 = "1zkq5hpi8y4bny0q8p0aa3s4jpd5bxw18m5jxadjm4gfznnw8afv";
+      name = "kapptemplate-16.08.1.tar.xz";
     };
   };
   kate = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kate-16.08.0.tar.xz";
-      sha256 = "0z1fqd73il15y0hpjshhmd0cv6l2s3pm90m9l5k0ggg8vy0l1pqv";
-      name = "kate-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kate-16.08.1.tar.xz";
+      sha256 = "0z1q5lnkqnx40zbxj3bnwg9wrx7xk7xzfwc8i02zzvx50n7qn57n";
+      name = "kate-16.08.1.tar.xz";
     };
   };
   katomic = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/katomic-16.08.0.tar.xz";
-      sha256 = "14g0fiyxmlpwnfw25z3yxdzhixcahxss7rm4k06km37nzxmcca8l";
-      name = "katomic-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/katomic-16.08.1.tar.xz";
+      sha256 = "1ilaz15qg1fasd0yv03vcspxx54cbw2m99wl39zzrh7jc3df0ad8";
+      name = "katomic-16.08.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kblackbox-16.08.0.tar.xz";
-      sha256 = "0pq9rw1inxm5vjv4bcwklgh90wrz3sirf80v75dy2myiriv02y08";
-      name = "kblackbox-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kblackbox-16.08.1.tar.xz";
+      sha256 = "1w7rh9m6qwdid2li7xhmsfs0v7q95gyl24529xm17y79k1qxcbm7";
+      name = "kblackbox-16.08.1.tar.xz";
     };
   };
   kblocks = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kblocks-16.08.0.tar.xz";
-      sha256 = "04si5m0rbshm8h09ln6xqhfnsakrqqm3gi1gyk1agcpa5wr1hfyf";
-      name = "kblocks-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kblocks-16.08.1.tar.xz";
+      sha256 = "086b8k8zhs9v0rp06z9wx8gaaphc2178px5501rqx6062azxflil";
+      name = "kblocks-16.08.1.tar.xz";
     };
   };
   kblog = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kblog-16.08.0.tar.xz";
-      sha256 = "1qrdxad83dzjc5lpvj7dcghzkryp0anrp97sk7dlkmf1j7mj5w7n";
-      name = "kblog-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kblog-16.08.1.tar.xz";
+      sha256 = "1vc2a3c4iz2jm2137zw3i69n6qam2rlhvjr8ybv84xv9s7b3pz25";
+      name = "kblog-16.08.1.tar.xz";
     };
   };
   kbounce = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kbounce-16.08.0.tar.xz";
-      sha256 = "13a2xzkym62rxvk3haxjca1n8vx13r093r5dzsn9fb0gwc47p60x";
-      name = "kbounce-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kbounce-16.08.1.tar.xz";
+      sha256 = "0a4khwdrhzg33i4bbz1kb7w2jyzahnj1agcdybpzbqjnczgv4rnn";
+      name = "kbounce-16.08.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kbreakout-16.08.0.tar.xz";
-      sha256 = "1b1z702ify3av1275160sz740z1yyfv4x5jxrdzwf554sy8nqigg";
-      name = "kbreakout-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kbreakout-16.08.1.tar.xz";
+      sha256 = "14i4yyxxd9w72sgdfwp47y8drbdl7lsb8fxgdswg91dpcnm1jmgi";
+      name = "kbreakout-16.08.1.tar.xz";
     };
   };
   kbruch = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kbruch-16.08.0.tar.xz";
-      sha256 = "15v86pdgpdrkaxa75pj39w7c2x89b1gx3inxvpx51rfcjxdiqsz4";
-      name = "kbruch-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kbruch-16.08.1.tar.xz";
+      sha256 = "02dyc90ir79swf8vjd53flxqp2imaaa9c5dikflbxiahj4k6rpa4";
+      name = "kbruch-16.08.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcachegrind-16.08.0.tar.xz";
-      sha256 = "0bx0viz57d4qabsw0yl3max042wqzcnqkkvyd7yq1mdkjvywl522";
-      name = "kcachegrind-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcachegrind-16.08.1.tar.xz";
+      sha256 = "1d7i162a6v7xhykzpszmia7cizrsgh040wk0ql7ijgb838iawflg";
+      name = "kcachegrind-16.08.1.tar.xz";
     };
   };
   kcalc = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcalc-16.08.0.tar.xz";
-      sha256 = "1pk52k6cid8gppy5m9psfhq20jdcd1z9930yyj2sp9d5ynbk0hxb";
-      name = "kcalc-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcalc-16.08.1.tar.xz";
+      sha256 = "18nhvmgd0d2m0ji23536fhqykf4xdnnky5x0hy6vkja0dw91aggg";
+      name = "kcalc-16.08.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcalcore-16.08.0.tar.xz";
-      sha256 = "124hybji5j7838gxy69w4cafgrkh8wjh40v0iwqkiaq3nwjv3q0n";
-      name = "kcalcore-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcalcore-16.08.1.tar.xz";
+      sha256 = "12q30gsaw2fr7wx6jpswa7aby8d58wldxagbcdkwcifv78d7bgk7";
+      name = "kcalcore-16.08.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcalutils-16.08.0.tar.xz";
-      sha256 = "02dvdxnxl51qml8wmpvay7apq7zww7nf7nqwmli10m79ppdw1jmw";
-      name = "kcalutils-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcalutils-16.08.1.tar.xz";
+      sha256 = "0fvhy2r5mw871ld18rab4nx9cv52fg7vwkxj31gbvx6rbzbmzsrs";
+      name = "kcalutils-16.08.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcharselect-16.08.0.tar.xz";
-      sha256 = "11vyhlx33jjlwp1vri4l1vpzcgi07f86cqcfd84hnyr48v9dnya1";
-      name = "kcharselect-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcharselect-16.08.1.tar.xz";
+      sha256 = "1mx2biawax867rfq42w0mi4b7v10j17anfq64gx5q6vi79k6jqaj";
+      name = "kcharselect-16.08.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcolorchooser-16.08.0.tar.xz";
-      sha256 = "0j9s2f2x0vzkl24ajhm8ff1mx6r05j07sjx8v507pbfmxj2h64iz";
-      name = "kcolorchooser-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcolorchooser-16.08.1.tar.xz";
+      sha256 = "1s490hkjbinhlc3pf2waks9ka8dvkpq3l5vblmd11h1yckbpcdqi";
+      name = "kcolorchooser-16.08.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcontacts-16.08.0.tar.xz";
-      sha256 = "063qip4jrcv8qzz1gvq49wjzjsrp8ladaspagqd4jbq65qvnpz96";
-      name = "kcontacts-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcontacts-16.08.1.tar.xz";
+      sha256 = "198qqs7001m2ywmryx9489jpay1g7i9g04bl9y25jr2a3lf4id87";
+      name = "kcontacts-16.08.1.tar.xz";
     };
   };
   kcron = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kcron-16.08.0.tar.xz";
-      sha256 = "17bhhvni66wx4ihqzqcn9mglidw7r1lak08jgdbnadxj1nalph8l";
-      name = "kcron-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kcron-16.08.1.tar.xz";
+      sha256 = "062ndya5r67imkx0fw2whgppfm9j3jwxscfz8vd64g3532kai9n5";
+      name = "kcron-16.08.1.tar.xz";
     };
   };
   kde-baseapps = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-baseapps-16.08.0.tar.xz";
-      sha256 = "0sajfiwij3znmgmayj1d1q4xmzr0j0a4nb6181j3a360vg5zd42f";
-      name = "kde-baseapps-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-baseapps-16.08.1.tar.xz";
+      sha256 = "0s9391mx2wh1yvi5ykp5nj3zfr5qvkqpwljjgvhfr2i1a4h24551";
+      name = "kde-baseapps-16.08.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdebugsettings-16.08.0.tar.xz";
-      sha256 = "08w6b514vrg7100d10m6iwqpgh6ap06dh1b79xax0rqlpcpl40yn";
-      name = "kdebugsettings-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdebugsettings-16.08.1.tar.xz";
+      sha256 = "0b3940wzm3bl0w0wdjk62ikf6cxlzipckwzq7skpnp115j90pnyp";
+      name = "kdebugsettings-16.08.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-dev-scripts-16.08.0.tar.xz";
-      sha256 = "197w58zhbm6cs54wa4rxf5hmw9gjyvwpabdlfvn1dzr53fx0wlh1";
-      name = "kde-dev-scripts-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-dev-scripts-16.08.1.tar.xz";
+      sha256 = "1biw748yyiy2xwb4jyx1g4h6v9m0q3qwxh6kc4l7fb9qsjam0222";
+      name = "kde-dev-scripts-16.08.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-dev-utils-16.08.0.tar.xz";
-      sha256 = "1a1cxr95sgfpzjcdq0b0jny8lwx734xn3nm9axakq614mq1mqhcw";
-      name = "kde-dev-utils-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-dev-utils-16.08.1.tar.xz";
+      sha256 = "00dgfclyl95nv5s77w56h472hb02v91fhdx0qkk0vikj2n1z7l9n";
+      name = "kde-dev-utils-16.08.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdeedu-data-16.08.0.tar.xz";
-      sha256 = "09c9v0h5bys1nx6ll18s91lwghhri1aqnhs86igp81a5k3rgvjf3";
-      name = "kdeedu-data-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdeedu-data-16.08.1.tar.xz";
+      sha256 = "0qh6ain1qi7l5455j3ir6fq7rs735j2q2czxl2ys8qji5j1yidwa";
+      name = "kdeedu-data-16.08.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-mobipocket-16.08.0.tar.xz";
-      sha256 = "183dxwfx4d17wzy81jjjh2v1lhi7hi7glwgd5dh208v30h36h1fv";
-      name = "kdegraphics-mobipocket-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-mobipocket-16.08.1.tar.xz";
+      sha256 = "1lzwlvcf6wp1g2n46811cq2m3h212w161z6kasdg7wf7rcghbmvd";
+      name = "kdegraphics-mobipocket-16.08.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-thumbnailers-16.08.0.tar.xz";
-      sha256 = "1i0cfnsh74bic5z4hvrakss55ci3xlfslcmwklp20804ngfkq6h8";
-      name = "kdegraphics-thumbnailers-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-thumbnailers-16.08.1.tar.xz";
+      sha256 = "068cvcnaf8kyls49143w8lwg24hk58byiv23qh2xxv180ps12hkm";
+      name = "kdegraphics-thumbnailers-16.08.1.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ar-16.08.0.tar.xz";
-      sha256 = "0dkxjb7af1xb3q1c2d4hpl8vn9391fbacfbnahxyil3zqxp0z5i7";
-      name = "kde-l10n-ar-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ar-16.08.1.tar.xz";
+      sha256 = "0v1h0qciqr4kanb0mb6hjma35spjhp51vx0r7kb3girmv4ik2mii";
+      name = "kde-l10n-ar-16.08.1.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ast-16.08.0.tar.xz";
-      sha256 = "0x7pjg1x5yw76145biwfyrw8b0nx06xbzc57rqvy8k773qr5zilj";
-      name = "kde-l10n-ast-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ast-16.08.1.tar.xz";
+      sha256 = "1srk025iqvrwjcks9hcjlzxqmlmfmzn3xlgi1c60nncb046q7xa6";
+      name = "kde-l10n-ast-16.08.1.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bg-16.08.0.tar.xz";
-      sha256 = "1617b7a1rr43jhj8jdqyircm72jvqcrqqkzl3s8hwi6daprpqik9";
-      name = "kde-l10n-bg-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bg-16.08.1.tar.xz";
+      sha256 = "014s77imwl3awy3fd4yzdv0k61j1h0rlvnlfk7mzkyyjgxhh9wqg";
+      name = "kde-l10n-bg-16.08.1.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bs-16.08.0.tar.xz";
-      sha256 = "1vmk5mmrs0d1123cx5y003lkim1kxc9d8x3flsxkpyb1c155nvpw";
-      name = "kde-l10n-bs-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bs-16.08.1.tar.xz";
+      sha256 = "0ijsbkllls8966hrh19p2062fmnjan0hibl6650ihgypsci15y57";
+      name = "kde-l10n-bs-16.08.1.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca-16.08.0.tar.xz";
-      sha256 = "18m2g0iagiaqfbg1lr1i3z9nm4qva0ipl1rh22p2slqivqcrvg51";
-      name = "kde-l10n-ca-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca-16.08.1.tar.xz";
+      sha256 = "12kn3skciqmsqwqdpx7n4286cz1w7rdgx4mggvk05db0bhrybjzg";
+      name = "kde-l10n-ca-16.08.1.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.08.0";
+    version = "ca_valencia-16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca@valencia-16.08.0.tar.xz";
-      sha256 = "1h68h6dzkkhpl5rsdw6ykg9prs9l1xbwwm7mqxxljxsd8bmpdv4g";
-      name = "kde-l10n-ca_valencia-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca@valencia-16.08.1.tar.xz";
+      sha256 = "0dfjx9pfzwilz746lrdgpx51cig8wr9igbm7pdidpaz5wryqfsif";
+      name = "kde-l10n-ca_valencia-16.08.1.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-cs-16.08.0.tar.xz";
-      sha256 = "0wg84mxj4sbwi3ck4vdva0fbs7gsyr2xjzk6bd49a70ls9icp39x";
-      name = "kde-l10n-cs-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-cs-16.08.1.tar.xz";
+      sha256 = "1b14wgczd6qfkgy1rfj2dmw0l0vc3jkf1yf0ih5y0s3zqx081k34";
+      name = "kde-l10n-cs-16.08.1.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-da-16.08.0.tar.xz";
-      sha256 = "0jkkqw69bv3r6avcywsxbqy99lbcyfbn3r9ipqcmka3hpss8cf18";
-      name = "kde-l10n-da-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-da-16.08.1.tar.xz";
+      sha256 = "1hdppgawypnya6sk60bz62cc7dnhh5m1dcq68hx67a9wrf6hw21i";
+      name = "kde-l10n-da-16.08.1.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-de-16.08.0.tar.xz";
-      sha256 = "0g6cglysjzzbc67wv29zqikvgzmq928a3arwd50hjvg85dh50w4f";
-      name = "kde-l10n-de-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-de-16.08.1.tar.xz";
+      sha256 = "0r0kkrmk4gzn9nhly9c908ajciy9k9rxy8wrqampj4gynxsrc07w";
+      name = "kde-l10n-de-16.08.1.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-el-16.08.0.tar.xz";
-      sha256 = "037wiqbw172rkqlq5709arwkdi8qmhrrqc00rhy612x7m075n2ln";
-      name = "kde-l10n-el-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-el-16.08.1.tar.xz";
+      sha256 = "1d6ipj1hyjzwlcparbi533iqgvbx9lhdmqnzdhjxnim1hia25wan";
+      name = "kde-l10n-el-16.08.1.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.08.0";
+    version = "en_GB-16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-en_GB-16.08.0.tar.xz";
-      sha256 = "0nbkijpaxsi365c6q44wq0wbv0bqgpyhrb1d2a3v7lhcb9jv6ci9";
-      name = "kde-l10n-en_GB-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-en_GB-16.08.1.tar.xz";
+      sha256 = "102qlxmcynqf30x25ygmh7x6x0d12fbr4dri1nj8rkd8bmi214di";
+      name = "kde-l10n-en_GB-16.08.1.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eo-16.08.0.tar.xz";
-      sha256 = "1qsl7r9da29hxqs7y0i17zyzvpfxi9h2srdq345ppyxdk3avbvp7";
-      name = "kde-l10n-eo-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eo-16.08.1.tar.xz";
+      sha256 = "131y6259yi3kwzn17a11nx5xmxc1llg105g2x0sfayc7k4i5y24z";
+      name = "kde-l10n-eo-16.08.1.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-es-16.08.0.tar.xz";
-      sha256 = "1hm2rvsbrxmci1939iicms5qb1fbm0f1b27zlhgzmf6j3pmg25b3";
-      name = "kde-l10n-es-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-es-16.08.1.tar.xz";
+      sha256 = "1qzwfi21cfs5j88hxmkbbrp8isrxv6b6c3ld2s41lj6a67sdw21k";
+      name = "kde-l10n-es-16.08.1.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-et-16.08.0.tar.xz";
-      sha256 = "0ng6qg7sw3dypn7yg7m8803cpqm39x0b9jn2q0f3jmx46ys9kyyi";
-      name = "kde-l10n-et-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-et-16.08.1.tar.xz";
+      sha256 = "1dci7x9w8dzmzwj5f6c4i9x6v5g68ll9dwfvwf060vy2pnnnlw7g";
+      name = "kde-l10n-et-16.08.1.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eu-16.08.0.tar.xz";
-      sha256 = "0dmiipd0l1dza14fyd17g7qwih4n1fzg2fjkx9vhwdzl5anxmb13";
-      name = "kde-l10n-eu-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eu-16.08.1.tar.xz";
+      sha256 = "1n21mhqlr3wj6gd9kbfvfck5f1ql1ywanbp084afxqcbx82pb7j3";
+      name = "kde-l10n-eu-16.08.1.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fa-16.08.0.tar.xz";
-      sha256 = "129i0fhdxab5k8vjiml0ylyja5hz6dmr3x8qarf0mfspwhi7pkna";
-      name = "kde-l10n-fa-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fa-16.08.1.tar.xz";
+      sha256 = "15ay6hqgpdv80fa3gjksfmjiczr4zwpwh4mj1zdrdm241kdhp1jp";
+      name = "kde-l10n-fa-16.08.1.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fi-16.08.0.tar.xz";
-      sha256 = "1rjzsagskszi14lv1ak6ailfxxiqqq2ry26dz53agq8qd4md19y3";
-      name = "kde-l10n-fi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fi-16.08.1.tar.xz";
+      sha256 = "130hpabvd2rjd0x11k9yxjl94aslaz90bhf3mfm5bnjjlm8iqwz5";
+      name = "kde-l10n-fi-16.08.1.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fr-16.08.0.tar.xz";
-      sha256 = "09brqj4xx8apsldxjpx797ggmwv3flm7cbxh39kc3q8c7dpzr4a5";
-      name = "kde-l10n-fr-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fr-16.08.1.tar.xz";
+      sha256 = "0mkbbba9jldks003cmcdbfiqw7g6nr4majz8skb7srq8ma7sf9x4";
+      name = "kde-l10n-fr-16.08.1.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ga-16.08.0.tar.xz";
-      sha256 = "1ig3hvy58p7d3j4h6r1nz8yj65mfpamxajmrg3aid56i8rc81ibk";
-      name = "kde-l10n-ga-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ga-16.08.1.tar.xz";
+      sha256 = "0hmj03ajgijjg3lmrsypff2nxzf61vmvf0qwrxiy3q40vvgj5mbr";
+      name = "kde-l10n-ga-16.08.1.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-gl-16.08.0.tar.xz";
-      sha256 = "09hrpgxcp2s20d1ia6plkglkhhj8mzfh8d01y0jfc8b1h5br282w";
-      name = "kde-l10n-gl-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-gl-16.08.1.tar.xz";
+      sha256 = "0n0nim3pkhql2lx9kqplcs6v225c2cirhazsb6ldblkhxbk0hgfb";
+      name = "kde-l10n-gl-16.08.1.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-he-16.08.0.tar.xz";
-      sha256 = "09zf3a0gbs5h5r3mrpc9gkd4l2j9nw1k7vdwahxjpsdhvs1bwx3h";
-      name = "kde-l10n-he-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-he-16.08.1.tar.xz";
+      sha256 = "0x4rn81ijx2b0z4s2b67d69gnnx0ldl43c311jf0dn9cyadjws07";
+      name = "kde-l10n-he-16.08.1.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hi-16.08.0.tar.xz";
-      sha256 = "1xvvkl5pr3w0s1pizarg0mmkvckxss944a188avqfsqrav642458";
-      name = "kde-l10n-hi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hi-16.08.1.tar.xz";
+      sha256 = "1if5h20ywpkh85fx95i0mrv993gfj1rm3yp9jzz8x250b6ggbfd5";
+      name = "kde-l10n-hi-16.08.1.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hr-16.08.0.tar.xz";
-      sha256 = "0cyz0ysz9xr93dlq2n758nw2kyi2f8b7h3gr4im7syj05nk0fhb6";
-      name = "kde-l10n-hr-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hr-16.08.1.tar.xz";
+      sha256 = "0fg27qkj23b49hvbksqsiv3jj571b4i9msk82ygzvxl2ay5him52";
+      name = "kde-l10n-hr-16.08.1.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hu-16.08.0.tar.xz";
-      sha256 = "0imcb7zd7rzf2nc8darlj4i843gha3ihbi0lvh6pnnmcxvc2dzdh";
-      name = "kde-l10n-hu-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hu-16.08.1.tar.xz";
+      sha256 = "1nw0922gk4f89r06fkgqvs092dbi4kjbfxvj86gq98v1ms0pns69";
+      name = "kde-l10n-hu-16.08.1.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ia-16.08.0.tar.xz";
-      sha256 = "1x14165y0qvpjn3mkg03l4p0mij9a6haxkrbkkqvv1waapifyxsl";
-      name = "kde-l10n-ia-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ia-16.08.1.tar.xz";
+      sha256 = "0plsffy1khy9cacqhabr1j2g0xi3v21qgydj6phb6d5j82p1c79i";
+      name = "kde-l10n-ia-16.08.1.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-id-16.08.0.tar.xz";
-      sha256 = "1mf3viq3yligqg8vqca31ybs9s59nxmylvwqmg8ndy9ni4mni2wx";
-      name = "kde-l10n-id-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-id-16.08.1.tar.xz";
+      sha256 = "0ihir3axvkczkik2nnfh4mmqkx2gpmvzri48i34p5dz21n8ca4ha";
+      name = "kde-l10n-id-16.08.1.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-is-16.08.0.tar.xz";
-      sha256 = "07xdlvk3nqc9wsrnd1a0hm6igwc0hnryffs99jvd0dlbq0hzakl3";
-      name = "kde-l10n-is-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-is-16.08.1.tar.xz";
+      sha256 = "0qrayzxpx1phk2m6kcq5b6i05swds1fis4651r5xk69dc2zqlbjn";
+      name = "kde-l10n-is-16.08.1.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-it-16.08.0.tar.xz";
-      sha256 = "05xir0spl5fbyynwjkf13zzqgwl1mzi97bfjfi1x8jhiq0jqhafn";
-      name = "kde-l10n-it-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-it-16.08.1.tar.xz";
+      sha256 = "1qhv4rywr9qlszlx8a7crqshr5zmxxgscq8s1c735jcm57bk8wzl";
+      name = "kde-l10n-it-16.08.1.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ja-16.08.0.tar.xz";
-      sha256 = "1gdngf075021750rxfbrcbbh8wb1nknzclgghsj8j94qb96ij87m";
-      name = "kde-l10n-ja-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ja-16.08.1.tar.xz";
+      sha256 = "1zwb8r1vanrl4q0mhqgd4qj8smyygqgka4b4zjqr6h2klklwsxsg";
+      name = "kde-l10n-ja-16.08.1.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-kk-16.08.0.tar.xz";
-      sha256 = "0y5qdnkdhc7lnd3casxil757mmklsysm8kvs9i09j4b5ldmkin0r";
-      name = "kde-l10n-kk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-kk-16.08.1.tar.xz";
+      sha256 = "1zdhfhjxpr73f34nh24y6ddgp3zkqim4dy8mblk84w8wsg80i6gj";
+      name = "kde-l10n-kk-16.08.1.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-km-16.08.0.tar.xz";
-      sha256 = "0a27rhjf40q5003jy3aancaf9qnygmfqk4g7jic1x1d64n3khz9c";
-      name = "kde-l10n-km-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-km-16.08.1.tar.xz";
+      sha256 = "1qx2cm9cv7b33pkzpfgcqppr6q4qqzf9v152wjfdk096jq6yfijv";
+      name = "kde-l10n-km-16.08.1.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ko-16.08.0.tar.xz";
-      sha256 = "0g8plf0z329xyiwi4aia96i3psypqsx9wfhnb26kwwgl6vjd4nin";
-      name = "kde-l10n-ko-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ko-16.08.1.tar.xz";
+      sha256 = "18za5mpnx8xfkpmpjp2i04kl6a2chjgz8g7vhymi01m1dhf7ql5f";
+      name = "kde-l10n-ko-16.08.1.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lt-16.08.0.tar.xz";
-      sha256 = "0c5akrzfmjkrf4z8p5yfy9f3q8p6bf3l97aajcj2jzqxmxqrkgxz";
-      name = "kde-l10n-lt-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lt-16.08.1.tar.xz";
+      sha256 = "147z5af6qn7c6qrxxzmcc9qkagc4y6nffqal3fsrs84pjrsav72j";
+      name = "kde-l10n-lt-16.08.1.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lv-16.08.0.tar.xz";
-      sha256 = "1l0yfc4999sjl01m07rmzw2h9cd0pw2d9j4wa7fjs2pf89z5z2y6";
-      name = "kde-l10n-lv-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lv-16.08.1.tar.xz";
+      sha256 = "19pf8khdszfnlfybrsdwm0gbnphr43109b81fa6bsxcc57knagwg";
+      name = "kde-l10n-lv-16.08.1.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-mr-16.08.0.tar.xz";
-      sha256 = "0jnrycqxszxq7mw7kwyhprb7pmrqz5v9kkhqf2bm4k9mf5553a0w";
-      name = "kde-l10n-mr-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-mr-16.08.1.tar.xz";
+      sha256 = "0vwa1mz9igx592bq89fnq7350ln4g5cvdmm1hnay94c5qxc12s0z";
+      name = "kde-l10n-mr-16.08.1.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nb-16.08.0.tar.xz";
-      sha256 = "1ga30ki4yaa4ajbrjp0fz75r67cvrc801skx31x6d1cw6xjyi72l";
-      name = "kde-l10n-nb-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nb-16.08.1.tar.xz";
+      sha256 = "1dz3a5bwsmbckdmh2v2crnal7183sqav6y5z01xdq0wyjjy8kizc";
+      name = "kde-l10n-nb-16.08.1.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nds-16.08.0.tar.xz";
-      sha256 = "1ibv7rq1ap5zmal4bf8a8z285mf6g55bcmli67gvhwfvy13vkg9s";
-      name = "kde-l10n-nds-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nds-16.08.1.tar.xz";
+      sha256 = "1gjvwg6gmxbvk7q26f7i50ivfmh4s2djl7m9dsaj6rk53cknhd8s";
+      name = "kde-l10n-nds-16.08.1.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nl-16.08.0.tar.xz";
-      sha256 = "0pysm6sjdls14d8cqmywnljwk2k94q9z7rdm7m3p75p4q778drda";
-      name = "kde-l10n-nl-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nl-16.08.1.tar.xz";
+      sha256 = "1r3mwnkkr8k3zb87j6lr4lrgq02rccqpp5m273z1c5n0kqcbp50h";
+      name = "kde-l10n-nl-16.08.1.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nn-16.08.0.tar.xz";
-      sha256 = "1v3q9jr6ginh24ph99qyb57phm86zwph3xv6zbymg61vghv398q2";
-      name = "kde-l10n-nn-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nn-16.08.1.tar.xz";
+      sha256 = "0r38zvmh05mcfh7grayb771mrdl2637xnx75nx7lnvkvmlf6dngh";
+      name = "kde-l10n-nn-16.08.1.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pa-16.08.0.tar.xz";
-      sha256 = "10c1c6hql80x714msa45cpbgl4nagaf9mydfb160lsvaa1whzzbd";
-      name = "kde-l10n-pa-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pa-16.08.1.tar.xz";
+      sha256 = "04828d9wsd51g3a45nzddxhxdwwk447qlkswxjzayiy7w6pjspch";
+      name = "kde-l10n-pa-16.08.1.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pl-16.08.0.tar.xz";
-      sha256 = "1xz33a9af2ccl249ymaqawz1ymrxa5zwhg2gayxk5jmv2fsvhikp";
-      name = "kde-l10n-pl-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pl-16.08.1.tar.xz";
+      sha256 = "068ab65ivm4qw3hmhv97v8ck2qg7z8aglfwq0lqrlb5famg158di";
+      name = "kde-l10n-pl-16.08.1.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt-16.08.0.tar.xz";
-      sha256 = "1wp0i6mlk4nhd7v502kc4gh7zymgiakqlx3jjpjaqsv31igya406";
-      name = "kde-l10n-pt-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt-16.08.1.tar.xz";
+      sha256 = "1ix32ry9zzgdwmpqfvzsfdz357l56nwqd42rnszgjzs4sdikl3y8";
+      name = "kde-l10n-pt-16.08.1.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.08.0";
+    version = "pt_BR-16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt_BR-16.08.0.tar.xz";
-      sha256 = "0nv8k2fn8jdv80vcwiri5w937qcp2gj8bjmi3hcc9qirdqh8wjap";
-      name = "kde-l10n-pt_BR-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt_BR-16.08.1.tar.xz";
+      sha256 = "0id10qm9gzg2c9as2np8a0sfnx9acsnf06igvwxnyazar8k831hs";
+      name = "kde-l10n-pt_BR-16.08.1.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ro-16.08.0.tar.xz";
-      sha256 = "0bqw4zb5hz1wccgicyfd8d8zzhq69jf16f3qr6c6ry345hkx1ywm";
-      name = "kde-l10n-ro-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ro-16.08.1.tar.xz";
+      sha256 = "1j6vdc62xw4pbn0lz0zmwylc43m9kxn78zx0qn5gc51i2n3sb8bm";
+      name = "kde-l10n-ro-16.08.1.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ru-16.08.0.tar.xz";
-      sha256 = "1pi549z9wzjsaixn246wq9bqkgy2azhwccwhyy5d0d442d23xwqv";
-      name = "kde-l10n-ru-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ru-16.08.1.tar.xz";
+      sha256 = "1bqrjgh89yskqx5hpd08z949nplp7f53is1vm9slrvn94hcslc46";
+      name = "kde-l10n-ru-16.08.1.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sk-16.08.0.tar.xz";
-      sha256 = "09lyhmiishxiihnpv9lli329zl4v05q3578ib5nrzrkrlky512m9";
-      name = "kde-l10n-sk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sk-16.08.1.tar.xz";
+      sha256 = "18w6zbix3iwrgyswlr8390yb3q4fli1krana7pimfhll29wg9s2v";
+      name = "kde-l10n-sk-16.08.1.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sl-16.08.0.tar.xz";
-      sha256 = "1maz22c0mp8bgj1rcg0ms2cncx0gg82diwpb930shjmivr8zhmrd";
-      name = "kde-l10n-sl-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sl-16.08.1.tar.xz";
+      sha256 = "1q9gjl8cz02nwy90w31apr8rv5bhp8xanmc6ckijfl7xz5a5r7ig";
+      name = "kde-l10n-sl-16.08.1.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sr-16.08.0.tar.xz";
-      sha256 = "190ww2065537lny8jnm81lqcxpfllhf45snj93zl41pcva4zw4jg";
-      name = "kde-l10n-sr-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sr-16.08.1.tar.xz";
+      sha256 = "019m72c4l486rwq6cm309jsaasz96grv2bb8wrgxy2r69y2qnzqj";
+      name = "kde-l10n-sr-16.08.1.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sv-16.08.0.tar.xz";
-      sha256 = "0bl1qz3zqrq8vjbnacvdym9yzycpjhgy62r2577h2ybds31fj81n";
-      name = "kde-l10n-sv-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sv-16.08.1.tar.xz";
+      sha256 = "0ml489l1jv07x1d157gacsgnyx95j4fapd0r6q4d2r5mdm77w36b";
+      name = "kde-l10n-sv-16.08.1.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-tr-16.08.0.tar.xz";
-      sha256 = "1gbm055f4cbcl1h9k2r6fnjnnjj5wss8zyyc16id57ydzvnkdbi1";
-      name = "kde-l10n-tr-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-tr-16.08.1.tar.xz";
+      sha256 = "008fjcf7p2pk1g4mzsc98vqlaaagf1bkmha323rgqrz07jzjax63";
+      name = "kde-l10n-tr-16.08.1.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ug-16.08.0.tar.xz";
-      sha256 = "1hqdh0v83yvn4hnl51hsabkcbn5rhw0xcwn4nzqm6q2ib68rzhal";
-      name = "kde-l10n-ug-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ug-16.08.1.tar.xz";
+      sha256 = "1d38j4cyzzxv35i39rmhrlyc097n56gghvwcl16nj55qbm41nb22";
+      name = "kde-l10n-ug-16.08.1.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-uk-16.08.0.tar.xz";
-      sha256 = "00ijcfs6688d822iwg85msk8hxl7qhq5lx3bkw1xwdnmqf0nlxqj";
-      name = "kde-l10n-uk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-uk-16.08.1.tar.xz";
+      sha256 = "1684139ic7vsr68jfk91kmlvw5bjxm2p2p2zkim0md8gmjw279bd";
+      name = "kde-l10n-uk-16.08.1.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-wa-16.08.0.tar.xz";
-      sha256 = "0g9jjpn6fzkdvy16mw1yhahrv5y2ybjwi091c01sh9c9rwfj5qpg";
-      name = "kde-l10n-wa-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-wa-16.08.1.tar.xz";
+      sha256 = "07nalfxn0gw8ygi5cjq5xzyszk4pa4bb2lyll5nfh0h971kiwrk0";
+      name = "kde-l10n-wa-16.08.1.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.08.0";
+    version = "zh_CN-16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_CN-16.08.0.tar.xz";
-      sha256 = "0997azdrq2i4rfijchr3jz9b6why4hm79cddn1c7wdk3943xz094";
-      name = "kde-l10n-zh_CN-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_CN-16.08.1.tar.xz";
+      sha256 = "120f7a4qwxjh0l6n0pcckwi0y5lzy99l7p40i032yd4awjm0jdx6";
+      name = "kde-l10n-zh_CN-16.08.1.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.08.0";
+    version = "zh_TW-16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_TW-16.08.0.tar.xz";
-      sha256 = "04d1awymijlkp2q15vjzs7j6aznpsb4kivc6jx24ly7cp3vn66zm";
-      name = "kde-l10n-zh_TW-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_TW-16.08.1.tar.xz";
+      sha256 = "00z9rld3a76lw3gb621zqclfkdww46fvd86sdws3r6d71zv659h0";
+      name = "kde-l10n-zh_TW-16.08.1.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.23";
+    version = "4.14.24";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdelibs-4.14.23.tar.xz";
-      sha256 = "1k8zn5fmdjrb1v45czz80bvnyp1cbajgsbp2qb988m3k5p7nxzis";
-      name = "kdelibs-4.14.23.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz";
+      sha256 = "1vs60cwwva59fifhg392c60wwp49bvwmm7m6xlai24wzfgl67rj5";
+      name = "kdelibs-4.14.24.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdenetwork-filesharing-16.08.0.tar.xz";
-      sha256 = "075vimzf0arlkcsnvaq75zipz4w02nx9gcy6vcbwb914ljf05cc1";
-      name = "kdenetwork-filesharing-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdenetwork-filesharing-16.08.1.tar.xz";
+      sha256 = "0gkyi2s4hiq3i17cizh0c6dzvc7b19d8bcan22jxb6jx6drm8yq3";
+      name = "kdenetwork-filesharing-16.08.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdenlive-16.08.0.tar.xz";
-      sha256 = "1qmhqbawxzl3plh6aa9kqcviwm6c4sqa9qi4npn64mjvwap1b9qd";
-      name = "kdenlive-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdenlive-16.08.1.tar.xz";
+      sha256 = "0aza2y5xybgj8qnfsc4vbpvmvdvscdmv1bqc67nks72z7c48cpfl";
+      name = "kdenlive-16.08.1.tar.xz";
     };
   };
   kdepim = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdepim-16.08.0.tar.xz";
-      sha256 = "0jcndq5j0j5vyp9k25gbnd18yyfigg0vdrqrsl2m6ybsgwyf3l02";
-      name = "kdepim-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdepim-16.08.1.tar.xz";
+      sha256 = "0ibbc9whg6wy0ipfza5jjwf5y6lz5cbd30nxj93p3adfd4bl55by";
+      name = "kdepim-16.08.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdepim-addons-16.08.0.tar.xz";
-      sha256 = "0r5v8q6pila5diqgfny3ky8c94p8rrf1qg5zwa433xpdmz8ip2jg";
-      name = "kdepim-addons-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdepim-addons-16.08.1.tar.xz";
+      sha256 = "0mbr9m9h79wvklzh6lh5mmq47b69xi2dy589hham3xy69s067g0n";
+      name = "kdepim-addons-16.08.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdepim-apps-libs-16.08.0.tar.xz";
-      sha256 = "1l8y0a52snxzbp245w9m55b3qx9v7wcdh2b046hx0isw8i65jial";
-      name = "kdepim-apps-libs-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdepim-apps-libs-16.08.1.tar.xz";
+      sha256 = "0nwsdham4gf97d0d1wn1v440grbny8rj0gj29z10ia2v3zkx6cgd";
+      name = "kdepim-apps-libs-16.08.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdepim-runtime-16.08.0.tar.xz";
-      sha256 = "19hc43xiw1g268nkrbg370qmnnmmmnxzgscx88fxb2pnlvqkz0fb";
-      name = "kdepim-runtime-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdepim-runtime-16.08.1.tar.xz";
+      sha256 = "097jxiwv9vg3scc95j563v3y28iv4a6rkq0w2w1d5f499d6bc7wf";
+      name = "kdepim-runtime-16.08.1.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kde-runtime-16.08.0.tar.xz";
-      sha256 = "0k8snjk12abp9bpyc3q6rs46s972czb7jdsphjld8k448hz102kk";
-      name = "kde-runtime-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kde-runtime-16.08.1.tar.xz";
+      sha256 = "0szmm32m3gifdpvib4ik5cwcm0ixz5npfzs0gkasq6k9mnf68z65";
+      name = "kde-runtime-16.08.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdesdk-kioslaves-16.08.0.tar.xz";
-      sha256 = "04ci03wyhh7wxvjl0a4rdav2rc1xgz16ylcbswr0aphbacprqckj";
-      name = "kdesdk-kioslaves-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdesdk-kioslaves-16.08.1.tar.xz";
+      sha256 = "09g4ax7ah52ihdmp9xrymarq945kymkh65qqqd1rgf0zjaj2af7p";
+      name = "kdesdk-kioslaves-16.08.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdesdk-thumbnailers-16.08.0.tar.xz";
-      sha256 = "1a6iiwamzycc25nn8phip17yajyzpn57smsg9rghl8wq057mcllg";
-      name = "kdesdk-thumbnailers-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdesdk-thumbnailers-16.08.1.tar.xz";
+      sha256 = "0ygkndgfihb8jissn5jq35vd2j73z5i2rdj2jbgik7hrm2rzjzfs";
+      name = "kdesdk-thumbnailers-16.08.1.tar.xz";
     };
   };
   kdewebdev = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdewebdev-16.08.0.tar.xz";
-      sha256 = "0x7fp4d2s1zi3kawzjzqlhla0bv0ai66k5bldpg58bpbs56h9f1n";
-      name = "kdewebdev-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdewebdev-16.08.1.tar.xz";
+      sha256 = "1xi72wfj57z06s2d7ijjc2vpi14nqdavcp2gmczp08lf4n7lkfjr";
+      name = "kdewebdev-16.08.1.tar.xz";
     };
   };
   kdf = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdf-16.08.0.tar.xz";
-      sha256 = "1cj4wkndbl0ywfy6sj6bsar0v5bc0cxh9d8qd7x0m15qnsx43j44";
-      name = "kdf-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdf-16.08.1.tar.xz";
+      sha256 = "02azfa3j9m95m6ch1h4b5r2cwbyq987rxzyxsldsbna3x80kqpsv";
+      name = "kdf-16.08.1.tar.xz";
     };
   };
   kdgantt2 = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdgantt2-16.08.0.tar.xz";
-      sha256 = "1kbzx5gxyph5cr1m6g6kw3f988p3aq121k6a3hb2ddjgg8yqaxmi";
-      name = "kdgantt2-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdgantt2-16.08.1.tar.xz";
+      sha256 = "1qz44461wk2h2bi5xpyrh5s201azqigph3vclp92phy55s12q83s";
+      name = "kdgantt2-16.08.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kdiamond-16.08.0.tar.xz";
-      sha256 = "0fpjgkfdzw8kgag3b9rrxyahl6kcmfvlrzw2jci8sz40vd69qw53";
-      name = "kdiamond-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kdiamond-16.08.1.tar.xz";
+      sha256 = "0w2kxndpjq2s35qz05vsbr1qnd30lnxhmkyxmy5r7qcqkfdjfwbb";
+      name = "kdiamond-16.08.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kfloppy-16.08.0.tar.xz";
-      sha256 = "06nmaimw6lch5cdkmvb4x7dpb3d7zcsr7wzvhhh9bbygc3rmhi17";
-      name = "kfloppy-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kfloppy-16.08.1.tar.xz";
+      sha256 = "133ib3kicmaxryc4623fmayk12gp4nnymi3g3d97kyk0nmrx1vg7";
+      name = "kfloppy-16.08.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kfourinline-16.08.0.tar.xz";
-      sha256 = "0zjq3x6ghfa5ckjba4bfwiacwy3yvby3a951bfw5rh813mgn7zsj";
-      name = "kfourinline-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kfourinline-16.08.1.tar.xz";
+      sha256 = "0114ldvw1826v75az3wdppd4qdnhswiixm03801rsp680fg9fm9s";
+      name = "kfourinline-16.08.1.tar.xz";
     };
   };
   kgeography = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kgeography-16.08.0.tar.xz";
-      sha256 = "1cgghdxgqxxjhfmsqwnyrw7lzzshnbmi9frnc9gk4hc3w767nyqs";
-      name = "kgeography-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kgeography-16.08.1.tar.xz";
+      sha256 = "0psxpq1ap8cm3adf5j6hr0z858wx41aag95n8mx7vgyfjgaj81s4";
+      name = "kgeography-16.08.1.tar.xz";
     };
   };
   kget = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kget-16.08.0.tar.xz";
-      sha256 = "1ygm6l8xxdyi7dzii4hfp0mpwjhyizmrzmhkcmv708z7api19ms8";
-      name = "kget-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kget-16.08.1.tar.xz";
+      sha256 = "0brihzmn7fz43mi1mf8flkbbk80pv2sg3ny1il4cdkk6nwryk3dn";
+      name = "kget-16.08.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kgoldrunner-16.08.0.tar.xz";
-      sha256 = "1xmm2wq8f3pc67ip4hz9x3qqpav1rxm2nqdcbn2z7bivcdmv99jr";
-      name = "kgoldrunner-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kgoldrunner-16.08.1.tar.xz";
+      sha256 = "10bllkkiisb4ci97wzfln5b8bxs5l72k29mbd4qqxhq69r8xqi5c";
+      name = "kgoldrunner-16.08.1.tar.xz";
     };
   };
   kgpg = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kgpg-16.08.0.tar.xz";
-      sha256 = "1d0zfhq5ks5an9716n0b9a8xbwsnm8p7vl701gn8jpzb4w9cvrns";
-      name = "kgpg-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kgpg-16.08.1.tar.xz";
+      sha256 = "0zpq8smwh648jsxkf82pc2xvz980f07ilp2rzd8yr3w2n18gz120";
+      name = "kgpg-16.08.1.tar.xz";
     };
   };
   khangman = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/khangman-16.08.0.tar.xz";
-      sha256 = "070556i32fcrbirgwpf04ijqwv8izxmhrbf0rwwldrn3lky2mpfa";
-      name = "khangman-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/khangman-16.08.1.tar.xz";
+      sha256 = "1jz8wardcsip8c3r7s7lz1zn5gifb9jdksi0hdzn1kv1ha70dfyr";
+      name = "khangman-16.08.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/khelpcenter-16.08.0.tar.xz";
-      sha256 = "1js8jxain4w1iz3xs9098js17rf1mnhcfl46qqsc5ks2909450h1";
-      name = "khelpcenter-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/khelpcenter-16.08.1.tar.xz";
+      sha256 = "0nv7i3dm6d7wr9y34l009fybdlmp4j5891wl9wwzp6ccnw2qls4g";
+      name = "khelpcenter-16.08.1.tar.xz";
     };
   };
   kholidays = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kholidays-16.08.0.tar.xz";
-      sha256 = "0q87d55wf1qpqn0mjymhx316rqdcwg4w7hn8l0c221g9zyzd53qk";
-      name = "kholidays-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kholidays-16.08.1.tar.xz";
+      sha256 = "0dcnlbkmpzj58l9qvggsxk54cf1gspax388dniz5ihs07mkksg24";
+      name = "kholidays-16.08.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kidentitymanagement-16.08.0.tar.xz";
-      sha256 = "05k7m4vg5s5ks4wsk4xx5ncnbl4gy0w59xdhwyy01vg8hawnldlj";
-      name = "kidentitymanagement-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kidentitymanagement-16.08.1.tar.xz";
+      sha256 = "1cdm4p62idsmzb3q6ywlqll7ivkrbbraia6bdc3ad9p2m6mjkwkk";
+      name = "kidentitymanagement-16.08.1.tar.xz";
     };
   };
   kig = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kig-16.08.0.tar.xz";
-      sha256 = "0nm3d1wxhfkxhbab5y3h8scriyy9l35r34rd77pmk00khsl0d965";
-      name = "kig-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kig-16.08.1.tar.xz";
+      sha256 = "0slpafdkhyfpixm6iypd62y85j85f62fi2yd3hrmq8859qsp7n74";
+      name = "kig-16.08.1.tar.xz";
     };
   };
   kigo = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kigo-16.08.0.tar.xz";
-      sha256 = "0k9hjbaysiqjn9bgj7pvix0ag1ksyqdcwfdz5rxvvv6l6j3c96hs";
-      name = "kigo-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kigo-16.08.1.tar.xz";
+      sha256 = "10mrb94vlhg598r4bpydxj2llzh9239c0ziz3yllnw2jh7xw94rs";
+      name = "kigo-16.08.1.tar.xz";
     };
   };
   killbots = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/killbots-16.08.0.tar.xz";
-      sha256 = "05irljnrkmw2mp7v4hmindhnw7ww26abnibb8fqmj72ryck39asg";
-      name = "killbots-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/killbots-16.08.1.tar.xz";
+      sha256 = "1fr7vj9y5bh9dcznvslzsp3f20qrmqfaq8jl4rbas08882lx7am4";
+      name = "killbots-16.08.1.tar.xz";
     };
   };
   kimap = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kimap-16.08.0.tar.xz";
-      sha256 = "1k08m16kpf94w827n4j69sr2v7a855ap8ghg56vhfn24kbxrw9m8";
-      name = "kimap-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kimap-16.08.1.tar.xz";
+      sha256 = "01nlqmprbzirw0kwqw1m1klwq401nz3sfc51gi1r01ghhskwfjj0";
+      name = "kimap-16.08.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kio-extras-16.08.0.tar.xz";
-      sha256 = "03axqhn9f7bdjzflmncxxbvbn0lwyia65qshis4ysqkd0sh0rinn";
-      name = "kio-extras-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kio-extras-16.08.1.tar.xz";
+      sha256 = "08cis03pzl7ncmpxc6wss7zm4jwgyxqw873ab70mvibcax9wfky0";
+      name = "kio-extras-16.08.1.tar.xz";
     };
   };
   kiriki = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kiriki-16.08.0.tar.xz";
-      sha256 = "0jz6nm6371z60yrszs0c61sq2b5ny304v5j5bvcd0nx4prdri302";
-      name = "kiriki-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kiriki-16.08.1.tar.xz";
+      sha256 = "15p205hcvvf9w1bwcciwaq8igf6nspzjili48x13pzcmmgjf46m8";
+      name = "kiriki-16.08.1.tar.xz";
     };
   };
   kiten = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kiten-16.08.0.tar.xz";
-      sha256 = "1jxxm14ghmmcy6vyzl1r4vz0a63nvykcaqh2pydab0a3b8l2s93b";
-      name = "kiten-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kiten-16.08.1.tar.xz";
+      sha256 = "1n94jzy50imvhgan3d5av9iifd0g2bn65gi5bxf9yzq48a6npnkv";
+      name = "kiten-16.08.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kjumpingcube-16.08.0.tar.xz";
-      sha256 = "1kwgqzlwnb8699pdja4w3d7iv25a7ma121p36pvmh457s8zlgwhl";
-      name = "kjumpingcube-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kjumpingcube-16.08.1.tar.xz";
+      sha256 = "1i8agl9l996yf1x88s1xg2a3gahjjy2swscw5lb35li565rm7vyr";
+      name = "kjumpingcube-16.08.1.tar.xz";
     };
   };
   kldap = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kldap-16.08.0.tar.xz";
-      sha256 = "03wsvgw5rv4l01iprz2pp0sqvmkyqgk6pgbqk5dfiy8zxiij3j95";
-      name = "kldap-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kldap-16.08.1.tar.xz";
+      sha256 = "0m28i0rprj36b3ds51ljmhlpkld4ghl0259z9cc5fh4k7pnfi6jr";
+      name = "kldap-16.08.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kleopatra-16.08.0.tar.xz";
-      sha256 = "143w1jclw4r7790mygc6a6rrh0x6r98ai699mn351ai9r9z4cfx5";
-      name = "kleopatra-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kleopatra-16.08.1.tar.xz";
+      sha256 = "0f7ydyfp9iyg3jzrn02x8bm1x41yysixzwlcpl8l3qimibs65840";
+      name = "kleopatra-16.08.1.tar.xz";
     };
   };
   klettres = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/klettres-16.08.0.tar.xz";
-      sha256 = "1wfnlci02w5llrckbjfjbi6xk2h43bq98m4zgpib5nk8ib4jaffn";
-      name = "klettres-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/klettres-16.08.1.tar.xz";
+      sha256 = "11xhprq24hq3f7vvifp1ilmcihadxwyk0jmpb643w898kh6qv9hd";
+      name = "klettres-16.08.1.tar.xz";
     };
   };
   klickety = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/klickety-16.08.0.tar.xz";
-      sha256 = "1jz02spcr46id1qbxmc9wwgws48p3cbqdy032a563c8hacqgac32";
-      name = "klickety-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/klickety-16.08.1.tar.xz";
+      sha256 = "1hrplywk2b5qkw9ijpkyxgln2zwqj1ja2prp3acqs1683rsdndam";
+      name = "klickety-16.08.1.tar.xz";
     };
   };
   klines = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/klines-16.08.0.tar.xz";
-      sha256 = "1xwg8pa4k3a68s0bsxbphpm40kkzgchkxw4ha6xpmhva94nx82d1";
-      name = "klines-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/klines-16.08.1.tar.xz";
+      sha256 = "07754lvllpjb016da1r7y4n72mp07h8bn16mq38qsxa1d0rdjjd6";
+      name = "klines-16.08.1.tar.xz";
     };
   };
   kmag = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmag-16.08.0.tar.xz";
-      sha256 = "076lni6qv3b5chj0sgcxvj5an4jvhchagk930kihbpfiqg769c61";
-      name = "kmag-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmag-16.08.1.tar.xz";
+      sha256 = "0d75z94p28zwh7pz7ss75fscwfcphvnxdd4bj0yr1hz4rzk5bmd2";
+      name = "kmag-16.08.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmahjongg-16.08.0.tar.xz";
-      sha256 = "0j8c5iz11z5n08fywspvkcizw053kb2s1pxvgp5fr9h93mxn6cmk";
-      name = "kmahjongg-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmahjongg-16.08.1.tar.xz";
+      sha256 = "0xap6jw1gx86k8yhs7mmyp69jg4401551kmrhwbfz8cdpbzdrgz3";
+      name = "kmahjongg-16.08.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmailtransport-16.08.0.tar.xz";
-      sha256 = "1nm5kwr7mq813invmaq72j69lcxyg2i5bmf7d5j4flvxhl3psaz1";
-      name = "kmailtransport-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmailtransport-16.08.1.tar.xz";
+      sha256 = "052pnk3pqv9g58l5zlpz1mj17x72zrzjds77gd9vavmgmngzz2nd";
+      name = "kmailtransport-16.08.1.tar.xz";
     };
   };
   kmbox = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmbox-16.08.0.tar.xz";
-      sha256 = "0mwi1sxdxkzfmjvf8rjxnhgs07g6p528km5cfqcsxvz3fcwqmwpd";
-      name = "kmbox-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmbox-16.08.1.tar.xz";
+      sha256 = "10v9x4i1waqrdq28lk4fvxg8bjpldjajdfsv2qv1wyl28kkr8xkb";
+      name = "kmbox-16.08.1.tar.xz";
     };
   };
   kmime = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmime-16.08.0.tar.xz";
-      sha256 = "1bd063fzzixcgcg17hpq6jxd2hp4y97gfhih2vc63bwf4vfs6vhj";
-      name = "kmime-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmime-16.08.1.tar.xz";
+      sha256 = "188lwyp345vigjgqbljlvw84jsjisfs6drvknx4qvk74a6idj078";
+      name = "kmime-16.08.1.tar.xz";
     };
   };
   kmines = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmines-16.08.0.tar.xz";
-      sha256 = "0pnqqmb18xzfcknidjrydc714ni4w04xwhshmwlx7i0wpakwkkcw";
-      name = "kmines-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmines-16.08.1.tar.xz";
+      sha256 = "1m7p0bwpq4ry1dw78nic73jcyf78zyrxc4cw9phdavrwvfvajzng";
+      name = "kmines-16.08.1.tar.xz";
     };
   };
   kmix = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmix-16.08.0.tar.xz";
-      sha256 = "0sk18bykx1hb3sl476vdbrhnhs1n3ygp79kgil2wx2g6m20q5d3c";
-      name = "kmix-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmix-16.08.1.tar.xz";
+      sha256 = "0ikiillqsi1s2rl65j8f9883xg5y78a53nfha7wrzav5insyvrd0";
+      name = "kmix-16.08.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmousetool-16.08.0.tar.xz";
-      sha256 = "1y9lfri6iw7wkaxrixm613h4wdpszaiggvbailljyl8vx82r4q5z";
-      name = "kmousetool-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmousetool-16.08.1.tar.xz";
+      sha256 = "0dfmjs9d1pr4sxa5v6fk2bbx4anawm0841spg8vijxikwi67vayk";
+      name = "kmousetool-16.08.1.tar.xz";
     };
   };
   kmouth = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmouth-16.08.0.tar.xz";
-      sha256 = "1rx46fxfzj32a27yb597xsh1jjxn5h7kb39ywk8f2kkqvcn1dgyl";
-      name = "kmouth-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmouth-16.08.1.tar.xz";
+      sha256 = "01hin9yzv8zvj1pihr409clci905i3fhrwqz9izk1nhq3djxg7ld";
+      name = "kmouth-16.08.1.tar.xz";
     };
   };
   kmplot = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kmplot-16.08.0.tar.xz";
-      sha256 = "1syz6dk5ha2znwg5kj34hg2hrbl83wxzxiqznlwpmh2qr4kssrml";
-      name = "kmplot-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kmplot-16.08.1.tar.xz";
+      sha256 = "069qsi1bk385sil9m75y0zs7nzv8qscrfpdm8iip53fwf10bx5qa";
+      name = "kmplot-16.08.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/knavalbattle-16.08.0.tar.xz";
-      sha256 = "030j6mq6lx3bi96g3nkj5mif996r6dg3df2331c0r0s42icw1mv1";
-      name = "knavalbattle-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/knavalbattle-16.08.1.tar.xz";
+      sha256 = "0xxx053p42j8r6zlz6vv6avx6iqqm5aq6q3ggjib70w4ixl1wqmp";
+      name = "knavalbattle-16.08.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/knetwalk-16.08.0.tar.xz";
-      sha256 = "0lnsvpijx5ln5mscg2s46j0xzivhni6wj47yr7lvpkjrgy715c7d";
-      name = "knetwalk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/knetwalk-16.08.1.tar.xz";
+      sha256 = "15nrfcd6l08lkshh6gyqfawr2b9izsirwdg9mqnnymdji8lg91nl";
+      name = "knetwalk-16.08.1.tar.xz";
     };
   };
   kolf = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kolf-16.08.0.tar.xz";
-      sha256 = "06v1hyvj7dym9sn8gd7698f1806pr3h6nplxj5p4mm1ckhn6h59z";
-      name = "kolf-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kolf-16.08.1.tar.xz";
+      sha256 = "040fsd1kdww4yv258w1na3b5x3sxb14dj035rmw1y48lw883g439";
+      name = "kolf-16.08.1.tar.xz";
     };
   };
   kollision = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kollision-16.08.0.tar.xz";
-      sha256 = "0v3lixqy932v8dnzw892jafsjzxzldmzrcmaah0qnxq9qf9q3x1x";
-      name = "kollision-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kollision-16.08.1.tar.xz";
+      sha256 = "0w9wsgdqcpgklv31iqhbd79n6qiqk49jkhrc2c6zhmxqp588wy14";
+      name = "kollision-16.08.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kolourpaint-16.08.0.tar.xz";
-      sha256 = "1bfshyfgcgvpjyxzx7yb7ws0kfyb6765nsd7pad2jc7cs5x8x5m7";
-      name = "kolourpaint-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kolourpaint-16.08.1.tar.xz";
+      sha256 = "1siari77ivnrbllncviy504sz8q1f1mhdpjp45z69hsjn6bw8rcz";
+      name = "kolourpaint-16.08.1.tar.xz";
     };
   };
   kompare = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kompare-16.08.0.tar.xz";
-      sha256 = "0xx5l2gi031p7z488d5dn805k3likhp444520b2453vlfasmwh9z";
-      name = "kompare-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kompare-16.08.1.tar.xz";
+      sha256 = "0xmr3g2azrzhrjz1n9sp8wif7rxh574a1mg3prhl636pqcijq1bw";
+      name = "kompare-16.08.1.tar.xz";
     };
   };
   konquest = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/konquest-16.08.0.tar.xz";
-      sha256 = "18pp4h67wkzimayq3xpz3cqw06dky7k4vhfh4l2lbgm9nvlg3bwl";
-      name = "konquest-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/konquest-16.08.1.tar.xz";
+      sha256 = "1hsh9n17gqwnash5f8z8zpnwxl0n09zn9hv1qn39zad23vg6fjjd";
+      name = "konquest-16.08.1.tar.xz";
     };
   };
   konsole = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/konsole-16.08.0.tar.xz";
-      sha256 = "1kn80clbzq5sc6fby1gapw28lpxkbvjbk6c04avbfkg1d25n5mfg";
-      name = "konsole-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/konsole-16.08.1.tar.xz";
+      sha256 = "0dgphhg2icqagaw16i8z3x3mw8rmmpl3wmafbaca1gn9xw67md1g";
+      name = "konsole-16.08.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kontactinterface-16.08.0.tar.xz";
-      sha256 = "1snafjnmpz6xpldgksxi92dkx0kq1w2xcbkv4a8jqm7mllrxvjvy";
-      name = "kontactinterface-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kontactinterface-16.08.1.tar.xz";
+      sha256 = "0a8swis8i3dbv9nbbw8ksbghj5pvfsba6kkh2l4lgmkbdi0m9a3s";
+      name = "kontactinterface-16.08.1.tar.xz";
     };
   };
   kopete = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kopete-16.08.0.tar.xz";
-      sha256 = "1yd69aspsnmrg2f1l33clhpj8l5qqyns1djn63j9v76r4lxkrbnp";
-      name = "kopete-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kopete-16.08.1.tar.xz";
+      sha256 = "0l2wkf8b2jp6gnr2930xxxz9jqmh6mlms5h8934k89z9x00ha1p5";
+      name = "kopete-16.08.1.tar.xz";
     };
   };
   kpat = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kpat-16.08.0.tar.xz";
-      sha256 = "038fzs09bijmryka925hx7j4ln7z3f0qdzv7wwm9mkkp5wi4fpi6";
-      name = "kpat-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kpat-16.08.1.tar.xz";
+      sha256 = "1gpvha8636lwlb1qcdkirs5whil2fh6fp5xd3yh31dppxwryadaf";
+      name = "kpat-16.08.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kpimtextedit-16.08.0.tar.xz";
-      sha256 = "0bz729yr01p9sjf6bh76pfn3miisas3smxwzy31hh18r9n4f7xsa";
-      name = "kpimtextedit-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kpimtextedit-16.08.1.tar.xz";
+      sha256 = "1a73s0w49jrblxmzfsp25pknvpggx1p765w2hflij4yr0cb0ganz";
+      name = "kpimtextedit-16.08.1.tar.xz";
     };
   };
   kppp = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kppp-16.08.0.tar.xz";
-      sha256 = "1gx9ldjfasxfjr8i9pxlbwjdcypg2ffjiwddbp5pw1x6sfmyci7i";
-      name = "kppp-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kppp-16.08.1.tar.xz";
+      sha256 = "00fv4r6fiq7kkfi3awvk8b7ccj21hm5f7jdgkhacs6np5kv4spnd";
+      name = "kppp-16.08.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kqtquickcharts-16.08.0.tar.xz";
-      sha256 = "1bzhql082hgsmcngaclkjlfs7k1hyz17y3prcgw9qgm4nv4i18hq";
-      name = "kqtquickcharts-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kqtquickcharts-16.08.1.tar.xz";
+      sha256 = "0xy84v0z0mx30ynsym7qian2khck8mfgkm62sfd5v3xkgffhhdyh";
+      name = "kqtquickcharts-16.08.1.tar.xz";
     };
   };
   krdc = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/krdc-16.08.0.tar.xz";
-      sha256 = "1qq1r49knndy9hz4l04ix6ax2y66q4jq0qmh0b49ldamvm0b27w0";
-      name = "krdc-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/krdc-16.08.1.tar.xz";
+      sha256 = "1mq867gv8l6i1xlykm0fnfsgz52h60hb3s06aq1rp97yddclr4q1";
+      name = "krdc-16.08.1.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kremotecontrol-16.08.0.tar.xz";
-      sha256 = "1z6nhyq6x3kfsfsri3jmvdmkfdrxykc065w7kplfzrqqgnsw12gh";
-      name = "kremotecontrol-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kremotecontrol-16.08.1.tar.xz";
+      sha256 = "09iyp1sfva7rzxrp7ma90l3ls8yda5hyypvvn3kliv6rap0vrwv5";
+      name = "kremotecontrol-16.08.1.tar.xz";
     };
   };
   kreversi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kreversi-16.08.0.tar.xz";
-      sha256 = "03z3f09z70f3c2lbvdmr3injjdd8nmwbs2drxcxmkx17p4vg9w1h";
-      name = "kreversi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kreversi-16.08.1.tar.xz";
+      sha256 = "15g87r85wh4b9vx21bsxp2vavfgzy8kdgwyvv39gg87rl62j7qxf";
+      name = "kreversi-16.08.1.tar.xz";
     };
   };
   krfb = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/krfb-16.08.0.tar.xz";
-      sha256 = "1rvqk8sm75idnkb99v2mpfl1r32qyjcqcmbhw78lgb8nwpfr8cbs";
-      name = "krfb-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/krfb-16.08.1.tar.xz";
+      sha256 = "0952cxnfbwab6d1ji6wwx3snv4a9k031h8pph3n47xxr12nkjj19";
+      name = "krfb-16.08.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kross-interpreters-16.08.0.tar.xz";
-      sha256 = "1njd0j893zw6bdavqiqbzp02g0y1zhb8gmbq0rb46if1q5igj10d";
-      name = "kross-interpreters-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kross-interpreters-16.08.1.tar.xz";
+      sha256 = "1026amgj0r1r180535mpnm5f780pm7v25ilk7ynf834lad3is95k";
+      name = "kross-interpreters-16.08.1.tar.xz";
     };
   };
   kruler = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kruler-16.08.0.tar.xz";
-      sha256 = "1rcy5djmwlr4jvi7ig0075z40wfjby3hs7k40nzi3hl3khq2clfg";
-      name = "kruler-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kruler-16.08.1.tar.xz";
+      sha256 = "0j3hi77wlf5nwdmqiq5g34zb8pdzxn313hmc0k99p1gvkb1xn4zp";
+      name = "kruler-16.08.1.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksaneplugin-16.08.0.tar.xz";
-      sha256 = "0439bsn8d0w72f73ixxh205aqvbdbks9n0xxb0dq16d9msykvflm";
-      name = "ksaneplugin-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksaneplugin-16.08.1.tar.xz";
+      sha256 = "0bx7vaw5vkr7fvmn6ywil8997d1qy6qv7sycxz3ydc5ljg1ansmr";
+      name = "ksaneplugin-16.08.1.tar.xz";
     };
   };
   kscd = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kscd-16.08.0.tar.xz";
-      sha256 = "1jn7sp0ahgnqn8ws7qsaz9ax9ighx1w9jsgn3l1jqqwal2mz0gbv";
-      name = "kscd-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kscd-16.08.1.tar.xz";
+      sha256 = "1a6sq2dgkgvhycjxz95xa2b2xdibhl0ky54chj7hmdf43w69bdzc";
+      name = "kscd-16.08.1.tar.xz";
     };
   };
   kshisen = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kshisen-16.08.0.tar.xz";
-      sha256 = "0asvxgkn3pqws91a93r5wvpafz7zfchk5xmk08b74shscidi4nl6";
-      name = "kshisen-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kshisen-16.08.1.tar.xz";
+      sha256 = "1j33byc485rxbcf3wk8kra7vxq4r1sg8cpfrlxwiyb9ibk762jlh";
+      name = "kshisen-16.08.1.tar.xz";
     };
   };
   ksirk = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksirk-16.08.0.tar.xz";
-      sha256 = "0gh6j8ml5062m99ps7wm9nkn5b1w5lcqsjh22rd81cvl8wy48sx4";
-      name = "ksirk-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksirk-16.08.1.tar.xz";
+      sha256 = "121j8jz9gabdqv5fh4c2qcsg4ndj72xnmavvdrlib8a7qidjzaga";
+      name = "ksirk-16.08.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksnakeduel-16.08.0.tar.xz";
-      sha256 = "1sd5vjjcg3yr8jcp76ilcql953b0wzk950w1h1lbgrll2hr81bm3";
-      name = "ksnakeduel-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksnakeduel-16.08.1.tar.xz";
+      sha256 = "1qzqr5ai5d7azh7xmm2vihbz3jzxxvb6qvhpfrix0yf4yr8m8fxz";
+      name = "ksnakeduel-16.08.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kspaceduel-16.08.0.tar.xz";
-      sha256 = "1whvibw0d1gbb28lc04q93wpalsihgqzd9hi1yabwfa5piac9ldb";
-      name = "kspaceduel-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kspaceduel-16.08.1.tar.xz";
+      sha256 = "0zy6m325gaivwfrr20mfwn8pdgl1i4ym1ymwb5dyw7a5yfi27m7n";
+      name = "kspaceduel-16.08.1.tar.xz";
     };
   };
   ksquares = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksquares-16.08.0.tar.xz";
-      sha256 = "19rlzka8z7imhv4cbrwajkv4g38qg2mwm8pniyl0w818nj4jbjlp";
-      name = "ksquares-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksquares-16.08.1.tar.xz";
+      sha256 = "1rccb2qifqfb68apag01i3y97jbrskarf3480p61ixk7lrmbbrx4";
+      name = "ksquares-16.08.1.tar.xz";
     };
   };
   kstars = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kstars-16.08.0.tar.xz";
-      sha256 = "0zridrc65av69q7yi3k0jq744ifr94wpv725vx3wy8v5wlsc3rcx";
-      name = "kstars-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kstars-16.08.1.tar.xz";
+      sha256 = "1fwl9hry23lmhyx5ldqspa7hp6bvmjp8kzwi6p9y1kbwzbzmki0k";
+      name = "kstars-16.08.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksudoku-16.08.0.tar.xz";
-      sha256 = "15j9kjww92dmy6bvrs4pp2j6xxmz5xpci08wnab5mxsq6f6fghhs";
-      name = "ksudoku-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksudoku-16.08.1.tar.xz";
+      sha256 = "1msxx4hay0njp7bxjgplq7ylblbr56mf01l70sywj5madvvrmh8y";
+      name = "ksudoku-16.08.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ksystemlog-16.08.0.tar.xz";
-      sha256 = "1ksp8innmziyxjkxdw53sqaz66jf82xp8p2cfypw6r2zb506wq96";
-      name = "ksystemlog-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ksystemlog-16.08.1.tar.xz";
+      sha256 = "0garxwsgzdc5j6426gv3wqqgxra6qfdlk7xrk6mhlyg3wnwy8lz9";
+      name = "ksystemlog-16.08.1.tar.xz";
     };
   };
   kteatime = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kteatime-16.08.0.tar.xz";
-      sha256 = "1hqvyypbphsplq5aqdh24wzh7msqh757y1zgpclxl6xbjxx1ys5z";
-      name = "kteatime-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kteatime-16.08.1.tar.xz";
+      sha256 = "0m6rri4mgr9qzcpxr5ifm1xs5mpmx7nz074gscff662nv4cj1h5n";
+      name = "kteatime-16.08.1.tar.xz";
     };
   };
   ktimer = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktimer-16.08.0.tar.xz";
-      sha256 = "01gj0i5h08phhw9ds42ql1kmrl5brfasshgbxa9nvgd6i35zjp74";
-      name = "ktimer-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktimer-16.08.1.tar.xz";
+      sha256 = "0n94r34d24dnpi8rr6lb2vqrx1bz29xb92a63dm3s6pvbrw7zmhr";
+      name = "ktimer-16.08.1.tar.xz";
     };
   };
   ktnef = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktnef-16.08.0.tar.xz";
-      sha256 = "03fhx1kyzhm1fs0p7i2488r41dbyl2knkapg0cfd8zd0pcnv518f";
-      name = "ktnef-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktnef-16.08.1.tar.xz";
+      sha256 = "0gjq14gcc34mqx21f74kzqb1575fhckaq13fpf00ascar0s1w0sx";
+      name = "ktnef-16.08.1.tar.xz";
     };
   };
   ktouch = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktouch-16.08.0.tar.xz";
-      sha256 = "0i60f712bgldvf8dcjpd8hyf3fwlrmly96ddrkd8p5860vdyxxm1";
-      name = "ktouch-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktouch-16.08.1.tar.xz";
+      sha256 = "0jjn59hjbj5mc0svd8nrnqdwa4xz4wj76512gx1w1lga37ysk5gx";
+      name = "ktouch-16.08.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-accounts-kcm-16.08.0.tar.xz";
-      sha256 = "0hfs46fza537cdwmx18430qnwphvqihxa9z0ys7mlhwa8gffa9gq";
-      name = "ktp-accounts-kcm-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-accounts-kcm-16.08.1.tar.xz";
+      sha256 = "12icgnf165v549nlwzpn3dn7237k7xi3vfg0a1i7r2mzbhdw6xf5";
+      name = "ktp-accounts-kcm-16.08.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-approver-16.08.0.tar.xz";
-      sha256 = "0wvi076x2xxbrd4swf8gbi30fnwa58hxnahl3ri5gpz34c7y5c3v";
-      name = "ktp-approver-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-approver-16.08.1.tar.xz";
+      sha256 = "08qkcn2avc5aiakn6ksjikd50x5xd1ilwy5cf2fk1jqn6zbxglm0";
+      name = "ktp-approver-16.08.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-auth-handler-16.08.0.tar.xz";
-      sha256 = "0jyff6znszz82h3l92wjzkh9c1csnsyncd34hxvkyarxm6wb1s8f";
-      name = "ktp-auth-handler-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-auth-handler-16.08.1.tar.xz";
+      sha256 = "0wjz5r287f13p2s34hdjg0sy23xanwnp0274pk2hxbybf9v4ryvi";
+      name = "ktp-auth-handler-16.08.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-call-ui-16.08.0.tar.xz";
-      sha256 = "16jw9jap985p411qjkzay83yy1xrnykbnq7f315d7wqxrry3pvf1";
-      name = "ktp-call-ui-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-call-ui-16.08.1.tar.xz";
+      sha256 = "1gbw3a1yfm6kc85gpqhx6q7kp2fwmjgmxp819w9wrgg1qwmjyxrw";
+      name = "ktp-call-ui-16.08.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-common-internals-16.08.0.tar.xz";
-      sha256 = "1l88fnagbq9b63nfvyncq5bylpv6m9h9z1znmz1z67fp5x6lcmh9";
-      name = "ktp-common-internals-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-common-internals-16.08.1.tar.xz";
+      sha256 = "0ylpwjn3jknp77f8g69mkcj1zcjn9khfhxla6mci4h7cbxka9wdf";
+      name = "ktp-common-internals-16.08.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-list-16.08.0.tar.xz";
-      sha256 = "06cd9yzj7lw6v6n9fqjc4lafpi1z0yl2wyipibk47xmwckx5bw9f";
-      name = "ktp-contact-list-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-list-16.08.1.tar.xz";
+      sha256 = "0ach7dvlch162jyyw01hdlbwwh72gdp6rmmkkx65cf3g0sqhvwp4";
+      name = "ktp-contact-list-16.08.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-runner-16.08.0.tar.xz";
-      sha256 = "10yd1z90q0a8d3qcl07lnvj1j150awl2fjf74njdlxya2s0wgdmq";
-      name = "ktp-contact-runner-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-runner-16.08.1.tar.xz";
+      sha256 = "0721mys632jn4i040v541997fb5pca2fr2nj9p49bp0r7kmgj6qr";
+      name = "ktp-contact-runner-16.08.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-desktop-applets-16.08.0.tar.xz";
-      sha256 = "0gbvdq7qpschhc3iq22sm505m3ph4j7r38kfzq6f51gf4284hv9x";
-      name = "ktp-desktop-applets-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-desktop-applets-16.08.1.tar.xz";
+      sha256 = "1fln9kndpwl8arsr1i8vsicz0cv10r00w4niv163al11yqk3ng5g";
+      name = "ktp-desktop-applets-16.08.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-filetransfer-handler-16.08.0.tar.xz";
-      sha256 = "119q2isisqpbrcffparv73n69869cc6wqih0jr34m85q2c7ifr7p";
-      name = "ktp-filetransfer-handler-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-filetransfer-handler-16.08.1.tar.xz";
+      sha256 = "01581r1xylj6f78vqqxi0gf5nyj2k3vyyvkz5vjkq7di140mmw97";
+      name = "ktp-filetransfer-handler-16.08.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-kded-module-16.08.0.tar.xz";
-      sha256 = "1izc4gvh433gpnbbhdhb2bfx3sx5rj8bdiqcpba43xrvimq5mhbd";
-      name = "ktp-kded-module-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-kded-module-16.08.1.tar.xz";
+      sha256 = "1dpaay5qkqnxy0q80gqp2mydjngx815xrdmxcvh9pm3c4w0as8lh";
+      name = "ktp-kded-module-16.08.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-send-file-16.08.0.tar.xz";
-      sha256 = "1lsvs101w2xldi176am896vyihbm7w2js2h033v5p7bswnkg2mgm";
-      name = "ktp-send-file-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-send-file-16.08.1.tar.xz";
+      sha256 = "1nchxvc2n8a2d02cz8vlazr4fl8gpngl44lq3jymdggz58w8rji9";
+      name = "ktp-send-file-16.08.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktp-text-ui-16.08.0.tar.xz";
-      sha256 = "11ybqnkkp2r0wdczc0p3prmq9r3vhk6v81fhl4pnmcypghcgaf3f";
-      name = "ktp-text-ui-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktp-text-ui-16.08.1.tar.xz";
+      sha256 = "0mj5zih4pbqdc2m62s85ck7r3m12ywh0frg6n4hi8xw909w7x25m";
+      name = "ktp-text-ui-16.08.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/ktuberling-16.08.0.tar.xz";
-      sha256 = "1dd66s2ys266jr8pp5x2vvkzlysx93baw1kpiy550rb4gsb3l537";
-      name = "ktuberling-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/ktuberling-16.08.1.tar.xz";
+      sha256 = "1brm1xdma1d5fcgbyn8nw3pwncnyvxknrwlbr7capgwqn7s9pckl";
+      name = "ktuberling-16.08.1.tar.xz";
     };
   };
   kturtle = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kturtle-16.08.0.tar.xz";
-      sha256 = "01rphmyn89n32k579mg04gmfkjlphbn55cdqv0km4ngipiv32mj3";
-      name = "kturtle-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kturtle-16.08.1.tar.xz";
+      sha256 = "1d6kw35dzyq3c62j7pqsl57l8cpw98awr6bdr1v2w8xdiw9xi73c";
+      name = "kturtle-16.08.1.tar.xz";
     };
   };
   kubrick = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kubrick-16.08.0.tar.xz";
-      sha256 = "081bh8msbfcx9vkdbrlgclwngrxswpmd3hfzjfndhaw8ibp42hsi";
-      name = "kubrick-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kubrick-16.08.1.tar.xz";
+      sha256 = "1x34gyqa77b03hqs50vajqcmw9yrqxq1f4niyfj43wkw2b4jks9f";
+      name = "kubrick-16.08.1.tar.xz";
     };
   };
   kuser = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kuser-16.08.0.tar.xz";
-      sha256 = "0yq1jil5nfm2zw5sisvcvrjbxxlzjq3z8vxn41ch0ppfdpcsknjs";
-      name = "kuser-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kuser-16.08.1.tar.xz";
+      sha256 = "0dkv9x052iavp3hnrvnarm8hv3416kamdizwp3c22w2cfz3q4rdc";
+      name = "kuser-16.08.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kwalletmanager-16.08.0.tar.xz";
-      sha256 = "174rd9d4yqrdk93hnr5nrzq3b7ilk0hjzhlsy9dqm9pr9yix79g0";
-      name = "kwalletmanager-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kwalletmanager-16.08.1.tar.xz";
+      sha256 = "1w99076da86qw2271hkknrjc0mfp7f0xi5544kbk76aanaj73wvm";
+      name = "kwalletmanager-16.08.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/kwordquiz-16.08.0.tar.xz";
-      sha256 = "1nngkkwd22nzcj4syayizmhvw8svkrhwa12ab5cfa0fmx30ivz86";
-      name = "kwordquiz-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/kwordquiz-16.08.1.tar.xz";
+      sha256 = "08n6ajpx5x2vpf63d4fnfw2a4hcfmca2q4nd5y04kl1sccx67zig";
+      name = "kwordquiz-16.08.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libgravatar-16.08.0.tar.xz";
-      sha256 = "169sy6lzsvgrhm9arjg84qcy34hm5xwycl09cg2cw6l141c5yyv0";
-      name = "libgravatar-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libgravatar-16.08.1.tar.xz";
+      sha256 = "1izh80plcd3ss3brl0mi0alics4y53d355smpgjkfqyc80zxs7wz";
+      name = "libgravatar-16.08.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkcddb-16.08.0.tar.xz";
-      sha256 = "1qlq62nl11dhsqn61zrvv80mybwzxhcgzdblrxqq8l352y1l916x";
-      name = "libkcddb-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkcddb-16.08.1.tar.xz";
+      sha256 = "1i9xb96xari03q8fw20laqh5d3fyvigzqkdw6lw61fwxzpjrphk8";
+      name = "libkcddb-16.08.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkcompactdisc-16.08.0.tar.xz";
-      sha256 = "1i2pd9xr2i61xb6128dzsf5il2sk3bqp9d8ps45lm4vld73ryxmk";
-      name = "libkcompactdisc-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkcompactdisc-16.08.1.tar.xz";
+      sha256 = "1qjij6kvvs8k650sg7skbgh0n4wgdkyjdsg8rydg93r0fqh5yagq";
+      name = "libkcompactdisc-16.08.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkdcraw-16.08.0.tar.xz";
-      sha256 = "1cmhj1jpfpaxkkgx4imh79kcd5v3zdg27i971j9z828ysdl8b9rf";
-      name = "libkdcraw-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkdcraw-16.08.1.tar.xz";
+      sha256 = "05206lbf2j0pry640ja5ajdlmalz4szfg2xzddfp00m87bgxbr2b";
+      name = "libkdcraw-16.08.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkdegames-16.08.0.tar.xz";
-      sha256 = "0zh8nw3ndrvinl7qg6zhnzwn3i4qixk3wyxcf1nrfz0m294ys9yf";
-      name = "libkdegames-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkdegames-16.08.1.tar.xz";
+      sha256 = "11r5bf23fyymqqsj3ckbmya3f0zsdgrd4fw7jkfbxw7bfjjpr890";
+      name = "libkdegames-16.08.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkdepim-16.08.0.tar.xz";
-      sha256 = "1n3ijr5v73sd94hj6n0xwplx7019lljv151z0rjn6fakf199p32l";
-      name = "libkdepim-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkdepim-16.08.1.tar.xz";
+      sha256 = "0p72dk6w0bvn7qikpqlxd7yhlrnn9wqnrq6b6p0ngnzhrsybjffm";
+      name = "libkdepim-16.08.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkeduvocdocument-16.08.0.tar.xz";
-      sha256 = "0sv5p57lk8f0skw2z42whhizk7s3nh5hh0pf9yaxml64clmypwbk";
-      name = "libkeduvocdocument-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkeduvocdocument-16.08.1.tar.xz";
+      sha256 = "113z6hi6v7mj4z6qk3gj04ah60ys8fn14jwlrxj8xf5qb0fvhzbn";
+      name = "libkeduvocdocument-16.08.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkexiv2-16.08.0.tar.xz";
-      sha256 = "183h9ifbzwngi5mwdq85n2jx0k67z7dzxnd43k6fv5l6h2b5l7y7";
-      name = "libkexiv2-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkexiv2-16.08.1.tar.xz";
+      sha256 = "1h7bd3p03xap6m6qpb0ww8ganyb9z7sdk2hpp25ar12snjpfgh0y";
+      name = "libkexiv2-16.08.1.tar.xz";
     };
   };
   libkface = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkface-16.08.0.tar.xz";
-      sha256 = "175912gzb4w6ndmr164j67z3xwqhy0xpxahnqb3zqlbj0gx10wp2";
-      name = "libkface-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkface-16.08.1.tar.xz";
+      sha256 = "19fqg7xja2pk6wp4bvamanwpfcs5qiyzsgldpr0q4y650ipbrf4w";
+      name = "libkface-16.08.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkgeomap-16.08.0.tar.xz";
-      sha256 = "0jxk18dfvhrxs6war4p83sfdmn4zld5yl0x81dgmzfh7kc9dhws6";
-      name = "libkgeomap-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkgeomap-16.08.1.tar.xz";
+      sha256 = "0zlcd4k8yfz9l5skky7vyc2p5hgx2wnan1g0jawi2f2xzsy655nz";
+      name = "libkgeomap-16.08.1.tar.xz";
     };
   };
   libkipi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkipi-16.08.0.tar.xz";
-      sha256 = "12829kp4sr5hzji26syw3b8awgxhhdpvgdjdid276im3a4xfhmsv";
-      name = "libkipi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz";
+      sha256 = "1mksgr0x446ilbqmb0wb5lh5afj8q7a88r31wzf6x3698n0s9fdb";
+      name = "libkipi-16.08.1.tar.xz";
     };
   };
   libkleo = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkleo-16.08.0.tar.xz";
-      sha256 = "1n5qv9azkv29w67iwkpbxka213s81dlb8svs0xx2lxfb1z2dvrvh";
-      name = "libkleo-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkleo-16.08.1.tar.xz";
+      sha256 = "0a216q291vgf4v758l79aywp1f8wn40239jn9gx6ngw3p8zzf357";
+      name = "libkleo-16.08.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkmahjongg-16.08.0.tar.xz";
-      sha256 = "145gi58yfcbd2magqk873hjwzk02z23zn4h3a95w236gx3r573m5";
-      name = "libkmahjongg-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkmahjongg-16.08.1.tar.xz";
+      sha256 = "1bvm86xcmx3cdslm98n5kg61rmyc9p86aj8scrp3gb8di1y987zx";
+      name = "libkmahjongg-16.08.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libkomparediff2-16.08.0.tar.xz";
-      sha256 = "1fqghzfnzjcfrcdn6av5r27br9qiz48ng1vgj2g2bi1y75bnla6i";
-      name = "libkomparediff2-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libkomparediff2-16.08.1.tar.xz";
+      sha256 = "1cqd1amnxpylwzw5vdgy29wh1llhrvbqf5kmjxxb3a3kh2rafb53";
+      name = "libkomparediff2-16.08.1.tar.xz";
     };
   };
   libksane = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libksane-16.08.0.tar.xz";
-      sha256 = "079fy5izsly0qkbrxhkasdk9h2359izsxhaam0mzc24cf9ls2zbr";
-      name = "libksane-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libksane-16.08.1.tar.xz";
+      sha256 = "0g8vhdknph32736inzf9xbrdi51asb9md254m12cabglb1mfhia3";
+      name = "libksane-16.08.1.tar.xz";
     };
   };
   libksieve = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/libksieve-16.08.0.tar.xz";
-      sha256 = "014ijwkzz8n53yy2gjm39i85rjakv447lz048kfighpl1m08yjjz";
-      name = "libksieve-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/libksieve-16.08.1.tar.xz";
+      sha256 = "1paq508fsb1q7nfry3za7ykz41ly3qb6splf65d9n9l8aqbfx9fx";
+      name = "libksieve-16.08.1.tar.xz";
     };
   };
   lokalize = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/lokalize-16.08.0.tar.xz";
-      sha256 = "0m7sipj53ih3g2pj1a5ny667dj0jaqyrsn46bymkpz9z7rn8z5xs";
-      name = "lokalize-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/lokalize-16.08.1.tar.xz";
+      sha256 = "1dg6sw4zm7cq4di9zgjc4b1nk73sngc3ilshsr1wgdylpxaq9vrf";
+      name = "lokalize-16.08.1.tar.xz";
     };
   };
   lskat = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/lskat-16.08.0.tar.xz";
-      sha256 = "0lnpc5sfj4bfb1fz887fgkqs5prnjlsci90fis67rim9b3b45mhd";
-      name = "lskat-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/lskat-16.08.1.tar.xz";
+      sha256 = "08ds76m66ni7pfmz0cnqx6b1p6l7m8fy5mz54kh9aahchw8lwpmk";
+      name = "lskat-16.08.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/mailcommon-16.08.0.tar.xz";
-      sha256 = "1b43rfhnghm8apkl2qwg7i6mx8ci5lpjy1fgp6jrdcxip8yw0172";
-      name = "mailcommon-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/mailcommon-16.08.1.tar.xz";
+      sha256 = "0f25z2s8bm51p2qxl2srdjf6df9h006ji6y9vn06m1vwsyfzmg3g";
+      name = "mailcommon-16.08.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/mailimporter-16.08.0.tar.xz";
-      sha256 = "1bak75qb8x8g1x8kw3f1a20i07hcf8fas5arxjyb9qrs97zx6vbz";
-      name = "mailimporter-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/mailimporter-16.08.1.tar.xz";
+      sha256 = "18hy1brpl07zcwzwv83mikn17h7xrgyc5q8xqvl5awgn8cj1zk9d";
+      name = "mailimporter-16.08.1.tar.xz";
     };
   };
   marble = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/marble-16.08.0.tar.xz";
-      sha256 = "1a65w4gir65cy90sxs2x1ig95mgmrk6ai3pv2ah8kwv0gy19qc6f";
-      name = "marble-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/marble-16.08.1.tar.xz";
+      sha256 = "0fmgqx1nc77agrrcb6qxq0zkndxkxhqybvxpf0dxyd7mpwg00zd2";
+      name = "marble-16.08.1.tar.xz";
     };
   };
   messagelib = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/messagelib-16.08.0.tar.xz";
-      sha256 = "1442qvhqjm976i20h36xck9lrad29mbhcs2p146q1rggphv9yzb6";
-      name = "messagelib-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/messagelib-16.08.1.tar.xz";
+      sha256 = "0kjladmrj2plj5kjmjkhh35mlijc2k3q8pdmi91xq0paawlrziyc";
+      name = "messagelib-16.08.1.tar.xz";
     };
   };
   minuet = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/minuet-16.08.0.tar.xz";
-      sha256 = "07h65zkikpl5wwmw996wihylij1rxbf580fkrcwq6xjh4xk6c950";
-      name = "minuet-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/minuet-16.08.1.tar.xz";
+      sha256 = "1qa2a3216p8x0vr9i3jw42i134qij4v0jj0625m606ihfs2mfhbq";
+      name = "minuet-16.08.1.tar.xz";
     };
   };
   okteta = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/okteta-16.08.0.tar.xz";
-      sha256 = "1mnh1p7497206z7szf0aslb9s660iv3bzssbgkkcf96r3n50g96s";
-      name = "okteta-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/okteta-16.08.1.tar.xz";
+      sha256 = "1q9pni82frj48lncj9ipkvdb120bg49f53p09vcpfxyax6hhnb5k";
+      name = "okteta-16.08.1.tar.xz";
     };
   };
   okular = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/okular-16.08.0.tar.xz";
-      sha256 = "15qzjmpzwlq2pp0cxfcklsm0dfmla9vp649rzv76bq0qlnb0vnc2";
-      name = "okular-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/okular-16.08.1.tar.xz";
+      sha256 = "0x3njxxwacy9cj4rzsgphl3za01d59wpbax9wxhxcdwqfi332a0d";
+      name = "okular-16.08.1.tar.xz";
     };
   };
   palapeli = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/palapeli-16.08.0.tar.xz";
-      sha256 = "0l13i9gc5nqdl0zrmnnzfklv8f4v8anhhmndxs3v0r1rgjs856m4";
-      name = "palapeli-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/palapeli-16.08.1.tar.xz";
+      sha256 = "15dfh9802kdmlwzjfqciszf4lwy2pr9ypnk1s2i4aj69jwqygn62";
+      name = "palapeli-16.08.1.tar.xz";
     };
   };
   parley = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/parley-16.08.0.tar.xz";
-      sha256 = "0ljk290z9sx30985848pixpnyyf5bjf7gqb2jfv3qy8gbbkxvrfd";
-      name = "parley-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/parley-16.08.1.tar.xz";
+      sha256 = "0pwwng4rx82l7j8n9llhwn6779jjhakl84nal1s6fc4i8vack49v";
+      name = "parley-16.08.1.tar.xz";
     };
   };
   picmi = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/picmi-16.08.0.tar.xz";
-      sha256 = "1ayxzfd6xgb02bliwcrbcnsjqid81afz4mmlvkdg079mzqgnsm5l";
-      name = "picmi-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/picmi-16.08.1.tar.xz";
+      sha256 = "0lfmswabkkj6snwmx27iv9w5c2qpw6z85rvi997ccrw5yg1627hc";
+      name = "picmi-16.08.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/pimcommon-16.08.0.tar.xz";
-      sha256 = "0hdwdwr81viidkcxxg861pay7k3ix96wwcqj4anf1nv0cyg9i76n";
-      name = "pimcommon-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/pimcommon-16.08.1.tar.xz";
+      sha256 = "1n15i70mgfx0jnl4952gkn05ynpnkqz4fkmwycj0ib0ry9wvi2vh";
+      name = "pimcommon-16.08.1.tar.xz";
     };
   };
   poxml = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/poxml-16.08.0.tar.xz";
-      sha256 = "1r4b763rs77w03l0wwskqfjbkk83mdbk5w22s7xwr356w6h9mir1";
-      name = "poxml-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/poxml-16.08.1.tar.xz";
+      sha256 = "0cwnpcagsg1dbvfhra473g7wqmk5x2frw8y3831zwr47y6kgdr0c";
+      name = "poxml-16.08.1.tar.xz";
     };
   };
   print-manager = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/print-manager-16.08.0.tar.xz";
-      sha256 = "033bdrzr6726a35pf7wi4dw1slfpywi2si26pkxh90863620qa87";
-      name = "print-manager-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/print-manager-16.08.1.tar.xz";
+      sha256 = "1nhfkw56ri8y2pik3x76v5w3dl39k2a2ajd4gdql627sc3116c5q";
+      name = "print-manager-16.08.1.tar.xz";
     };
   };
   rocs = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/rocs-16.08.0.tar.xz";
-      sha256 = "0fc8dgaj6n4kqkxs3m7p4g83znmvqx014shx0q5lv0azjr0bp09s";
-      name = "rocs-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/rocs-16.08.1.tar.xz";
+      sha256 = "1qif7qj67rzljpkmbqjfm0gaji8wk7mc8fbddi7fpczgnz5jcmd5";
+      name = "rocs-16.08.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/signon-kwallet-extension-16.08.0.tar.xz";
-      sha256 = "1gbd9gf9riyrzi1gd0hxk06n6a86j103zhcwhscg9xh5fz306v3l";
-      name = "signon-kwallet-extension-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/signon-kwallet-extension-16.08.1.tar.xz";
+      sha256 = "0l68iz23d5k24ciyzdb7iywamfias34yhdcm69dpqpw1jchfcrkv";
+      name = "signon-kwallet-extension-16.08.1.tar.xz";
     };
   };
   spectacle = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/spectacle-16.08.0.tar.xz";
-      sha256 = "02fcgx8k74dqjn7bpkcydcdcw2jv2sk3w5a9kjwnwr14jcfb28zq";
-      name = "spectacle-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/spectacle-16.08.1.tar.xz";
+      sha256 = "0a9gka5xllwcdvvdbr8fj91v8zg2hlzhrh6myb0ycj7ang45gc88";
+      name = "spectacle-16.08.1.tar.xz";
     };
   };
   step = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/step-16.08.0.tar.xz";
-      sha256 = "035qflw50q22ml9nmwdl7ih3ym543dcyizc792cj3axmmhjvbpki";
-      name = "step-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/step-16.08.1.tar.xz";
+      sha256 = "0135568xaccswfj8zfimh5fbpb8ib3lz2aq9qsw05bbmrjfv4398";
+      name = "step-16.08.1.tar.xz";
     };
   };
   svgpart = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/svgpart-16.08.0.tar.xz";
-      sha256 = "1z79056lsr4w3abqic4hk7xqnpma0sqq6ir9acrgkw89qiwjinga";
-      name = "svgpart-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/svgpart-16.08.1.tar.xz";
+      sha256 = "0ws41853wcfj1nbd31mr5qr23rzlijprvbpr1y7wq6g9agdfdwxs";
+      name = "svgpart-16.08.1.tar.xz";
     };
   };
   sweeper = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/sweeper-16.08.0.tar.xz";
-      sha256 = "0ra8gldnbd6rkqrfrdljdjdh8naw1anga7g367mzik9n8vp0j5y4";
-      name = "sweeper-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/sweeper-16.08.1.tar.xz";
+      sha256 = "0ywrpdhy61hm61drclk17mlmp8i0717871mc48b5rlpgkxa31aaz";
+      name = "sweeper-16.08.1.tar.xz";
     };
   };
   syndication = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/syndication-16.08.0.tar.xz";
-      sha256 = "0kg4194lrpda95pr9qk87frfvx4r0lmqvvlivyz4nqd18w9dj4r3";
-      name = "syndication-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/syndication-16.08.1.tar.xz";
+      sha256 = "06hpw3lr3idrrbv92qd5smnnbv4yvpn5kn99bbx5rjwxbcnrklml";
+      name = "syndication-16.08.1.tar.xz";
     };
   };
   umbrello = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/umbrello-16.08.0.tar.xz";
-      sha256 = "0jhcdd8awdkky6jzki034ims04n27ix38hnxhldxj94n52crjdgl";
-      name = "umbrello-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/umbrello-16.08.1.tar.xz";
+      sha256 = "14kalb7fpknsflkxychian1j724kfw4klcb4l361cn53imqq0ngk";
+      name = "umbrello-16.08.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.08.0";
+    version = "16.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.08.0/src/zeroconf-ioslave-16.08.0.tar.xz";
-      sha256 = "0fb0c24rhkrrna9ymmlrxwf711bx7pnb2v0sx4jsla79r9wr2z0g";
-      name = "zeroconf-ioslave-16.08.0.tar.xz";
+      url = "${mirror}/stable/applications/16.08.1/src/zeroconf-ioslave-16.08.1.tar.xz";
+      sha256 = "00p6hwrc5zhll9vfs5vzff469lgp7xbmvpa2s11ix45wh8d2wm91";
+      name = "zeroconf-ioslave-16.08.1.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index 8683d5b3cea5..06a0b5b8bffb 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,17 +1,22 @@
 { stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "lxappearance-0.6.1";
+  name = "lxappearance-0.6.2";
+
   src = fetchurl{
     url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
-    sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
+    sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4";
   };
-  buildInputs = [ intltool libX11 pkgconfig gtk2 ];
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ libX11 gtk2 ];
+
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
     maintainers = [ stdenv.lib.maintainers.hinton ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://lxappearance.sourceforce.net/";
+    homepage = "http://lxde.org/";
   };
 }
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
index f6f7c4c3a54b..8e3998c05f22 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@@ -3,21 +3,25 @@
 let
   p_name  = "xfce4-settings";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4";
+    sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n";
   };
 
   patches = [ ./xfce4-settings-default-icon-theme.patch ];
 
+  nativeBuildInputs =
+    [ pkgconfig intltool
+    ];
+
   buildInputs =
-    [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower
-      xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
+    [ exo gtk libxfce4util libxfce4ui libglade upower xfconf
+      xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
     ]; #TODO: optional packages
 
   configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ac374f1293aa..f8ede8cae45f 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -75,24 +75,26 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
 
-  xfce4_battery_plugin     = callPackage ./panel-plugins/xfce4-battery-plugin.nix     { };
-  xfce4_clipman_plugin     = callPackage ./panel-plugins/xfce4-clipman-plugin.nix     { };
-  xfce4_cpufreq_plugin     = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix     { };
-  xfce4_cpugraph_plugin    = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix    { };
-  xfce4_datetime_plugin    = callPackage ./panel-plugins/xfce4-datetime-plugin.nix    { };
-  xfce4_dict_plugin        = callPackage ./panel-plugins/xfce4-dict-plugin.nix        { };
-  xfce4_embed_plugin       = callPackage ./panel-plugins/xfce4-embed-plugin.nix       { };
-  xfce4_eyes_plugin        = callPackage ./panel-plugins/xfce4-eyes-plugin.nix        { };
-  xfce4_fsguard_plugin     = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix     { };
-  xfce4_genmon_plugin      = callPackage ./panel-plugins/xfce4-genmon-plugin.nix      { };
-  xfce4_netload_plugin     = callPackage ./panel-plugins/xfce4-netload-plugin.nix     { };
-  xfce4_notes_plugin       = callPackage ./panel-plugins/xfce4-notes-plugin.nix       { };
-  xfce4_systemload_plugin  = callPackage ./panel-plugins/xfce4-systemload-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     { };
-  xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
-  xfce4_pulseaudio_plugin  = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix  { };
+  xfce4_battery_plugin          = callPackage ./panel-plugins/xfce4-battery-plugin.nix          { };
+  xfce4_clipman_plugin          = callPackage ./panel-plugins/xfce4-clipman-plugin.nix          { };
+  xfce4_cpufreq_plugin          = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix          { };
+  xfce4_cpugraph_plugin         = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix         { };
+  xfce4_datetime_plugin         = callPackage ./panel-plugins/xfce4-datetime-plugin.nix         { };
+  xfce4_dict_plugin             = callPackage ./panel-plugins/xfce4-dict-plugin.nix             { };
+  xfce4_embed_plugin            = callPackage ./panel-plugins/xfce4-embed-plugin.nix            { };
+  xfce4_eyes_plugin             = callPackage ./panel-plugins/xfce4-eyes-plugin.nix             { };
+  xfce4_fsguard_plugin          = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix          { };
+  xfce4_genmon_plugin           = callPackage ./panel-plugins/xfce4-genmon-plugin.nix           { };
+  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-sensors-plugin          = callPackage ./panel-plugins/xfce4-sensors-plugin.nix          { };
+  xfce4_systemload_plugin       = callPackage ./panel-plugins/xfce4-systemload-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          { };
+  xfce4_whiskermenu_plugin      = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix      { };
+  xfce4_pulseaudio_plugin       = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix       { };
 
 }; # xfce_self
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
new file mode 100644
index 000000000000..ea17c960b2e4
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2,
+  libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname  = "xfce4-hardware-monitor-plugin";
+  version = "1.5.0";
+
+  src = fetchurl {
+    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2";
+    sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    intltool
+  ];
+
+  buildInputs = [
+    gnome2.gtkmm2
+    gnome2.libgnomecanvas
+    gnome2.libgnomecanvasmm
+    libgtop
+    libxfce4ui
+    libxfce4util
+    xfce4panel
+    lm_sensors
+   ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}";
+    description = "Hardware monitor plugin for the XFCE4 panel";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
new file mode 100644
index 000000000000..770f34490235
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
+  libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${ver_maj}.${ver_min}";
+  pname  = "xfce4-sensors-plugin";
+  ver_maj = "1.2";
+  ver_min = "6";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${pname}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+  ];
+
+  buildInputs = [
+    gnome2.gtk
+    libxfce4ui
+    libxfce4util
+    xfce4panel
+    libnotify
+    lm_sensors
+    hddtemp
+    netcat
+   ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-pathhddtemp=${hddtemp}/bin/hddtemp"
+    "--with-pathnetcat=${netcat}/bin/netcat"
+  ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}";
+    description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index c13118977a17..7037bf3808f2 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -68,6 +68,14 @@ let
 
         # Change the #error on GCC > 4.9 to a #warning.
         sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
+
+        # Ensure that cmake can find CUDA.
+        mkdir -p $out/nix-support
+        echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
+
+      '' + lib.optionalString (lib.versionOlder version "8.0") ''
+        # Hack to fix building against recent Glibc/GCC.
+        echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
       '';
 
       meta = {
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 4adcb995bde4..ac7a275d66ae 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "dtc-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0wcn9x2vynwlfxk5c6jrf8lz7qvm1sbb9gh27drk1mx8msdh5hd5";
+    sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j";
   };
 
   nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 9d0b506efeea..335de9b50cde 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
-    pcre2 openblas openlibm openspecfun readline suitesparse utf8proc
+    pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
     zlib
   ] ++
     stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_OPENSPECFUN=1"
       "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
       "USE_SYSTEM_READLINE=1"
       "USE_SYSTEM_UTF8PROC=1"
       "USE_SYSTEM_ZLIB=1"
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 09b79c59e7d2..ed23bcb73ccd 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
-    pcre2 openblas openlibm openspecfun readline suitesparse utf8proc
+    pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
     zlib
   ];
 
@@ -131,6 +131,8 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_OPENSPECFUN=1"
       "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
       "USE_SYSTEM_READLINE=1"
       "USE_SYSTEM_UTF8PROC=1"
       "USE_SYSTEM_ZLIB=1"
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b44519baa4e8..64de27aa5de9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -46,6 +46,7 @@ self: super: {
       sha256 = "0an1rafbv48m04g7crfj2qrk64d98yrjn2z4hfv2pybwmqdmx78z";
       rev = drv.version;
     };
+    doCheck = false;  # version 6.20160907 has a test suite failure; reported upstream
   })).overrideScope (self: super: {
     # https://github.com/prowdsponsor/esqueleto/issues/137
     persistent = self.persistent_2_2_4_1;
@@ -274,8 +275,8 @@ self: super: {
   HerbiePlugin = dontCheck super.HerbiePlugin;
 
   # These packages try to access the network.
-  amqp-conduit = dontCheck super.amqp-conduit;
   amqp = dontCheck super.amqp;
+  amqp-conduit = dontCheck super.amqp-conduit;
   bitcoin-api = dontCheck super.bitcoin-api;
   bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
   bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
@@ -286,8 +287,9 @@ self: super: {
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
-  hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
+  hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; };
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
+  mongoDB = dontCheck super.mongoDB;
   network-transport-tcp = dontCheck super.network-transport-tcp;
   network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
   pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
@@ -321,49 +323,57 @@ self: super: {
   acme-year = dontCheck super.acme-year;                # http://hydra.cryp.to/build/497858/log/raw
   aeson-lens = dontCheck super.aeson-lens;              # http://hydra.cryp.to/build/496769/log/raw
   aeson-schema = dontCheck super.aeson-schema;          # https://github.com/timjb/aeson-schema/issues/9
+  angel = dontCheck super.angel;
   apache-md5 = dontCheck super.apache-md5;              # http://hydra.cryp.to/build/498709/nixlog/1/raw
   app-settings = dontCheck super.app-settings;          # http://hydra.cryp.to/build/497327/log/raw
   aws = dontCheck super.aws;                            # needs aws credentials
   aws-kinesis = dontCheck super.aws-kinesis;            # needs aws credentials for testing
   binary-protocol = dontCheck super.binary-protocol;    # http://hydra.cryp.to/build/499749/log/raw
+  binary-search = dontCheck super.binary-search;
   bits = dontCheck super.bits;                          # http://hydra.cryp.to/build/500239/log/raw
   bloodhound = dontCheck super.bloodhound;
   buildwrapper = dontCheck super.buildwrapper;
   burst-detection = dontCheck super.burst-detection;    # http://hydra.cryp.to/build/496948/log/raw
   cabal-bounds = dontCheck super.cabal-bounds;          # http://hydra.cryp.to/build/496935/nixlog/1/raw
   cabal-meta = dontCheck super.cabal-meta;              # http://hydra.cryp.to/build/497892/log/raw
+  camfort = dontCheck super.camfort;
   cautious-file = dontCheck super.cautious-file;        # http://hydra.cryp.to/build/499730/log/raw
-  CLI = dontCheck super.CLI;                            # Upstream has no issue tracker.
   cjk = dontCheck super.cjk;
+  CLI = dontCheck super.CLI;                            # Upstream has no issue tracker.
   command-qq = dontCheck super.command-qq;              # http://hydra.cryp.to/build/499042/log/raw
   conduit-connection = dontCheck super.conduit-connection;
   craftwerk = dontCheck super.craftwerk;
+  css-text = dontCheck super.css-text;
   damnpacket = dontCheck super.damnpacket;              # http://hydra.cryp.to/build/496923/log
   data-hash = dontCheck super.data-hash;
   Deadpan-DDP = dontCheck super.Deadpan-DDP;            # http://hydra.cryp.to/build/496418/log/raw
   DigitalOcean = dontCheck super.DigitalOcean;
+  direct-sqlite = dontCheck super.direct-sqlite;
   directory-layout = dontCheck super.directory-layout;
+  dlist = dontCheck super.dlist;
   docopt = dontCheck super.docopt;                      # http://hydra.cryp.to/build/499172/log/raw
   dom-selector = dontCheck super.dom-selector;          # http://hydra.cryp.to/build/497670/log/raw
   dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
   DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
+  ed25519 = dontCheck super.ed25519;
   either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
   ghc-events = dontCheck super.ghc-events;              # http://hydra.cryp.to/build/498226/log/raw
   ghc-events-parallel = dontCheck super.ghc-events-parallel;    # http://hydra.cryp.to/build/496828/log/raw
-  ghcid = dontCheck super.ghcid;
   ghc-imported-from = dontCheck super.ghc-imported-from;
   ghc-parmake = dontCheck super.ghc-parmake;
-  gitlib-cmdline = dontCheck super.gitlib-cmdline;
+  ghcid = dontCheck super.ghcid;
   git-vogue = dontCheck super.git-vogue;
+  gitlib-cmdline = dontCheck super.gitlib-cmdline;
   GLFW-b = dontCheck super.GLFW-b;                      # https://github.com/bsl/GLFW-b/issues/50
   hackport = dontCheck super.hackport;
   hadoop-formats = dontCheck super.hadoop-formats;
   haeredes = dontCheck super.haeredes;
   hashed-storage = dontCheck super.hashed-storage;
   hashring = dontCheck super.hashring;
+  hastache = dontCheck super.hastache;
   hath = dontCheck super.hath;
   haxl-facebook = dontCheck super.haxl-facebook;        # needs facebook credentials for testing
   hdbi-postgresql = dontCheck super.hdbi-postgresql;
@@ -397,9 +407,12 @@ self: super: {
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
   lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
   memcache = dontCheck super.memcache;
+  MemoTrie = dontHaddock (dontCheck super.MemoTrie);
+  metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;
   nats-queue = dontCheck super.nats-queue;
   netpbm = dontCheck super.netpbm;
+  network = dontCheck super.network;
   network-dbus = dontCheck super.network-dbus;
   notcpp = dontCheck super.notcpp;
   ntp-control = dontCheck super.ntp-control;
@@ -420,6 +433,7 @@ self: super: {
   redis-io = dontCheck super.redis-io;
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;
+  safecopy = dontCheck super.safecopy;
   sai-shape-syb = dontCheck super.sai-shape-syb;
   scp-streams = dontCheck super.scp-streams;
   sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
@@ -429,7 +443,9 @@ self: super: {
   static-resources = dontCheck super.static-resources;
   strive = dontCheck super.strive;                      # fails its own hlint test with tons of warnings
   svndump = dontCheck super.svndump;
+  symengine = dontCheck super.symengine;
   tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
+  th-printf = dontCheck super.th-printf;
   thumbnail-plus = dontCheck super.thumbnail-plus;
   tickle = dontCheck super.tickle;
   tpdb = dontCheck super.tpdb;
@@ -439,11 +455,13 @@ self: super: {
   wai-app-file-cgi = dontCheck super.wai-app-file-cgi;
   wai-logger = dontCheck super.wai-logger;
   WebBits = dontCheck super.WebBits;                    # http://hydra.cryp.to/build/499604/log/raw
-  webdriver-angular = dontCheck super.webdriver-angular;
   webdriver = dontCheck super.webdriver;
+  webdriver-angular = dontCheck super.webdriver-angular;
   xsd = dontCheck super.xsd;
+  snap-core = dontCheck super.snap-core;
+  sourcemap = dontCheck super.sourcemap;
 
-  # Needs access to locale data, but looks for it in the wrong place.
+   # Needs access to locale data, but looks for it in the wrong place.
   scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
 
   # These test suites run for ages, even on a fast machine. This is nuts.
@@ -484,7 +502,7 @@ self: super: {
   duplo = dontCheck super.duplo;
 
   # Nix-specific workaround
-  xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch;
+  xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch;
 
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
@@ -757,7 +775,7 @@ self: super: {
       local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
       pushd >/dev/null $lispdir
       for i in *.el; do
-        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+        emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \
           --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
           -f batch-byte-compile $i
       done
@@ -774,7 +792,7 @@ self: super: {
       local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
       pushd >/dev/null $lispdir
       for i in *.el; do
-        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+        emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \
           --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
           -f batch-byte-compile $i
       done
@@ -782,6 +800,7 @@ self: super: {
       mkdir -p $out/share/emacs
       ln -s $lispdir $out/share/emacs/site-lisp
     '';
+    doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   });
 
   # https://github.com/yesodweb/Shelly.hs/issues/106
@@ -965,9 +984,6 @@ self: super: {
     '';
   });
 
-  # https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath
-  spy = appendPatch super.spy ./patches/spy.patch;
-
   idris = overrideCabal super.idris (drv: {
     # "idris" binary cannot find Idris library otherwise while building. After
     # installing it's completely fine though. This seems like a bug in Idris
@@ -976,11 +992,11 @@ self: super: {
     preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+    # test suite cannot find its own "idris" binary
+    doCheck = false;
   });
 
-  # https://github.com/MarcWeber/hasktags/issues/32
-  hasktags = overrideCabal super.hasktags (drv: {
-    postInstall = "rm $out/bin/test";
-  });
+  # https://github.com/pontarius/pontarius-xmpp/issues/105
+  pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d5a2620c301b..9f4294bbef1e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -32,8 +32,1970 @@ core-packages:
   - xhtml-3000.2.1
 
 default-package-overrides:
-  # Add overrides in this section only for packages that are *not* part of
-  # Stackage to make sure we're conforming to their preferred version list.
+  # LTS Haskell 7.0
+  - abstract-deque ==0.3
+  - abstract-par ==0.3.3
+  - AC-Vector ==2.3.2
+  - accelerate ==0.15.1.0
+  - accuerr ==0.2.0.2
+  - ace ==0.6
+  - acid-state ==0.14.2
+  - action-permutations ==0.0.0.1
+  - active ==0.2.0.10
+  - ad ==4.3.2.1
+  - adjunctions ==4.3
+  - adler32 ==0.1.1.0
+  - aeson ==0.11.2.1
+  - aeson-better-errors ==0.9.0.1
+  - aeson-casing ==0.1.0.5
+  - aeson-compat ==0.3.6
+  - aeson-injector ==1.0.5.1
+  - aeson-pretty ==0.8.2
+  - aeson-qq ==0.8.1
+  - aeson-utils ==0.3.0.2
+  - Agda ==2.5.1.1
+  - airship ==0.6.0
+  - alarmclock ==0.4.0.2
+  - alex ==3.1.7
+  - amazonka ==1.4.3
+  - amazonka-apigateway ==1.4.3
+  - amazonka-application-autoscaling ==1.4.3
+  - amazonka-autoscaling ==1.4.3
+  - amazonka-certificatemanager ==1.4.3
+  - amazonka-cloudformation ==1.4.3
+  - amazonka-cloudfront ==1.4.3
+  - amazonka-cloudhsm ==1.4.3
+  - amazonka-cloudsearch ==1.4.3
+  - amazonka-cloudsearch-domains ==1.4.3
+  - amazonka-cloudtrail ==1.4.3
+  - amazonka-cloudwatch ==1.4.3
+  - amazonka-cloudwatch-events ==1.4.3
+  - amazonka-cloudwatch-logs ==1.4.3
+  - amazonka-codecommit ==1.4.3
+  - amazonka-codedeploy ==1.4.3
+  - amazonka-codepipeline ==1.4.3
+  - amazonka-cognito-identity ==1.4.3
+  - amazonka-cognito-idp ==1.4.3
+  - amazonka-cognito-sync ==1.4.3
+  - amazonka-config ==1.4.3
+  - amazonka-core ==1.4.3
+  - amazonka-datapipeline ==1.4.3
+  - amazonka-devicefarm ==1.4.3
+  - amazonka-directconnect ==1.4.3
+  - amazonka-discovery ==1.4.3
+  - amazonka-dms ==1.4.3
+  - amazonka-ds ==1.4.3
+  - amazonka-dynamodb ==1.4.3
+  - amazonka-dynamodb-streams ==1.4.3
+  - amazonka-ec2 ==1.4.3
+  - amazonka-ecr ==1.4.3
+  - amazonka-ecs ==1.4.3
+  - amazonka-efs ==1.4.3
+  - amazonka-elasticache ==1.4.3
+  - amazonka-elasticbeanstalk ==1.4.3
+  - amazonka-elasticsearch ==1.4.3
+  - amazonka-elastictranscoder ==1.4.3
+  - amazonka-elb ==1.4.3
+  - amazonka-emr ==1.4.3
+  - amazonka-gamelift ==1.4.3
+  - amazonka-glacier ==1.4.3
+  - amazonka-iam ==1.4.3
+  - amazonka-importexport ==1.4.3
+  - amazonka-inspector ==1.4.3
+  - amazonka-iot ==1.4.3
+  - amazonka-iot-dataplane ==1.4.3
+  - amazonka-kinesis ==1.4.3
+  - amazonka-kinesis-firehose ==1.4.3
+  - amazonka-kms ==1.4.3
+  - amazonka-lambda ==1.4.3
+  - amazonka-marketplace-analytics ==1.4.3
+  - amazonka-marketplace-metering ==1.4.3
+  - amazonka-ml ==1.4.3
+  - amazonka-opsworks ==1.4.3
+  - amazonka-rds ==1.4.3
+  - amazonka-redshift ==1.4.3
+  - amazonka-route53 ==1.4.3
+  - amazonka-route53-domains ==1.4.3
+  - amazonka-s3 ==1.4.3
+  - amazonka-sdb ==1.4.3
+  - amazonka-ses ==1.4.3
+  - amazonka-sns ==1.4.3
+  - amazonka-sqs ==1.4.3
+  - amazonka-ssm ==1.4.3
+  - amazonka-storagegateway ==1.4.3
+  - amazonka-sts ==1.4.3
+  - amazonka-support ==1.4.3
+  - amazonka-swf ==1.4.3
+  - amazonka-test ==1.4.3
+  - amazonka-waf ==1.4.3
+  - amazonka-workspaces ==1.4.3
+  - amqp ==0.14.0
+  - angel ==0.6.2
+  - annotated-wl-pprint ==0.7.0
+  - anonymous-sums ==0.4.0.0
+  - ansi-terminal ==0.6.2.3
+  - ansi-wl-pprint ==0.6.7.3
+  - ansigraph ==0.2.0.0
+  - api-field-json-th ==0.1.0.1
+  - app-settings ==0.2.0.7
+  - appar ==0.1.4
+  - apply-refact ==0.3.0.0
+  - arbtt ==0.9.0.10
+  - arithmoi ==0.4.2.0
+  - array-memoize ==0.6.0
+  - arrow-list ==0.7
+  - ascii-progress ==0.3.3.0
+  - asciidiagram ==1.3.1.2
+  - asn1-encoding ==0.9.4
+  - asn1-parse ==0.9.4
+  - asn1-types ==0.3.2
+  - async ==2.1.0
+  - async-dejafu ==0.1.3.0
+  - atndapi ==0.1.1.0
+  - atom-conduit ==0.3.1.2
+  - atomic-primops ==0.8.0.4
+  - atomic-write ==0.2.0.5
+  - attoparsec ==0.13.0.2
+  - attoparsec-binary ==0.2
+  - attoparsec-expr ==0.1.1.2
+  - authenticate ==1.3.3.2
+  - authenticate-oauth ==1.5.1.2
+  - auto ==0.4.3.0
+  - auto-update ==0.1.4
+  - autoexporter ==0.2.2
+  - aws ==0.14.0
+  - b9 ==0.5.21
+  - bake ==0.4
+  - bank-holidays-england ==0.1.0.5
+  - base-compat ==0.9.1
+  - base-noprelude ==4.9.0.0
+  - base-orphans ==0.5.4
+  - base-prelude ==1.0.1.1
+  - base-unicode-symbols ==0.2.2.4
+  - base16-bytestring ==0.1.1.6
+  - base32string ==0.9.1
+  - base58string ==0.10.0
+  - base64-bytestring ==1.0.0.1
+  - base64-string ==0.2
+  - basic-prelude ==0.6.1
+  - bcrypt ==0.0.9
+  - benchpress ==0.2.2.8
+  - bencode ==0.6.0.0
+  - bento ==0.1.0
+  - bifunctors ==5.4.1
+  - bimap ==0.3.2
+  - bimap-server ==0.1.0.1
+  - binary-bits ==0.5
+  - binary-conduit ==1.2.4.1
+  - binary-list ==1.1.1.2
+  - binary-orphans ==0.1.5.1
+  - binary-parser ==0.5.2
+  - binary-search ==1.0.0.3
+  - binary-tagged ==0.1.4.0
+  - binary-typed ==1.0
+  - bindings-DSL ==1.0.23
+  - bindings-GLFW ==3.1.2.1
+  - bindings-libzip ==1.0.1
+  - bioace ==0.0.1
+  - bioalign ==0.0.5
+  - biocore ==0.3.1
+  - biofasta ==0.0.3
+  - biofastq ==0.1
+  - biopsl ==0.4
+  - bitcoin-api ==0.12.1
+  - bitcoin-api-extra ==0.9.1
+  - bitcoin-block ==0.13.1
+  - bitcoin-payment-channel ==0.3.0.1
+  - bitcoin-script ==0.11.1
+  - bitcoin-tx ==0.13.1
+  - bitcoin-types ==0.9.2
+  - bits ==0.5
+  - bitx-bitcoin ==0.10.0.0
+  - blake2 ==0.2.0
+  - blank-canvas ==0.6
+  - BlastHTTP ==1.2.0
+  - blastxml ==0.3.2
+  - blaze-bootstrap ==0.1.0.1
+  - blaze-builder ==0.4.0.2
+  - blaze-html ==0.8.1.2
+  - blaze-markup ==0.7.1.0
+  - blaze-svg ==0.3.6
+  - blaze-textual ==0.2.1.0
+  - bloodhound ==0.11.0.0
+  - blosum ==0.1.1.2
+  - bmp ==1.2.6.3
+  - Boolean ==0.2.3
+  - boolsimplifier ==0.1.8
+  - boomerang ==1.4.5.2
+  - both ==0.1.1.0
+  - BoundedChan ==1.0.3.0
+  - boundingboxes ==0.2.3
+  - bower-json ==0.8.0
+  - boxes ==0.1.4
+  - broadcast-chan ==0.1.1
+  - bson ==0.3.2.3
+  - bson-lens ==0.1.1
+  - btrfs ==0.1.2.0
+  - bumper ==0.6.0.3
+  - bustle ==0.5.4
+  - byteable ==0.1.1
+  - bytedump ==1.0
+  - byteorder ==1.0.4
+  - bytes ==0.15.2
+  - byteset ==0.1.1.0
+  - bytestring-builder ==0.10.8.1.0
+  - bytestring-conversion ==0.3.1
+  - bytestring-handle ==0.1.0.4
+  - bytestring-lexing ==0.5.0.2
+  - bytestring-progress ==1.0.6
+  - bytestring-tree-builder ==0.2.7.1
+  - bytestring-trie ==0.2.4.1
+  - bzlib ==0.5.0.5
+  - bzlib-conduit ==0.2.1.4
+  - c2hs ==0.28.1
+  - Cabal ==1.24.0.0
+  - cabal-dependency-licenses ==0.1.2.0
+  - cabal-file-th ==0.2.3
+  - cabal-helper ==0.7.2.0
+  - cabal-install ==1.24.0.0
+  - cabal-rpm ==0.10.0
+  - cabal-sort ==0.0.5.3
+  - cabal-src ==0.3.0.1
+  - cabal2nix ==2.0.1
+  - cache ==0.1.0.0
+  - cacophony ==0.8.0
+  - cairo ==0.13.3.0
+  - camfort ==0.900
+  - carray ==0.1.6.5
+  - cartel ==0.18.0.2
+  - case-insensitive ==1.2.0.7
+  - cased ==0.1.0.0
+  - cases ==0.1.3.1
+  - cassava ==0.4.5.0
+  - cassava-conduit ==0.3.2
+  - cassava-megaparsec ==0.1.0
+  - cassette ==0.1.0
+  - cayley-client ==0.2.0.0
+  - cereal ==0.5.3.0
+  - cereal-conduit ==0.7.3
+  - cereal-vector ==0.2.0.1
+  - cgi ==3001.3.0.1
+  - ChannelT ==0.0.0.2
+  - charset ==0.3.7.1
+  - charsetdetect-ae ==1.1.0.1
+  - Chart ==1.8
+  - Chart-cairo ==1.8
+  - Chart-diagrams ==1.8
+  - ChasingBottoms ==1.3.1.1
+  - cheapskate ==0.1.0.5
+  - cheapskate-highlight ==0.1.0.0
+  - cheapskate-lucid ==0.1.0.0
+  - check-email ==1.0
+  - checkers ==0.4.5
+  - chell ==0.4.0.1
+  - chell-quickcheck ==0.2.5
+  - chunked-data ==0.3.0
+  - cipher-aes ==0.2.11
+  - cipher-aes128 ==0.7.0.3
+  - cipher-blowfish ==0.0.3
+  - cipher-camellia ==0.0.2
+  - cipher-des ==0.0.6
+  - cipher-rc4 ==0.1.4
+  - circle-packing ==0.1.0.5
+  - clash-lib ==0.6.21
+  - clash-prelude ==0.10.14
+  - clash-systemverilog ==0.6.9
+  - clash-verilog ==0.6.9
+  - clash-vhdl ==0.6.16
+  - classy-prelude ==1.0.0.2
+  - classy-prelude-conduit ==1.0.0
+  - classy-prelude-yesod ==1.0.0
+  - clay ==0.11
+  - clckwrks ==0.23.19.1
+  - clckwrks-cli ==0.2.16
+  - clckwrks-plugin-media ==0.6.16
+  - clckwrks-plugin-page ==0.4.3.4
+  - clckwrks-theme-bootstrap ==0.4.2
+  - cli ==0.1.2
+  - clientsession ==0.9.1.2
+  - Clipboard ==2.3.0.1
+  - clock ==0.7.2
+  - clumpiness ==0.17.0.0
+  - ClustalParser ==1.1.4
+  - clustering ==0.2.1
+  - cmark ==0.5.3.1
+  - cmark-highlight ==0.2.0.0
+  - cmark-lucid ==0.1.0.0
+  - cmdargs ==0.10.14
+  - code-builder ==0.1.3
+  - codo-notation ==0.5.2
+  - colour ==2.3.3
+  - commutative ==0.0.1.4
+  - comonad ==5
+  - comonad-transformers ==4.0
+  - comonads-fd ==4.0
+  - compactmap ==0.1.4.1
+  - compdata ==0.10.1
+  - composition ==1.0.2.1
+  - composition-extra ==2.0.0
+  - concatenative ==1.0.1
+  - concurrency ==1.0.0.0
+  - concurrent-extra ==0.7.0.10
+  - concurrent-output ==1.7.7
+  - concurrent-supply ==0.1.8
+  - conduit ==1.2.7
+  - conduit-combinators ==1.0.6
+  - conduit-extra ==1.1.13.2
+  - conduit-iconv ==0.1.1.1
+  - conduit-parse ==0.1.2.0
+  - ConfigFile ==1.1.4
+  - configuration-tools ==0.2.14
+  - configurator ==0.3.0.0
+  - configurator-export ==0.1.0.1
+  - connection ==0.2.6
+  - constraints ==0.8
+  - consul-haskell ==0.3
+  - containers-unicode-symbols ==0.3.1.1
+  - continued-fractions ==0.9.1.1
+  - contravariant ==1.4
+  - contravariant-extras ==0.3.3.1
+  - control-bool ==0.2.1
+  - control-monad-free ==0.6.1
+  - control-monad-loop ==0.1
+  - control-monad-omega ==0.3.1
+  - converge ==0.1.0.1
+  - convertible ==1.1.1.0
+  - cookie ==0.4.2.1
+  - countable ==1.0
+  - courier ==0.1.1.4
+  - cpphs ==1.20.2
+  - cprng-aes ==0.6.1
+  - cpu ==0.1.2
+  - crackNum ==1.5
+  - criterion ==1.1.1.0
+  - cron ==0.4.1.2
+  - crypto-api ==0.13.2
+  - crypto-api-tests ==0.3
+  - crypto-cipher-tests ==0.0.11
+  - crypto-cipher-types ==0.0.9
+  - crypto-numbers ==0.2.7
+  - crypto-pubkey ==0.2.8
+  - crypto-pubkey-types ==0.4.3
+  - crypto-random ==0.0.9
+  - crypto-random-api ==0.2.0
+  - cryptocipher ==0.6.2
+  - cryptohash ==0.11.9
+  - cryptohash-conduit ==0.1.1
+  - cryptohash-cryptoapi ==0.1.4
+  - cryptohash-sha256 ==0.11.100.1
+  - cryptol ==2.4.0
+  - cryptonite ==0.19
+  - cryptonite-conduit ==0.1
+  - css-syntax ==0.0.5
+  - css-text ==0.1.2.2
+  - csv ==0.1.2
+  - ctrie ==0.1.1.0
+  - cubicspline ==0.1.2
+  - curl ==1.3.8
+  - darcs ==2.12.3
+  - data-accessor ==0.2.2.7
+  - data-accessor-mtl ==0.2.0.4
+  - data-binary-ieee754 ==0.4.4
+  - data-check ==0.1.0
+  - data-default ==0.7.1.1
+  - data-default-class ==0.1.2.0
+  - data-default-instances-containers ==0.0.1
+  - data-default-instances-dlist ==0.0.1
+  - data-default-instances-old-locale ==0.0.1
+  - data-hash ==0.2.0.1
+  - data-inttrie ==0.1.2
+  - data-lens-light ==0.1.2.2
+  - data-memocombinators ==0.5.1
+  - data-or ==1.0.0.5
+  - data-ordlist ==0.4.7.0
+  - data-reify ==0.6.1
+  - dataurl ==0.1.0.0
+  - DAV ==1.3.1
+  - dawg-ord ==0.5.0.2
+  - dbus ==0.10.12
+  - debian-build ==0.10.1.0
+  - Decimal ==0.4.2
+  - declarative ==0.2.2
+  - deepseq-generics ==0.2.0.0
+  - dejafu ==0.4.0.0
+  - dependent-map ==0.2.3.0
+  - dependent-sum ==0.3.2.2
+  - dependent-sum-template ==0.0.0.5
+  - derive ==2.5.26
+  - deriving-compat ==0.3.3
+  - descriptive ==0.9.4
+  - diagrams ==1.3.0.1
+  - diagrams-cairo ==1.3.1.1
+  - diagrams-canvas ==1.3.0.6
+  - diagrams-contrib ==1.3.0.12
+  - diagrams-core ==1.3.0.8
+  - diagrams-gtk ==1.3.0.2
+  - diagrams-html5 ==1.3.0.7
+  - diagrams-lib ==1.3.1.4
+  - diagrams-postscript ==1.3.0.7
+  - diagrams-rasterific ==1.3.1.8
+  - diagrams-solve ==0.1.0.1
+  - diagrams-svg ==1.4.0.3
+  - dice ==0.1
+  - Diff ==0.3.4
+  - diff3 ==0.2.0.3
+  - digest ==0.0.1.2
+  - digits ==0.3.1
+  - dimensional ==1.0.1.2
+  - direct-sqlite ==2.3.17
+  - directory-tree ==0.12.1
+  - discount ==0.1.1
+  - disk-free-space ==0.1.0.1
+  - distributed-closure ==0.3.1.0
+  - distributed-static ==0.3.5.0
+  - distribution-nixpkgs ==1.0.0.1
+  - distributive ==0.5.0.2
+  - diversity ==0.8.0.1
+  - djinn-ghc ==0.0.2.3
+  - djinn-lib ==0.0.1.2
+  - dlist ==0.8.0.2
+  - dlist-instances ==0.1.1.1
+  - dns ==2.0.5
+  - do-list ==1.0.0
+  - dockerfile ==0.1.0.1
+  - docopt ==0.7.0.4
+  - doctest ==0.11.0
+  - doctest-discover ==0.1.0.7
+  - doctest-prop ==0.2.0.1
+  - docvim ==0.3.2.1
+  - dotenv ==0.3.0.3
+  - dotnet-timespan ==0.0.1.0
+  - double-conversion ==2.0.1.0
+  - download ==0.3.2.4
+  - dpor ==0.2.0.0
+  - drawille ==0.1.0.6
+  - DRBG ==0.5.5
+  - drifter ==0.2.2
+  - drifter-postgresql ==0.0.2
+  - dual-tree ==0.2.0.9
+  - dynamic-state ==0.2.2.0
+  - dyre ==0.8.12
+  - Earley ==0.11.0.1
+  - easy-file ==0.2.1
+  - Ebnf2ps ==1.0.15
+  - ed25519 ==0.0.5.0
+  - ede ==0.2.8.5
+  - EdisonAPI ==1.3.1
+  - EdisonCore ==1.3.1.1
+  - edit-distance ==0.2.2.1
+  - editor-open ==0.6.0.0
+  - effect-handlers ==0.1.0.8
+  - either ==4.4.1.1
+  - either-unwrap ==1.1
+  - ekg ==0.4.0.11
+  - ekg-core ==0.1.1.1
+  - ekg-json ==0.1.0.3
+  - elerea ==2.9.0
+  - elm-bridge ==0.3.0.2
+  - elm-core-sources ==1.0.0
+  - email-validate ==2.2.0
+  - emailaddress ==0.1.6.0
+  - enclosed-exceptions ==1.0.2
+  - encoding-io ==0.0.1
+  - entropy ==0.3.7
+  - enummapset-th ==0.6.1.1
+  - envelope ==0.1.0.0
+  - eq ==4.0.4
+  - equivalence ==0.3.1
+  - erf ==2.0.0.0
+  - errors ==2.1.2
+  - ersatz ==0.3.1
+  - etcd ==1.0.5
+  - ether ==0.4.0.2
+  - euphoria ==0.8.0.0
+  - event ==0.1.4
+  - eventstore ==0.13.1.2
+  - exact-combinatorics ==0.2.0.8
+  - exact-pi ==0.4.1.2
+  - exception-mtl ==0.4.0.1
+  - exception-transformers ==0.4.0.4
+  - exceptional ==0.3.0.0
+  - exceptions ==0.8.3
+  - executable-hash ==0.2.0.2
+  - executable-path ==0.0.3
+  - exp-pairs ==0.1.5.1
+  - expiring-cache-map ==0.0.6.1
+  - explicit-exception ==0.1.8
+  - extensible ==0.3.7
+  - extensible-effects ==1.11.0.4
+  - extensible-exceptions ==0.1.1.4
+  - extra ==1.4.10
+  - extract-dependencies ==0.2.0.1
+  - fail ==4.9.0.0
+  - farmhash ==0.1.0.5
+  - fast-builder ==0.0.0.6
+  - fast-digits ==0.2.1.0
+  - fast-logger ==2.4.6
+  - fasta ==0.10.4.0
+  - fay ==0.23.1.12
+  - fay-base ==0.20.0.1
+  - fay-builder ==0.2.0.5
+  - fay-dom ==0.5.0.1
+  - fay-jquery ==0.6.1.0
+  - fay-text ==0.3.2.2
+  - fay-uri ==0.2.0.0
+  - fb ==1.0.13
+  - fclabels ==2.0.3
+  - feature-flags ==0.1.0.1
+  - feed ==0.3.11.1
+  - FenwickTree ==0.1.2.1
+  - fft ==0.1.8.4
+  - fgl ==5.5.3.0
+  - fgl-arbitrary ==0.2.0.2
+  - file-embed ==0.0.10
+  - file-modules ==0.1.2.4
+  - filecache ==0.2.9
+  - filelock ==0.1.0.1
+  - filemanip ==0.3.6.3
+  - find-clumpiness ==0.2.0.1
+  - FindBin ==0.0.5
+  - fingertree ==0.1.1.0
+  - fingertree-psqueue ==0.3
+  - fixed ==0.2.1.1
+  - fixed-vector ==0.8.1.0
+  - fixed-vector-hetero ==0.3.1.1
+  - flat-mcmc ==1.0.1
+  - flexible-defaults ==0.0.1.2
+  - flock ==0.3.1.8
+  - flow ==1.0.7
+  - fmlist ==0.9
+  - fn ==0.3.0.1
+  - focus ==0.1.5
+  - fold-debounce ==0.2.0.2
+  - fold-debounce-conduit ==0.1.0.2
+  - foldl ==1.2.1
+  - FontyFruity ==0.5.3.2
+  - force-layout ==0.4.0.5
+  - forecast-io ==0.2.0.0
+  - foreign-store ==0.2
+  - formatting ==6.2.2
+  - fortran-src ==0.1.0.3
+  - Frames ==0.1.6
+  - free ==4.12.4
+  - free-vl ==0.1.4
+  - freenect ==1.2.1
+  - freer ==0.2.3.0
+  - friendly-time ==0.4
+  - frisby ==0.2
+  - frontmatter ==0.1.0.2
+  - fsnotify ==0.2.1
+  - fsnotify-conduit ==0.1.0.0
+  - funcmp ==1.8
+  - fuzzcheck ==0.1.1
+  - gamma ==0.9.0.2
+  - gd ==3000.7.3
+  - Genbank ==1.0.3
+  - generic-aeson ==0.2.0.8
+  - generic-deriving ==1.11.1
+  - generic-xmlpickler ==0.1.0.5
+  - GenericPretty ==1.2.1
+  - generics-eot ==0.2.1.1
+  - generics-sop ==0.2.2.0
+  - generics-sop-lens ==0.1.2.0
+  - geniplate-mirror ==0.7.4
+  - getopt-generics ==0.13
+  - ghc-events ==0.4.4.0
+  - ghc-exactprint ==0.5.2.1
+  - ghc-heap-view ==0.5.7
+  - ghc-mod ==5.6.0.0
+  - ghc-paths ==0.1.0.9
+  - ghc-syb-utils ==0.2.3
+  - ghc-tcplugins-extra ==0.2
+  - ghc-typelits-extra ==0.2
+  - ghc-typelits-knownnat ==0.2.1
+  - ghc-typelits-natnormalise ==0.5
+  - ghcid ==0.6.5
+  - ghcjs-codemirror ==0.0.0.1
+  - ghcjs-hplay ==0.3.4
+  - ghcjs-perch ==0.3.3
+  - gi-atk ==2.0.3
+  - gi-cairo ==1.0.3
+  - gi-gdk ==3.0.3
+  - gi-gdkpixbuf ==2.0.3
+  - gi-gio ==2.0.3
+  - gi-glib ==2.0.3
+  - gi-gobject ==2.0.3
+  - gi-gtk ==3.0.3
+  - gi-javascriptcore ==3.0.3
+  - gi-pango ==1.0.3
+  - gi-soup ==2.4.3
+  - gi-webkit ==3.0.3
+  - gio ==0.13.3.0
+  - gipeda ==0.3.2.2
+  - giphy-api ==0.4.0.0
+  - git-fmt ==0.4.1.0
+  - github-types ==0.2.1
+  - github-webhook-handler ==0.0.8
+  - gitlib ==3.1.1
+  - gitlib-libgit2 ==3.1.1
+  - gitlib-test ==3.1.0.3
+  - gitrev ==1.2.0
+  - gitson ==0.5.2
+  - gl ==0.7.8.1
+  - glabrous ==0.1.2.0
+  - GLFW-b ==1.4.8.0
+  - glib ==0.13.4.0
+  - Glob ==0.7.11
+  - gloss ==1.10.2.3
+  - gloss-rendering ==1.10.3.3
+  - GLURaw ==2.0.0.2
+  - GLUT ==2.7.0.10
+  - gogol ==0.1.0
+  - gogol-adexchange-buyer ==0.1.0
+  - gogol-adexchange-seller ==0.1.0
+  - gogol-admin-datatransfer ==0.1.0
+  - gogol-admin-directory ==0.1.0
+  - gogol-admin-emailmigration ==0.1.0
+  - gogol-admin-reports ==0.1.0
+  - gogol-adsense ==0.1.0
+  - gogol-adsense-host ==0.1.0
+  - gogol-affiliates ==0.1.0
+  - gogol-analytics ==0.1.0
+  - gogol-android-enterprise ==0.1.0
+  - gogol-android-publisher ==0.1.0
+  - gogol-appengine ==0.1.0
+  - gogol-apps-activity ==0.1.0
+  - gogol-apps-calendar ==0.1.0
+  - gogol-apps-licensing ==0.1.0
+  - gogol-apps-reseller ==0.1.0
+  - gogol-apps-tasks ==0.1.0
+  - gogol-appstate ==0.1.0
+  - gogol-autoscaler ==0.1.0
+  - gogol-bigquery ==0.1.0
+  - gogol-billing ==0.1.0
+  - gogol-blogger ==0.1.0
+  - gogol-books ==0.1.0
+  - gogol-civicinfo ==0.1.0
+  - gogol-classroom ==0.1.0
+  - gogol-cloudmonitoring ==0.1.0
+  - gogol-cloudtrace ==0.1.0
+  - gogol-compute ==0.1.0
+  - gogol-container ==0.1.0
+  - gogol-core ==0.1.0
+  - gogol-customsearch ==0.1.0
+  - gogol-dataflow ==0.1.0
+  - gogol-dataproc ==0.1.0
+  - gogol-datastore ==0.1.0
+  - gogol-debugger ==0.1.0
+  - gogol-deploymentmanager ==0.1.0
+  - gogol-dfareporting ==0.1.0
+  - gogol-discovery ==0.1.0
+  - gogol-dns ==0.1.0
+  - gogol-doubleclick-bids ==0.1.0
+  - gogol-doubleclick-search ==0.1.0
+  - gogol-drive ==0.1.0
+  - gogol-firebase-rules ==0.1.0
+  - gogol-fitness ==0.1.0
+  - gogol-fonts ==0.1.0
+  - gogol-freebasesearch ==0.1.0
+  - gogol-fusiontables ==0.1.0
+  - gogol-games ==0.1.0
+  - gogol-games-configuration ==0.1.0
+  - gogol-games-management ==0.1.0
+  - gogol-genomics ==0.1.0
+  - gogol-gmail ==0.1.0
+  - gogol-groups-migration ==0.1.0
+  - gogol-groups-settings ==0.1.0
+  - gogol-identity-toolkit ==0.1.0
+  - gogol-kgsearch ==0.1.0
+  - gogol-latencytest ==0.1.0
+  - gogol-logging ==0.1.0
+  - gogol-maps-coordinate ==0.1.0
+  - gogol-maps-engine ==0.1.0
+  - gogol-mirror ==0.1.0
+  - gogol-monitoring ==0.1.0
+  - gogol-oauth2 ==0.1.0
+  - gogol-pagespeed ==0.1.0
+  - gogol-partners ==0.1.0
+  - gogol-people ==0.1.0
+  - gogol-play-moviespartner ==0.1.0
+  - gogol-plus ==0.1.0
+  - gogol-plus-domains ==0.1.0
+  - gogol-prediction ==0.1.0
+  - gogol-proximitybeacon ==0.1.0
+  - gogol-pubsub ==0.1.0
+  - gogol-qpxexpress ==0.1.0
+  - gogol-replicapool ==0.1.0
+  - gogol-replicapool-updater ==0.1.0
+  - gogol-resourcemanager ==0.1.0
+  - gogol-resourceviews ==0.1.0
+  - gogol-script ==0.1.0
+  - gogol-sheets ==0.1.0
+  - gogol-shopping-content ==0.1.0
+  - gogol-siteverification ==0.1.0
+  - gogol-spectrum ==0.1.0
+  - gogol-sqladmin ==0.1.0
+  - gogol-storage ==0.1.0
+  - gogol-storage-transfer ==0.1.0
+  - gogol-tagmanager ==0.1.0
+  - gogol-taskqueue ==0.1.0
+  - gogol-translate ==0.1.0
+  - gogol-urlshortener ==0.1.0
+  - gogol-useraccounts ==0.1.0
+  - gogol-vision ==0.1.0
+  - gogol-webmaster-tools ==0.1.0
+  - gogol-youtube ==0.1.0
+  - gogol-youtube-analytics ==0.1.0
+  - gogol-youtube-reporting ==0.1.0
+  - google-cloud ==0.0.4
+  - google-oauth2-jwt ==0.1.2.0
+  - gpolyline ==0.1.0.1
+  - graph-core ==0.3.0.0
+  - graph-wrapper ==0.2.5.1
+  - graphs ==0.7
+  - GraphSCC ==1.0.4
+  - graphviz ==2999.18.1.2
+  - gravatar ==0.8.0
+  - graylog ==0.1.0.1
+  - groom ==0.1.2
+  - grouped-list ==0.2.1.2
+  - groupoids ==4.0
+  - groups ==0.4.0.0
+  - gtk ==0.14.5
+  - gtk2hs-buildtools ==0.13.2.1
+  - gtk3 ==0.14.5
+  - gtksourceview3 ==0.13.3.0
+  - H ==0.9.0.1
+  - hackage-db ==1.22
+  - hackage-mirror ==0.1.1.1
+  - hackage-security ==0.5.2.2
+  - hackage-whatsnew ==0.1.0.1
+  - hackmanager ==0.1.0.0
+  - haddock-api ==2.17.3
+  - haddock-library ==1.4.2
+  - hailgun ==0.4.1.0
+  - half ==0.2.2.3
+  - hamlet ==1.2.0
+  - HandsomeSoup ==0.4.2
+  - handwriting ==0.1.0.3
+  - hapistrano ==0.2.1.2
+  - happstack-authenticate ==2.3.4.4
+  - happstack-clientsession ==7.3.1
+  - happstack-hsp ==7.3.7
+  - happstack-jmacro ==7.0.11
+  - happstack-server ==7.4.6.2
+  - happstack-server-tls ==7.1.6.2
+  - happy ==1.19.5
+  - HaRe ==0.8.3.0
+  - harp ==0.4.2
+  - hashable ==1.2.4.0
+  - hashable-extras ==0.2.3
+  - hashable-time ==0.2
+  - hashmap ==1.3.1.1
+  - hashtables ==1.2.1.0
+  - haskeline ==0.7.2.3
+  - haskell-gi ==0.18
+  - haskell-gi-base ==0.18.2
+  - haskell-lexer ==1.0.1
+  - haskell-names ==0.7.0
+  - haskell-neo4j-client ==0.3.2.2
+  - haskell-packages ==0.4
+  - haskell-spacegoo ==0.2.0.1
+  - haskell-src ==1.0.2.0
+  - haskell-src-exts ==1.17.1
+  - haskell-src-meta ==0.6.0.14
+  - HaskellNet ==0.5.1
+  - HaskellNet-SSL ==0.3.3.0
+  - haskintex ==0.6.0.1
+  - haskoin-core ==0.4.0
+  - hasql ==0.19.15
+  - hastache ==0.6.1
+  - hasty-hamiltonian ==1.1.3
+  - HaTeX ==3.17.0.2
+  - hatex-guide ==1.3.1.5
+  - hbayes ==0.5.2
+  - hbeanstalk ==0.2.4
+  - Hclip ==3.0.0.4
+  - HCodecs ==0.5
+  - hdaemonize ==0.5.2
+  - HDBC ==2.4.0.1
+  - HDBC-session ==0.1.1.0
+  - hdevtools ==0.1.4.1
+  - heap ==1.0.3
+  - heaps ==0.3.3
+  - hebrew-time ==0.1.1
+  - hedis ==0.9.3
+  - here ==1.2.8
+  - heredoc ==0.2.0.0
+  - hex ==0.1.2
+  - hexstring ==0.11.1
+  - hflags ==0.4.2
+  - hformat ==0.1.0.1
+  - hfsevents ==0.1.6
+  - hgettext ==0.1.30
+  - hid ==0.2.2
+  - hidapi ==0.1.4
+  - hierarchical-clustering ==0.4.6
+  - highlighting-kate ==0.6.2.1
+  - hindent ==4.6.4
+  - hinotify ==0.3.8.1
+  - hint ==0.6.0
+  - histogram-fill ==0.8.4.1
+  - hit ==0.6.3
+  - hjsmin ==0.2.0.2
+  - hjsonpointer ==1.0.0.0
+  - hjsonschema ==1.1.0.1
+  - hledger ==0.27.1
+  - hledger-interest ==1.4.4
+  - hledger-lib ==0.27.1
+  - hlibgit2 ==0.18.0.15
+  - hlibsass ==0.1.5.0
+  - hlint ==1.9.35
+  - hmatrix ==0.17.0.2
+  - hmatrix-gsl ==0.17.0.0
+  - hmatrix-gsl-stats ==0.4.1.3
+  - hmatrix-special ==0.4.0.0
+  - hmpfr ==0.4.2
+  - hmt ==0.15
+  - hoauth2 ==0.5.4.0
+  - hocilib ==0.1.0
+  - holy-project ==0.2.0.1
+  - homplexity ==0.4.3.3
+  - hoogle ==5.0.1
+  - hOpenPGP ==2.5.1
+  - hopenpgp-tools ==0.19.2
+  - hopenssl ==1.7
+  - hosc ==0.15
+  - hostname ==1.0
+  - hostname-validate ==1.0.0
+  - hourglass ==0.2.10
+  - hpack ==0.14.1
+  - hpack-convert ==0.14.6
+  - hpc-coveralls ==1.0.6
+  - hPDB ==1.2.0.9
+  - hPDB-examples ==1.2.0.7
+  - HPDF ==1.4.10
+  - hpio ==0.8.0.3
+  - hprotoc ==2.4.0
+  - hquantlib ==0.0.3.2
+  - hreader ==1.0.2
+  - hruby ==0.3.4.2
+  - hs-bibutils ==5.5
+  - hs-GeoIP ==0.3
+  - hsass ==0.4.0
+  - hsb2hs ==0.3.1
+  - hscolour ==1.24.1
+  - hsdns ==1.6.1
+  - hse-cpp ==0.1
+  - hsebaysdk ==0.4.0.0
+  - hsemail ==1.7.7
+  - HSet ==0.0.0
+  - hset ==2.2.0
+  - hsexif ==0.6.0.8
+  - hsignal ==0.2.7.4
+  - hslogger ==1.2.10
+  - hslua ==0.4.1
+  - hsndfile ==0.8.0
+  - hsndfile-vector ==0.5.2
+  - HsOpenSSL ==0.11.1.1
+  - HsOpenSSL-x509-system ==0.1.0.3
+  - hsp ==0.10.0
+  - hspec ==2.2.3
+  - hspec-attoparsec ==0.1.0.2
+  - hspec-contrib ==0.3.0
+  - hspec-core ==2.2.3
+  - hspec-discover ==2.2.3
+  - hspec-expectations ==0.7.2
+  - hspec-expectations-pretty-diff ==0.7.2.4
+  - hspec-golden-aeson ==0.2.0.3
+  - hspec-jenkins ==0.1.1
+  - hspec-megaparsec ==0.2.1
+  - hspec-meta ==2.2.1
+  - hspec-setup ==0.1.1.1
+  - hspec-smallcheck ==0.4.1
+  - hspec-wai ==0.6.6
+  - hspec-wai-json ==0.6.1
+  - hspec-webdriver ==1.2.0
+  - hstatistics ==0.2.5.3
+  - hstatsd ==0.1
+  - HStringTemplate ==0.8.5
+  - hsx-jmacro ==7.3.8
+  - hsx2hs ==0.13.5
+  - hsyslog ==4
+  - htaglib ==1.0.4
+  - HTF ==0.13.1.0
+  - html ==1.0.1.2
+  - html-conduit ==1.2.1
+  - htoml ==1.0.0.1
+  - HTTP ==4000.3.3
+  - http-api-data ==0.2.4
+  - http-client ==0.4.31.1
+  - http-client-openssl ==0.2.0.3
+  - http-client-tls ==0.2.4.1
+  - http-common ==0.8.2.0
+  - http-conduit ==2.1.11
+  - http-date ==0.0.6.1
+  - http-link-header ==1.0.2
+  - http-media ==0.6.4
+  - http-reverse-proxy ==0.4.3.1
+  - http-streams ==0.8.4.0
+  - http-types ==0.9.1
+  - http2 ==1.6.2
+  - httpd-shed ==0.4.0.3
+  - human-readable-duration ==0.2.0.3
+  - HUnit ==1.3.1.2
+  - HUnit-approx ==1.0
+  - hunit-dejafu ==0.3.0.2
+  - hvect ==0.3.1.0
+  - hw-bits ==0.1.0.0
+  - hw-conduit ==0.0.0.11
+  - hw-diagnostics ==0.0.0.3
+  - hw-parser ==0.0.0.1
+  - hw-prim ==0.1.0.0
+  - hw-rankselect ==0.3.0.0
+  - hw-succinct ==0.0.0.14
+  - hweblib ==0.6.3
+  - hworker ==0.1.0.1
+  - hworker-ses ==0.1.1.0
+  - hxt ==9.3.1.15
+  - hxt-charproperties ==9.2.0.1
+  - hxt-css ==0.1.0.3
+  - hxt-http ==9.1.5.2
+  - hxt-pickle-utils ==0.1.0.3
+  - hxt-regex-xmlschema ==9.2.0.2
+  - hxt-unicode ==9.0.2.4
+  - hybrid-vectors ==0.2.1
+  - hyphenation ==0.6
+  - ical ==0.0.1
+  - iconv ==0.4.1.3
+  - identicon ==0.1.0
+  - idris ==0.12.2
+  - ieee754 ==0.7.8
+  - IfElse ==0.85
+  - ignore ==0.1.1.0
+  - ilist ==0.2.0.0
+  - imagesize-conduit ==1.1
+  - imm ==1.0.1.0
+  - immortal ==0.2.2
+  - include-file ==0.1.0.3
+  - incremental-parser ==0.2.4.1
+  - indentation-core ==0.0
+  - indentation-parsec ==0.0
+  - indents ==0.3.3
+  - inflections ==0.2.0.1
+  - ini ==0.3.5
+  - inline-c ==0.5.5.7
+  - inline-c-cpp ==0.1.0.0
+  - inline-r ==0.9.0.0
+  - insert-ordered-containers ==0.1.0.1
+  - integration ==0.2.1
+  - intero ==0.1.18
+  - interpolate ==0.1.0
+  - interpolatedstring-perl6 ==1.0.0
+  - IntervalMap ==0.5.1.1
+  - intervals ==0.7.2
+  - invariant ==0.4
+  - io-choice ==0.0.6
+  - io-machine ==0.2.0.0
+  - io-manager ==0.1.0.2
+  - io-memoize ==1.1.1.0
+  - io-region ==0.1.1
+  - io-storage ==0.3
+  - io-streams ==1.3.5.0
+  - io-streams-haproxy ==1.0.0.1
+  - ip6addr ==0.5.1.2
+  - iproute ==1.7.0
+  - IPv6Addr ==0.6.1.0
+  - irc ==0.6.1.0
+  - irc-client ==0.4.3.0
+  - irc-conduit ==0.2.0.0
+  - irc-ctcp ==0.1.3.0
+  - irc-dcc ==2.0.0
+  - islink ==0.1.0.0
+  - iso3166-country-codes ==0.20140203.7
+  - iso639 ==0.1.0.3
+  - iso8601-time ==0.1.4
+  - iterable ==3.0
+  - ix-shapable ==0.1.0
+  - ixset ==1.0.7
+  - ixset-typed ==0.3.1
+  - jailbreak-cabal ==1.3.1
+  - jmacro ==0.6.14
+  - jmacro-rpc ==0.3.2
+  - jmacro-rpc-happstack ==0.3.2
+  - jose ==0.4.0.2
+  - jose-jwt ==0.7
+  - js-flot ==0.8.3
+  - js-jquery ==3.1.0
+  - json ==0.9.1
+  - json-autotype ==1.0.14
+  - json-rpc-generic ==0.2.1.1
+  - json-schema ==0.7.4.1
+  - JuicyPixels ==3.2.8
+  - JuicyPixels-extra ==0.1.0
+  - JuicyPixels-scale-dct ==0.1.1.2
+  - jwt ==0.7.2
+  - kan-extensions ==5.0.1
+  - kansas-comet ==0.4
+  - kawhi ==0.0.1
+  - kdt ==0.2.4
+  - keter ==1.4.3.2
+  - keycode ==0.2.2
+  - keys ==3.11
+  - kmeans ==0.1.3
+  - knob ==0.1.1
+  - koofr-client ==1.0.0.3
+  - kraken ==0.0.3
+  - lackey ==0.4.0
+  - language-c ==0.5.0
+  - language-c-quote ==0.11.6.3
+  - language-dockerfile ==0.3.4.0
+  - language-ecmascript ==0.17.1.0
+  - language-fortran ==0.5.1
+  - language-glsl ==0.2.0
+  - language-haskell-extract ==0.2.4
+  - language-java ==0.2.8
+  - language-javascript ==0.6.0.8
+  - language-lua2 ==0.1.0.5
+  - language-nix ==2.1.0.1
+  - language-puppet ==1.3.1.1
+  - language-thrift ==0.9.0.2
+  - largeword ==1.2.5
+  - lattices ==1.5.0
+  - lazy-csv ==0.5.1
+  - lca ==0.3
+  - leapseconds-announced ==2017
+  - lens ==4.14
+  - lens-action ==0.2.0.2
+  - lens-aeson ==1.0.0.5
+  - lens-datetime ==0.3
+  - lens-family ==1.2.1
+  - lens-family-core ==1.2.1
+  - lens-family-th ==0.5.0.0
+  - lens-regex ==0.1.0
+  - lens-simple ==0.1.0.9
+  - leveldb-haskell ==0.6.4
+  - lexer-applicative ==2.1.0.1
+  - lhs2tex ==1.19
+  - libgit ==0.3.1
+  - libinfluxdb ==0.0.4
+  - libmpd ==0.9.0.6
+  - libnotify ==0.2
+  - libxml-sax ==0.7.5
+  - LibZip ==1.0.1
+  - lift-generics ==0.1.1
+  - lifted-async ==0.9.0
+  - lifted-base ==0.2.3.8
+  - linear ==1.20.5
+  - linear-accelerate ==0.2
+  - linux-file-extents ==0.2.0.0
+  - linux-namespaces ==0.1.2.0
+  - list-fusion-probe ==0.1.0.6
+  - list-prompt ==0.1.1.0
+  - list-t ==1
+  - ListLike ==4.5
+  - load-env ==0.1.1
+  - loch-th ==0.2.1
+  - log-domain ==0.10.3.1
+  - logfloat ==0.13.3.3
+  - logging-facade ==0.1.1
+  - logict ==0.6.0.2
+  - loop ==0.3.0
+  - lrucache ==1.2.0.0
+  - lrucaching ==0.3.0
+  - ltext ==0.1.2.1
+  - lucid ==2.9.6
+  - lucid-svg ==0.7.0.0
+  - machines ==0.6.1
+  - magic ==1.1
+  - mainland-pretty ==0.4.1.4
+  - makefile ==0.1.0.5
+  - managed ==1.0.5
+  - mandrill ==0.5.2.3
+  - markdown ==0.1.14
+  - markdown-unlit ==0.4.0
+  - markup ==3.1.0
+  - math-functions ==0.2.0.1
+  - matrices ==0.4.3
+  - matrix ==0.3.5.0
+  - maximal-cliques ==0.1.1
+  - mbox ==0.3.3
+  - mcmc-types ==1.0.1
+  - megaparsec ==5.0.1
+  - memory ==0.13
+  - MemoTrie ==0.6.4
+  - mersenne-random ==1.0.0.1
+  - mersenne-random-pure64 ==0.2.0.5
+  - messagepack ==0.5.3
+  - messagepack-rpc ==0.5.1
+  - metrics ==0.3.0.2
+  - MFlow ==0.4.6.0
+  - microformats2-parser ==1.0.1.5
+  - microlens ==0.4.7.0
+  - microlens-aeson ==2.1.1.1
+  - microlens-contra ==0.1.0.1
+  - microlens-ghc ==0.4.7.0
+  - microlens-mtl ==0.1.10.0
+  - microlens-platform ==0.3.7.0
+  - microlens-th ==0.4.1.0
+  - mighty-metropolis ==1.0.2
+  - mime-mail ==0.4.11
+  - mime-mail-ses ==0.3.2.2
+  - mime-types ==0.1.0.7
+  - misfortune ==0.1.1.2
+  - missing-foreign ==0.1.1
+  - MissingH ==1.4.0.1
+  - mmap ==0.5.9
+  - mmorph ==1.0.6
+  - mockery ==0.3.3
+  - modify-fasta ==0.8.2.1
+  - moesocks ==1.0.0.41
+  - monad-control ==1.0.1.0
+  - monad-coroutine ==0.9.0.3
+  - monad-extras ==0.5.11
+  - monad-http ==0.1.0.0
+  - monad-journal ==0.7.2
+  - monad-logger ==0.3.19
+  - monad-logger-json ==0.1.0.0
+  - monad-logger-prefix ==0.1.5
+  - monad-logger-syslog ==0.1.2.0
+  - monad-loops ==0.4.3
+  - monad-par ==0.3.4.8
+  - monad-par-extras ==0.3.3
+  - monad-parallel ==0.7.2.2
+  - monad-peel ==0.2.1.1
+  - monad-primitive ==0.1
+  - monad-products ==4.0.1
+  - monad-skeleton ==0.1.2.2
+  - monad-time ==0.2
+  - monad-unlift ==0.2.0
+  - monad-unlift-ref ==0.2.0
+  - monadcryptorandom ==0.7.0
+  - monadic-arrays ==0.2.2
+  - monadLib ==3.7.3
+  - monadloc ==0.7.1
+  - monadplus ==1.4.2
+  - MonadPrompt ==1.0.0.5
+  - MonadRandom ==0.4.2.3
+  - monads-tf ==0.1.0.3
+  - mongoDB ==2.1.1.1
+  - mono-traversable ==1.0.0.1
+  - mono-traversable-instances ==0.1.0.0
+  - monoid-extras ==0.4.2
+  - monoid-subclasses ==0.4.2.1
+  - monoidal-containers ==0.3.0.0
+  - morte ==1.6.2
+  - mountpoints ==1.0.2
+  - mtl ==2.2.1
+  - mtl-compat ==0.2.1.3
+  - mtl-prelude ==2.0.3.1
+  - multiarg ==0.30.0.10
+  - multimap ==1.2.1
+  - multipart ==0.1.2
+  - multiset ==0.3.3
+  - multiset-comb ==0.2.4.1
+  - murmur-hash ==0.1.0.9
+  - murmur3 ==1.0.3
+  - MusicBrainz ==0.2.4
+  - mustache ==2.1
+  - mutable-containers ==0.3.3
+  - mwc-probability ==1.2.1
+  - mwc-random ==0.13.4.0
+  - mwc-random-monad ==0.7.3.1
+  - nagios-check ==0.3.2
+  - names-th ==0.2.0.2
+  - nano-erl ==0.1.0.1
+  - nanospec ==0.2.1
+  - nationstates ==0.5.0.0
+  - nats ==1.1.1
+  - natural-sort ==0.1.2
+  - natural-transformation ==0.3.1
+  - ndjson-conduit ==0.1.0.3
+  - neat-interpolation ==0.3.2.1
+  - netpbm ==1.0.2
+  - nettle ==0.2.0
+  - network ==2.6.3.1
+  - network-anonymous-i2p ==0.10.0
+  - network-anonymous-tor ==0.11.0
+  - network-attoparsec ==0.12.2
+  - network-conduit-tls ==1.2.2
+  - network-house ==0.1.0.2
+  - network-info ==0.2.0.8
+  - network-simple ==0.4.0.5
+  - network-transport ==0.4.4.0
+  - network-transport-composed ==0.2.0.1
+  - network-transport-inmemory ==0.5.1
+  - network-transport-tcp ==0.5.1
+  - network-transport-tests ==0.2.3.0
+  - network-uri ==2.6.1.0
+  - network-uri-flag ==0.1
+  - newtype ==0.2
+  - nicify-lib ==1.0.1
+  - nix-paths ==1.0.0.1
+  - non-empty-sequence ==0.2.0.2
+  - nonce ==1.0.2
+  - NoTrace ==0.3.0.1
+  - nsis ==0.3
+  - numbers ==3000.2.0.1
+  - numeric-extras ==0.1
+  - NumInstances ==1.4
+  - numtype-dk ==0.5.0.1
+  - objective ==1.1.1
+  - ObjectName ==1.1.0.1
+  - octane ==0.16.1
+  - Octree ==0.5.4.3
+  - oeis ==0.3.7
+  - ofx ==0.4.2.0
+  - old-locale ==1.0.0.7
+  - old-time ==1.1.0.3
+  - omnifmt ==0.2.1.1
+  - once ==0.2
+  - OneTuple ==0.2.1
+  - oo-prototypes ==0.1.0.0
+  - opaleye ==0.5.1.1
+  - opaleye-trans ==0.3.3
+  - open-browser ==0.2.1.0
+  - OpenGL ==3.0.1.0
+  - OpenGLRaw ==3.2.2.0
+  - openpgp-asciiarmor ==0.1
+  - opensource ==0.1.0.0
+  - openssl-streams ==1.2.1.0
+  - operational ==0.2.3.3
+  - operational-class ==0.3.0.0
+  - opml-conduit ==0.5.0.1
+  - optional-args ==1.0.1
+  - options ==1.2.1.1
+  - optparse-applicative ==0.12.1.0
+  - optparse-generic ==1.1.1
+  - optparse-helper ==0.2.1.1
+  - optparse-simple ==0.0.3
+  - optparse-text ==0.1.1.0
+  - osdkeys ==0.0
+  - overloaded-records ==0.4.2.0
+  - package-description-remote ==0.2.0.0
+  - packdeps ==0.4.2.1
+  - pager ==0.1.1.0
+  - pagerduty ==0.0.7
+  - pagination ==0.1.0
+  - palette ==0.1.0.4
+  - pandoc ==1.17.1
+  - pandoc-citeproc ==0.10.1
+  - pandoc-types ==1.16.1.1
+  - pango ==0.13.3.0
+  - parallel ==3.2.1.0
+  - parallel-io ==0.3.3
+  - parseargs ==0.2.0.7
+  - parsec ==3.1.11
+  - parsers ==0.12.4
+  - partial-handler ==1.0.1
+  - path ==0.5.9
+  - path-extra ==0.0.3
+  - path-io ==1.2.0
+  - path-pieces ==0.2.1
+  - pathwalk ==0.3.1.2
+  - patience ==0.1.1
+  - pattern-arrows ==0.0.2
+  - pbkdf ==1.1.1.1
+  - pcap ==0.4.5.2
+  - pcre-heavy ==1.0.0.2
+  - pcre-light ==0.4.0.4
+  - pcre-utils ==0.1.8.1
+  - pdf-toolbox-content ==0.0.5.1
+  - pdf-toolbox-core ==0.0.4.1
+  - pdf-toolbox-document ==0.0.7.1
+  - pdfinfo ==1.5.4
+  - pem ==0.2.2
+  - permutation ==0.5.0.5
+  - persistable-record ==0.4.0.2
+  - persistable-types-HDBC-pg ==0.0.1.4
+  - persistent ==2.6
+  - persistent-postgresql ==2.6
+  - persistent-redis ==2.5.2
+  - persistent-refs ==0.4
+  - persistent-sqlite ==2.6
+  - persistent-template ==2.5.1.6
+  - pgp-wordlist ==0.1.0.1
+  - phantom-state ==0.2.1.2
+  - picoparsec ==0.1.2.3
+  - pinboard ==0.9.6
+  - pinch ==0.3.0.1
+  - pinchot ==0.22.0.0
+  - pipes ==4.1.9
+  - pipes-aeson ==0.4.1.6
+  - pipes-attoparsec ==0.5.1.4
+  - pipes-bgzf ==0.2.0.1
+  - pipes-bytestring ==2.1.3
+  - pipes-cacophony ==0.4.0
+  - pipes-cliff ==0.12.0.0
+  - pipes-concurrency ==2.0.6
+  - pipes-csv ==1.4.3
+  - pipes-extras ==1.0.5
+  - pipes-fastx ==0.3.0.0
+  - pipes-group ==1.0.5
+  - pipes-http ==1.0.4
+  - pipes-illumina ==0.1.0.0
+  - pipes-mongodb ==0.1.0.0
+  - pipes-network ==0.6.4.1
+  - pipes-parse ==3.0.7
+  - pipes-random ==1.0.0.1
+  - pipes-safe ==2.2.4
+  - pipes-text ==0.0.2.4
+  - pipes-wai ==3.2.0
+  - pixelated-avatar-generator ==0.1.3
+  - pkcs10 ==0.1.1.0
+  - placeholders ==0.1
+  - plan-b ==0.2.0
+  - point-octree ==0.5.5.3
+  - pointed ==5
+  - pointedlist ==0.6.1
+  - pointful ==1.0.8
+  - pointless-fun ==1.1.0.6
+  - polynomials-bernstein ==1.1.2
+  - polyparse ==1.12
+  - posix-realtime ==0.0.0.4
+  - post-mess-age ==0.2.1.0
+  - postgresql-binary ==0.9.1
+  - postgresql-libpq ==0.9.2.0
+  - postgresql-query ==3.0.1
+  - postgresql-schema ==0.1.10
+  - postgresql-simple ==0.5.2.1
+  - postgresql-simple-url ==0.1.0.1
+  - postgresql-transactional ==1.1.1
+  - pred-set ==0.0.1
+  - prednote ==0.36.0.4
+  - prefix-units ==0.2.0
+  - prelude-extras ==0.4.0.3
+  - prelude-safeenum ==0.1.1.2
+  - preprocessor-tools ==1.0.1
+  - presburger ==1.3.1
+  - pretty-class ==1.0.1.1
+  - pretty-hex ==1.0
+  - pretty-show ==1.6.12
+  - pretty-types ==0.2.3.0
+  - prettyclass ==1.0.0.0
+  - primes ==0.2.1.0
+  - primitive ==0.6.1.0
+  - process-extras ==0.4.1.4
+  - product-profunctors ==0.7.1.0
+  - profiteur ==0.3.0.2
+  - profunctor-extras ==4.0
+  - profunctors ==5.2
+  - project-template ==0.2.0
+  - projectroot ==0.2.0.1
+  - prometheus-client ==0.1.0.1
+  - prometheus-metrics-ghc ==0.1.0.1
+  - prompt ==0.1.1.2
+  - protobuf ==0.2.1.1
+  - protobuf-simple ==0.1.0.1
+  - protocol-buffers ==2.4.0
+  - protocol-buffers-descriptor ==2.4.0
+  - protolude ==0.1.7
+  - proxied ==0.2
+  - psql-helpers ==0.1.0.0
+  - PSQueue ==1.1
+  - psqueues ==0.2.2.2
+  - publicsuffix ==0.20160716
+  - pure-cdb ==0.1.2
+  - pure-io ==0.2.1
+  - pureMD5 ==2.1.3
+  - purescript ==0.9.3
+  - purescript-bridge ==0.8.0.0
+  - pwstore-fast ==2.4.4
+  - pwstore-purehaskell ==2.1.4
+  - quantum-random ==0.6.3
+  - QuasiText ==0.1.2.6
+  - questioner ==0.1.1.0
+  - QuickCheck ==2.8.2
+  - quickcheck-arbitrary-adt ==0.2.0.0
+  - quickcheck-assertions ==0.2.0
+  - quickcheck-combinators ==0.0.1
+  - quickcheck-instances ==0.3.12
+  - quickcheck-io ==0.1.3
+  - quickcheck-properties ==0.1
+  - quickcheck-simple ==0.1.0.1
+  - quickcheck-text ==0.1.1.0
+  - quickcheck-unicode ==1.0.0.1
+  - rainbow ==0.28.0.4
+  - rainbox ==0.18.0.10
+  - random ==1.1
+  - random-fu ==0.2.7.0
+  - random-shuffle ==0.0.4
+  - random-source ==0.3.0.6
+  - random-tree ==0.6.0.5
+  - range ==0.1.2.0
+  - range-set-list ==0.1.2.0
+  - rank1dynamic ==0.3.3.0
+  - Rasterific ==0.6.1.1
+  - rasterific-svg ==0.3.1.2
+  - ratel ==0.3.1
+  - ratel-wai ==0.2.0
+  - raw-strings-qq ==1.1
+  - read-editor ==0.1.0.2
+  - read-env-var ==0.1.0.1
+  - readable ==0.3.1
+  - ReadArgs ==1.2.2
+  - readline ==1.0.3.0
+  - rebase ==1
+  - redis-io ==0.7.0
+  - redis-resp ==0.4.0
+  - reducers ==3.12.1
+  - ref-fd ==0.4.0.1
+  - refact ==0.3.0.2
+  - reflection ==2.1.2
+  - reform ==0.2.7.1
+  - reform-blaze ==0.2.4.1
+  - reform-hamlet ==0.0.5.1
+  - reform-happstack ==0.2.5.1
+  - reform-hsp ==0.2.7
+  - RefSerialize ==0.3.1.4
+  - regex-applicative ==0.3.3
+  - regex-applicative-text ==0.1.0.1
+  - regex-base ==0.93.2
+  - regex-compat ==0.95.1
+  - regex-compat-tdfa ==0.95.1.4
+  - regex-pcre ==0.94.4
+  - regex-pcre-builtin ==0.94.4.8.8.35
+  - regex-posix ==0.95.2
+  - regex-tdfa ==1.2.2
+  - regex-tdfa-text ==1.0.0.3
+  - reinterpret-cast ==0.1.0
+  - relational-query ==0.8.3.1
+  - relational-query-HDBC ==0.6.0.2
+  - relational-record ==0.1.5.1
+  - relational-schemas ==0.1.3.1
+  - renderable ==0.2.0.1
+  - repa ==3.4.1.1
+  - repa-algorithms ==3.4.1.1
+  - repa-io ==3.4.1.1
+  - RepLib ==0.5.4
+  - reroute ==0.4.0.1
+  - resolve-trivial-conflicts ==0.3.2.2
+  - resource-pool ==0.2.3.2
+  - resourcet ==1.1.7.5
+  - rest-client ==0.5.1.1
+  - rest-core ==0.39
+  - rest-gen ==0.19.0.3
+  - rest-happstack ==0.3.1.1
+  - rest-stringmap ==0.2.0.6
+  - rest-types ==1.14.1.1
+  - rest-wai ==0.2.0.1
+  - result ==0.2.5.0
+  - rethinkdb ==2.2.0.6
+  - rethinkdb-client-driver ==0.0.23
+  - retry ==0.7.4.1
+  - rev-state ==0.1.2
+  - rfc5051 ==0.1.0.3
+  - rng-utils ==0.2.1
+  - rose-trees ==0.0.4.3
+  - rosezipper ==0.2
+  - rotating-log ==0.4
+  - RSA ==2.2.0
+  - rss-conduit ==0.2.0.2
+  - runmemo ==1.0.0.1
+  - rvar ==0.2.0.3
+  - s3-signer ==0.3.0.0
+  - safe ==0.3.9
+  - safe-exceptions ==0.1.4.0
+  - safecopy ==0.9.1
+  - SafeSemaphore ==0.10.1
+  - sampling ==0.2.0
+  - sandi ==0.4.0
+  - sandman ==0.2.0.1
+  - sbv ==5.12
+  - scalpel ==0.3.1
+  - scanner ==0.2
+  - scientific ==0.3.4.9
+  - scotty ==0.11.0
+  - scrape-changes ==0.1.0.3
+  - scrypt ==0.5.0
+  - sdl2 ==2.1.3
+  - secp256k1 ==0.4.6
+  - securemem ==0.1.9
+  - SegmentTree ==0.3
+  - semigroupoid-extras ==5
+  - semigroupoids ==5.1
+  - semigroups ==0.18.2
+  - semiring-simple ==1.0.0.1
+  - semver ==0.3.3.1
+  - sendfile ==0.7.9
+  - seqalign ==0.2.0.4
+  - seqloc ==0.6.1.1
+  - serf ==0.1.1.0
+  - servant ==0.8.1
+  - servant-aeson-specs ==0.5.1.1
+  - servant-auth-cookie ==0.3.1
+  - servant-blaze ==0.7.1
+  - servant-cassava ==0.8
+  - servant-client ==0.8.1
+  - servant-docs ==0.8.1
+  - servant-foreign ==0.8.1
+  - servant-js ==0.8.1
+  - servant-JuicyPixels ==0.3.0.2
+  - servant-lucid ==0.7.1
+  - servant-mock ==0.8.1
+  - servant-purescript ==0.3.1.5
+  - servant-server ==0.8.1
+  - servant-subscriber ==0.5.0.2
+  - servant-swagger ==1.1.2
+  - servant-swagger-ui ==0.2.0.2.1.5
+  - servant-yaml ==0.1.0.0
+  - serversession ==1.0.1
+  - serversession-backend-acid-state ==1.0.3
+  - serversession-frontend-wai ==1.0
+  - serversession-frontend-yesod ==1.0
+  - servius ==1.2.0.2
+  - set-monad ==0.2.0.0
+  - setenv ==0.1.1.3
+  - setlocale ==1.0.0.4
+  - sets ==0.0.5
+  - SHA ==1.6.4.2
+  - shake ==0.15.10
+  - shake-language-c ==0.10.0
+  - shakespeare ==2.0.11.1
+  - shell-conduit ==4.5.2
+  - ShellCheck ==0.4.4
+  - shelly ==1.6.8
+  - shortcut-links ==0.4.2.0
+  - should-not-typecheck ==2.1.0
+  - show-type ==0.1.1
+  - signal ==0.1.0.3
+  - silently ==1.2.5
+  - simple ==0.11.1
+  - simple-download ==0.0.2
+  - simple-log ==0.4.0
+  - simple-reflect ==0.3.2
+  - simple-sendfile ==0.2.25
+  - simple-session ==0.10.1.1
+  - simple-smt ==0.6.0
+  - simple-templates ==0.8.0.1
+  - singleton-bool ==0.1.1.0
+  - singletons ==2.2
+  - siphash ==1.0.3
+  - skein ==1.0.9.4
+  - skeletons ==0.4.0
+  - slave-thread ==1.0.2
+  - slug ==0.1.5
+  - smallcaps ==0.6.0.3
+  - smallcheck ==1.1.1
+  - smoothie ==0.4.2.3
+  - smsaero ==0.6.1
+  - smtLib ==1.0.8
+  - smtp-mail ==0.1.4.5
+  - snap-core ==1.0.0.0
+  - snap-server ==1.0.1.0
+  - snowflake ==0.1.1.1
+  - soap ==0.2.3.1
+  - soap-openssl ==0.1.0.2
+  - soap-tls ==0.1.1.2
+  - socket ==0.6.1.0
+  - socks ==0.5.5
+  - solga ==0.1.0.1
+  - solga-swagger ==0.1.0.1
+  - sorted-list ==0.2.0.0
+  - sourcemap ==0.1.6
+  - spdx ==0.2.1.0
+  - speculation ==1.5.0.3
+  - speedy-slice ==0.1.3
+  - sphinx ==0.6.0.1
+  - Spintax ==0.1.0.0
+  - splice ==0.6.1.1
+  - split ==0.2.3.1
+  - Spock ==0.11.0.0
+  - Spock-api ==0.11.0.0
+  - Spock-api-server ==0.11.0.0
+  - Spock-core ==0.11.0.0
+  - Spock-lucid ==0.3.0.0
+  - Spock-worker ==0.3.1.0
+  - spool ==0.1
+  - spoon ==0.3.1
+  - sql-words ==0.1.4.1
+  - sqlite-simple ==0.4.9.0
+  - srcloc ==0.5.1.0
+  - stache ==0.1.6
+  - stack ==1.1.2
+  - stack-run-auto ==0.1.1.4
+  - stackage-curator ==0.14.1.1
+  - stackage-types ==1.2.0
+  - state-plus ==0.1.2
+  - stateref ==0.3
+  - statestack ==0.2.0.5
+  - StateVar ==1.1.0.4
+  - stateWriter ==0.2.8
+  - static-canvas ==0.2.0.3
+  - statistics ==0.13.3.0
+  - stm ==2.4.4.1
+  - stm-chans ==3.0.0.4
+  - stm-conduit ==3.0.0
+  - stm-containers ==0.2.15
+  - stm-delay ==0.1.1.1
+  - stm-stats ==0.2.0.0
+  - STMonadTrans ==0.3.3
+  - stopwatch ==0.1.0.2
+  - storable-complex ==0.2.2
+  - storable-endian ==0.2.5
+  - storable-record ==0.0.3.1
+  - store ==0.2.1.2
+  - store-core ==0.2.0.2
+  - Strafunski-StrategyLib ==5.0.0.9
+  - stratosphere ==0.1.4
+  - streaming ==0.1.4.3
+  - streaming-bytestring ==0.1.4.4
+  - streaming-commons ==0.1.15.5
+  - streamproc ==1.6.2
+  - streams ==3.3
+  - strict ==0.3.2
+  - strict-base-types ==0.5.0
+  - string-class ==0.1.6.5
+  - string-combinators ==0.6.0.5
+  - string-conv ==0.1.2
+  - string-conversions ==0.4
+  - string-qq ==0.0.2
+  - stringable ==0.1.3
+  - stringbuilder ==0.5.0
+  - stringsearch ==0.3.6.6
+  - stripe-core ==2.1.0
+  - strive ==3.0.1
+  - stylish-haskell ==0.6.1.0
+  - success ==0.2.6
+  - sundown ==0.6
+  - svg-builder ==0.1.0.1
+  - svg-tree ==0.5.1.2
+  - SVGFonts ==1.5.0.1
+  - swagger ==0.2.2
+  - swagger2 ==2.1.2.1
+  - syb ==0.6
+  - syb-with-class ==0.6.1.7
+  - symbol ==0.2.4
+  - symengine ==0.1.2.0
+  - system-argv0 ==0.1.1
+  - system-fileio ==0.3.16.3
+  - system-filepath ==0.4.13.4
+  - system-posix-redirect ==1.1.0.1
+  - syz ==0.2.0.0
+  - tabular ==0.2.2.7
+  - tagged ==0.8.5
+  - tagged-binary ==0.2.0.0
+  - taggy ==0.2.0
+  - taggy-lens ==0.1.2
+  - tagshare ==0.0
+  - tagsoup ==0.14
+  - tagstream-conduit ==0.5.5.3
+  - tar ==0.5.0.3
+  - tardis ==0.4.1.0
+  - tasty ==0.11.0.4
+  - tasty-ant-xml ==1.0.2
+  - tasty-dejafu ==0.3.0.2
+  - tasty-expected-failure ==0.11.0.4
+  - tasty-golden ==2.3.1.1
+  - tasty-hspec ==1.1.3
+  - tasty-html ==0.4.1.1
+  - tasty-hunit ==0.9.2
+  - tasty-kat ==0.0.3
+  - tasty-program ==1.0.5
+  - tasty-quickcheck ==0.8.4
+  - tasty-rerun ==1.1.6
+  - tasty-silver ==3.1.9
+  - tasty-smallcheck ==0.8.1
+  - tasty-th ==0.1.4
+  - TCache ==0.12.0
+  - tcp-streams ==0.4.0.0
+  - template ==0.2.0.10
+  - temporary ==1.2.0.4
+  - temporary-rc ==1.2.0.3
+  - terminal-progress-bar ==0.0.1.4
+  - terminal-size ==0.3.2.1
+  - terminfo ==0.4.0.2
+  - test-fixture ==0.4.0.0
+  - test-framework ==0.8.1.1
+  - test-framework-hunit ==0.3.0.2
+  - test-framework-quickcheck2 ==0.3.0.3
+  - test-framework-smallcheck ==0.2
+  - test-framework-th ==0.2.4
+  - test-simple ==0.1.8
+  - testing-feat ==0.4.0.3
+  - texmath ==0.8.6.5
+  - text ==1.2.2.1
+  - text-all ==0.3.0.2
+  - text-binary ==0.2.1
+  - text-conversions ==0.3.0
+  - text-format ==0.3.1.1
+  - text-icu ==0.7.0.1
+  - text-ldap ==0.1.1.8
+  - text-manipulate ==0.2.0.1
+  - text-metrics ==0.1.0
+  - text-postgresql ==0.0.2.1
+  - text-region ==0.1.0.1
+  - text-show ==3.4
+  - text-show-instances ==3.4
+  - tf-random ==0.5
+  - th-data-compat ==0.0.2.2
+  - th-desugar ==1.6
+  - th-expand-syns ==0.4.0.0
+  - th-extras ==0.0.0.4
+  - th-lift ==0.7.6
+  - th-lift-instances ==0.1.10
+  - th-orphans ==0.13.2
+  - th-printf ==0.3.1
+  - th-reify-compat ==0.0.1.1
+  - th-reify-many ==0.1.6
+  - th-utilities ==0.2.0.1
+  - these ==0.7.2
+  - threads ==0.5.1.4
+  - through-text ==0.1.0.0
+  - thumbnail-plus ==1.0.5
+  - thyme ==0.3.5.5
+  - tidal ==0.8.1
+  - time-compat ==0.1.0.3
+  - time-lens ==0.4.0.1
+  - time-locale-compat ==0.1.1.3
+  - time-parsers ==0.1.1.0
+  - timeit ==1.0.0.0
+  - timelens ==0.2.0.2
+  - timemap ==0.0.4
+  - timerep ==2.0.0.2
+  - timezone-olson ==0.1.7
+  - timezone-series ==0.1.6.1
+  - tinylog ==0.14.0
+  - tinytemplate ==0.1.2.0
+  - tls ==1.3.8
+  - tls-debug ==0.4.4
+  - token-bucket ==0.1.0.1
+  - tostring ==0.2.1.1
+  - transformers-base ==0.4.4
+  - transformers-compat ==0.5.1.4
+  - transformers-lift ==0.1.0.1
+  - transient ==0.4.2.2
+  - transient-universe ==0.3.2.3
+  - traverse-with-class ==0.2.0.4
+  - tree-fun ==0.8.1.0
+  - tree-view ==0.4
+  - tries ==0.0.4
+  - trifecta ==1.6
+  - true-name ==0.1.0.2
+  - ttrie ==0.1.2.1
+  - tttool ==1.6.1.2
+  - tuple ==0.3.0.2
+  - tuple-th ==0.2.5
+  - tuples-homogenous-h98 ==0.1.1.0
+  - turtle ==1.2.8
+  - turtle-options ==0.1.0.4
+  - twitter-conduit ==0.2.1
+  - twitter-feed ==0.2.0.9
+  - twitter-types ==0.7.2.2
+  - twitter-types-lens ==0.7.2
+  - type-aligned ==0.9.6
+  - type-eq ==0.5
+  - type-fun ==0.1.1
+  - type-level-numbers ==0.1.1.1
+  - type-list ==0.5.0.0
+  - type-spec ==0.2.0.0
+  - typelits-witnesses ==0.2.3.0
+  - typography-geometry ==1.0.0.1
+  - tzdata ==0.1.20160614.0
+  - ua-parser ==0.7.1
+  - uglymemo ==0.1.0.1
+  - unbound ==0.5.1
+  - unbound-generics ==0.3.1
+  - unbounded-delays ==0.1.0.9
+  - uncertain ==0.3.1.0
+  - unexceptionalio ==0.3.0
+  - unfoldable ==0.8.4
+  - unfoldable-restricted ==0.0.2
+  - unicode-show ==0.1.0.2
+  - unicode-transforms ==0.1.0.1
+  - unification-fd ==0.10.0.1
+  - union ==0.1.1.1
+  - union-find ==0.2
+  - uniplate ==1.6.12
+  - unit-constraint ==0.0.0
+  - units ==2.4
+  - units-defs ==2.0.1.1
+  - units-parser ==0.1.0.0
+  - universe ==1.0
+  - universe-base ==1.0.2.1
+  - universe-instances-base ==1.0
+  - universe-instances-extended ==1.0.0.1
+  - universe-instances-trans ==1.0.0.1
+  - universe-reverse-instances ==1.0
+  - unix-bytestring ==0.3.7.3
+  - unix-compat ==0.4.2.0
+  - unix-time ==0.3.7
+  - Unixutils ==1.54.1
+  - unordered-containers ==0.2.7.1
+  - uri-bytestring ==0.2.2.0
+  - uri-encode ==1.5.0.5
+  - url ==2.1.3
+  - urlpath ==5.0.0.1
+  - userid ==0.1.2.7
+  - users ==0.5.0.0
+  - users-postgresql-simple ==0.5.0.2
+  - users-test ==0.5.0.1
+  - utf8-light ==0.4.2
+  - utf8-string ==1.0.1.1
+  - utility-ht ==0.0.12
+  - uu-interleaved ==0.2.0.0
+  - uu-parsinglib ==2.9.1.1
+  - uuid ==1.3.12
+  - uuid-orphans ==1.4.1
+  - uuid-types ==1.0.3
+  - vado ==0.0.7
+  - validate-input ==0.4.0.0
+  - validation ==0.5.3
+  - varying ==0.5.0.3
+  - vault ==0.3.0.6
+  - vcswrapper ==0.1.3
+  - vector ==0.11.0.0
+  - vector-algorithms ==0.7.0.1
+  - vector-binary-instances ==0.2.3.2
+  - vector-buffer ==0.4.1
+  - vector-fftw ==0.1.3.7
+  - vector-instances ==3.3.1
+  - vector-space ==0.10.4
+  - vector-th-unbox ==0.2.1.6
+  - vectortiles ==1.2.0
+  - versions ==3.0.0
+  - vhd ==0.2.2
+  - ViennaRNAParser ==1.2.9
+  - vinyl ==0.5.2
+  - vinyl-utils ==0.3.0.0
+  - void ==0.7.1
+  - vty ==5.11
+  - wai ==3.2.1.1
+  - wai-app-static ==3.1.6.1
+  - wai-conduit ==3.0.0.3
+  - wai-cors ==0.2.5
+  - wai-eventsource ==3.0.0
+  - wai-extra ==3.0.17
+  - wai-logger ==2.3.0
+  - wai-middleware-caching ==0.1.0.2
+  - wai-middleware-caching-lru ==0.1.0.0
+  - wai-middleware-caching-redis ==0.2.0.0
+  - wai-middleware-consul ==0.1.0.2
+  - wai-middleware-content-type ==0.4.1
+  - wai-middleware-crowd ==0.1.4.2
+  - wai-middleware-metrics ==0.2.3
+  - wai-middleware-prometheus ==0.1.0.1
+  - wai-middleware-static ==0.8.0
+  - wai-middleware-throttle ==0.2.1.0
+  - wai-middleware-verbs ==0.3.2
+  - wai-predicates ==0.9.0
+  - wai-request-spec ==0.10.2.1
+  - wai-session ==0.3.2
+  - wai-session-postgresql ==0.2.1.0
+  - wai-transformers ==0.0.7
+  - wai-websockets ==3.0.1.1
+  - waitra ==0.0.4.0
+  - warp ==3.2.8
+  - warp-tls ==3.2.2
+  - web-plugins ==0.2.9
+  - web-routes ==0.27.11
+  - web-routes-boomerang ==0.28.4.2
+  - web-routes-happstack ==0.23.10
+  - web-routes-hsp ==0.24.6.1
+  - web-routes-th ==0.22.5
+  - web-routes-wai ==0.24.3
+  - webdriver ==0.8.3
+  - webdriver-angular ==0.1.11
+  - webkitgtk3 ==0.14.2.0
+  - webkitgtk3-javascriptcore ==0.14.2.0
+  - webpage ==0.0.4
+  - webrtc-vad ==0.1.0.3
+  - websockets ==0.9.7.0
+  - weigh ==0.0.3
+  - werewolf ==1.5.1.1
+  - werewolf-slack ==1.0.2.0
+  - wikicfp-scraper ==0.1.0.3
+  - Win32 ==2.3.1.1
+  - Win32-extras ==0.2.0.1
+  - Win32-notify ==0.3.0.1
+  - with-location ==0.1.0
+  - withdependencies ==0.2.3
+  - witherable ==0.1.3.3
+  - wizards ==1.0.2
+  - wl-pprint ==1.2
+  - wl-pprint-extras ==3.5.0.5
+  - wl-pprint-terminfo ==3.7.1.4
+  - wl-pprint-text ==1.1.0.4
+  - word-trie ==0.3.0
+  - word8 ==0.1.2
+  - wordpass ==1.0.0.6
+  - Workflow ==0.8.3
+  - wrap ==0.0.0
+  - wreq ==0.4.1.0
+  - writer-cps-mtl ==0.1.0.2
+  - writer-cps-transformers ==0.1.0.2
+  - wuss ==1.1.1
+  - X11 ==1.6.1.2
+  - x509 ==1.6.3
+  - x509-store ==1.6.1
+  - x509-system ==1.6.3
+  - x509-validation ==1.6.3
+  - Xauth ==0.1
+  - xdcc ==1.1.3
+  - xdg-basedir ==0.2.2
+  - xenstore ==0.1.1
+  - xhtml ==3000.2.1
+  - xlsior ==0.1.0.1
+  - xlsx ==0.2.4
+  - xlsx-tabular ==0.1.0.1
+  - xml ==1.3.14
+  - xml-conduit ==1.3.5
+  - xml-conduit-parse ==0.3.1.0
+  - xml-conduit-writer ==0.1.1.1
+  - xml-hamlet ==0.4.0.11
+  - xml-lens ==0.1.6.3
+  - xml-to-json-fast ==2.0.0
+  - xml-types ==0.3.6
+  - xmlgen ==0.6.2.1
+  - xmlhtml ==0.2.3.5
+  - xmonad ==0.12
+  - xss-sanitize ==0.3.5.7
+  - yackage ==0.8.0
+  - yahoo-finance-api ==0.1.0.0
+  - yaml ==0.8.18.6
+  - Yampa ==0.10.5
+  - YampaSynth ==0.2
+  - yarr ==1.4.0.2
+  - yes-precure5-command ==5.5.2
+  - yesod ==1.4.3
+  - yesod-auth ==1.4.13.5
+  - yesod-auth-account ==1.4.3
+  - yesod-auth-basic ==0.1.0.2
+  - yesod-auth-hashdb ==1.5.1.3
+  - yesod-auth-oauth2 ==0.2.2
+  - yesod-bin ==1.4.18.3
+  - yesod-core ==1.4.24
+  - yesod-eventsource ==1.4.0.1
+  - yesod-fay ==0.8.0
+  - yesod-fb ==0.3.4
+  - yesod-form ==1.4.7.1
+  - yesod-form-richtext ==0.1.0.0
+  - yesod-gitrepo ==0.2.1.0
+  - yesod-gitrev ==0.1.0.0
+  - yesod-job-queue ==0.3.0.0
+  - yesod-newsfeed ==1.6
+  - yesod-persistent ==1.4.0.6
+  - yesod-sitemap ==1.4.0.1
+  - yesod-static ==1.5.0.4
+  - yesod-static-angular ==0.1.8
+  - yesod-table ==2.0.3
+  - yesod-test ==1.5.3
+  - yesod-websockets ==0.2.4
+  - yi ==0.12.6
+  - yi-fuzzy-open ==0.1.0.1
+  - yi-language ==0.2.1
+  - yi-rope ==0.7.0.2
+  - yjtools ==0.9.18
+  - zero ==0.1.4
+  - zeromq4-haskell ==0.6.5
+  - zip ==0.1.3
+  - zip-archive ==0.3.0.5
+  - zippers ==0.2.2
+  - zlib ==0.6.1.1
+  - zlib-bindings ==0.1.1.5
+  - zlib-lens ==0.1.2.1
+  - zoom-refs ==0.0.0.1
+  - zot ==0.0.3
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
@@ -223,6 +2185,7 @@ dont-distribute-packages:
   Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -491,6 +2454,7 @@ dont-distribute-packages:
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -527,6 +2491,7 @@ dont-distribute-packages:
   bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -584,6 +2549,7 @@ dont-distribute-packages:
   Catana:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -641,7 +2607,12 @@ dont-distribute-packages:
   claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-ghc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -663,6 +2634,7 @@ dont-distribute-packages:
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clustering:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clustertools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clutterhs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -692,6 +2664,7 @@ dont-distribute-packages:
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -745,6 +2718,7 @@ dont-distribute-packages:
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   consumers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   container:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -793,6 +2767,7 @@ dont-distribute-packages:
   cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -930,6 +2905,8 @@ dont-distribute-packages:
   derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-monoid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-storable-plugin:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-storable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -974,9 +2951,13 @@ dont-distribute-packages:
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1012,6 +2993,7 @@ dont-distribute-packages:
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   drmaa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1119,6 +3101,7 @@ dont-distribute-packages:
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eventstore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1256,6 +3239,7 @@ dont-distribute-packages:
   free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1388,11 +3372,13 @@ dont-distribute-packages:
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-variables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1429,6 +3415,7 @@ dont-distribute-packages:
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sync:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gpio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1454,6 +3441,7 @@ dont-distribute-packages:
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1543,6 +3531,7 @@ dont-distribute-packages:
   hakyll-contrib-csv:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1588,6 +3577,7 @@ dont-distribute-packages:
   HaPy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1627,6 +3617,8 @@ dont-distribute-packages:
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1839,6 +3831,7 @@ dont-distribute-packages:
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hidapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2058,6 +4051,7 @@ dont-distribute-packages:
   hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-expectations-pretty-diff:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-golden-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2129,6 +4123,8 @@ dont-distribute-packages:
   hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2217,6 +4213,7 @@ dont-distribute-packages:
   InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inline-java:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inspector-wrecker:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-bytes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-deepseq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2407,6 +4404,7 @@ dont-distribute-packages:
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2433,6 +4431,7 @@ dont-distribute-packages:
   latex-formulae-hakyll:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-image:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-pandoc:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2474,6 +4473,7 @@ dont-distribute-packages:
   libroman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   libssh2-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libsystemd-journal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2490,6 +4490,7 @@ dont-distribute-packages:
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinguisticsTypes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2543,6 +4544,7 @@ dont-distribute-packages:
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-effect:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-facade-journald:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2590,6 +4592,7 @@ dont-distribute-packages:
   magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mailchimp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   majordomo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   majority:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-hard-links:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2658,11 +4661,13 @@ dont-distribute-packages:
   metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mgeneric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microformats2-parser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2730,6 +4735,7 @@ dont-distribute-packages:
   Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mondo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2833,6 +4839,7 @@ dont-distribute-packages:
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2915,6 +4922,7 @@ dont-distribute-packages:
   oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3019,9 +5027,11 @@ dont-distribute-packages:
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-audit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-database-url:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3034,6 +5044,7 @@ dont-distribute-packages:
   pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3110,6 +5121,7 @@ dont-distribute-packages:
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-bind:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3189,9 +5201,11 @@ dont-distribute-packages:
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3261,6 +5275,7 @@ dont-distribute-packages:
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raz:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3360,6 +5375,7 @@ dont-distribute-packages:
   restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resumable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rethinkdb-client-driver:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-model:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ReviewBoard:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3387,6 +5403,7 @@ dont-distribute-packages:
   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 ]
+  rollbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3474,6 +5491,7 @@ dont-distribute-packages:
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3513,6 +5531,7 @@ dont-distribute-packages:
   servant-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-elm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3576,6 +5595,8 @@ dont-distribute-packages:
   simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3775,6 +5796,7 @@ dont-distribute-packages:
   supercollider-ht:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supermonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3782,6 +5804,7 @@ dont-distribute-packages:
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swagger2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3850,6 +5873,7 @@ dont-distribute-packages:
   tdoc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3954,6 +5978,7 @@ dont-distribute-packages:
   topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4129,7 +6154,9 @@ dont-distribute-packages:
   vulkan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wacom-daemon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wahsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-app-file-cgi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-cors:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-devel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-dispatch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-graceful:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4142,6 +6169,8 @@ dont-distribute-packages:
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-consul:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-content-type:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4149,6 +6178,7 @@ dont-distribute-packages:
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-static-cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-thrift:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4215,6 +6245,7 @@ dont-distribute-packages:
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  workflow-windows:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4250,6 +6281,7 @@ dont-distribute-packages:
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-conduit-decode:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4316,6 +6348,7 @@ dont-distribute-packages:
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-ip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ 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 7744015de370..19940bd70bea 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -87,7 +87,7 @@ let
             packages = selectFrom self;
             hoogle = callPackage ./hoogle.nix {
               inherit packages;
-              hoogle = self.hoogle_4_2_43;
+              hoogle = self.hoogle_5_0_4;
             };
           in withPackages (packages ++ [ hoogle ]);
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4d046ca45d13..c3fbcd0c21b4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3497,7 +3497,6 @@ self: {
          crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
          prettyclass QuickCheck tagged test-framework test-framework-hunit
        ];
-       doCheck = false;
        description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5574,7 +5573,6 @@ self: {
          base bindings-GLFW HUnit test-framework test-framework-hunit
        ];
        jailbreak = true;
-       doCheck = false;
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6746,21 +6744,22 @@ self: {
      }) {};
 
   "HDBC-mysql" = callPackage
-    ({ mkDerivation, base, bytestring, HDBC, mysqlclient, time
-     , utf8-string
+    ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient
+     , openssl, time, utf8-string, zlib
      }:
      mkDerivation {
        pname = "HDBC-mysql";
-       version = "0.6.6.4";
-       sha256 = "01df81920b9a005cd9e11467aa5e05b10534d284933fddc34991400e5888048b";
+       version = "0.7.0.0";
+       sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring HDBC time utf8-string ];
-       librarySystemDepends = [ mysqlclient ];
-       jailbreak = true;
-       homepage = "https://github.com/ryantm/hdbc-mysql";
+       librarySystemDepends = [ mysqlclient openssl zlib ];
+       homepage = "http://github.com/ryantm/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {mysqlclient = null;};
+     }) {mysqlclient = null; inherit (pkgs) openssl; 
+         inherit (pkgs) zlib;};
 
   "HDBC-odbc" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, HDBC, mtl
@@ -8031,7 +8030,6 @@ self: {
          process random regex-compat template-haskell temporary text
          unordered-containers
        ];
-       doCheck = false;
        homepage = "https://github.com/skogsbaer/HTF/";
        description = "The Haskell Test Framework";
        license = "LGPL";
@@ -8299,10 +8297,10 @@ self: {
          Strafunski-StrategyLib stringbuilder syb syz time transformers
          transformers-base
        ];
-       doCheck = false;
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX" = callPackage
@@ -9319,7 +9317,6 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -10320,6 +10317,7 @@ self: {
        homepage = "http://github.com/guaraqe/lats#readme";
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
   "LDAP" = callPackage
@@ -10780,7 +10778,6 @@ self: {
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random text utf8-string vector
        ];
-       doCheck = false;
        homepage = "http://github.com/JohnLato/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
@@ -11258,18 +11255,17 @@ self: {
        revision = "1";
        editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7";
        libraryHaskellDepends = [ base ];
-       doHaddock = false;
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "MemoTrie_0_6_6" = callPackage
+  "MemoTrie_0_6_7" = callPackage
     ({ mkDerivation, base, newtype-generics }:
      mkDerivation {
        pname = "MemoTrie";
-       version = "0.6.6";
-       sha256 = "304de318ed0d029b8b3c86eb1179a9ba32ddbfae9aea088081a95e2b53c6129a";
+       version = "0.6.7";
+       sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672";
        libraryHaskellDepends = [ base newtype-generics ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
@@ -11413,7 +11409,6 @@ self: {
          hslogger HUnit mtl network old-locale old-time parsec process
          QuickCheck random regex-compat testpack time unix
        ];
-       doCheck = false;
        homepage = "http://software.complete.org/missingh";
        description = "Large utility library";
        license = stdenv.lib.licenses.bsd3;
@@ -13865,14 +13860,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_9_1" = callPackage
+  "QuickCheck_2_9_2" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.9.1";
-       sha256 = "f8769cbef895a67f9bd1ac554faa577e6c1fb41e271425880a759009e454d05f";
+       version = "2.9.2";
+       sha256 = "155c1656f583bc797587846ee1959143d2b1b9c88fbcb9d3f510f58d8fb93685";
        libraryHaskellDepends = [
          base containers random template-haskell tf-random transformers
        ];
@@ -14401,7 +14396,6 @@ self: {
        executableHaskellDepends = [ base system-filepath text ];
        testHaskellDepends = [ base hspec system-filepath text ];
        jailbreak = true;
-       doCheck = false;
        homepage = "http://github.com/rampion/ReadArgs";
        description = "Simple command line argument parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -17245,6 +17239,23 @@ self: {
        license = "GPL";
      }) {};
 
+  "ViennaRNAParser_1_3_0" = callPackage
+    ({ mkDerivation, base, hspec, parsec, ParsecTools, process
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ViennaRNAParser";
+       version = "1.3.0";
+       sha256 = "a0d10a770b194f3bf6ed5143f89ea3654eebe860bf980a85806c84889efea738";
+       libraryHaskellDepends = [
+         base parsec ParsecTools process transformers
+       ];
+       testHaskellDepends = [ base hspec parsec ];
+       description = "Libary for parsing ViennaRNA package output";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Vulkan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -19904,6 +19915,8 @@ self: {
        pname = "aeson";
        version = "0.11.2.1";
        sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c";
+       revision = "1";
+       editedCabalFile = "e97fac43eddd037bf21752ea10150a224b9c08d267f634ea54f799023a6c5e13";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist fail ghc-prim
          hashable mtl scientific syb tagged template-haskell text time
@@ -19920,7 +19933,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_0_0_0" = callPackage
+  "aeson_1_0_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , bytestring, containers, deepseq, dlist, generic-deriving
      , ghc-prim, hashable, hashable-time, HUnit, QuickCheck
@@ -19930,8 +19943,10 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.0.0.0";
-       sha256 = "a336e25fcd547a277e55f5bdbfdbf896038d0e2311e8396cca15fb3973ef6be9";
+       version = "1.0.1.0";
+       sha256 = "6053851a44bb858691cfd991bf7ba2a0e151ae574fdd3ce3aeea33e1b2855c5f";
+       revision = "1";
+       editedCabalFile = "bb8ad9976eea1ce6d53d279639104c53da92d01ffec90d1ee56acbd6b62b4b04";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -19944,7 +19959,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
@@ -20865,13 +20879,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.3.1";
-       sha256 = "16a94b1d7fb03a6184755ad10b3c6691d9a7b5f2a02006b2891fefd6087ecaa1";
+       version = "4.3.2";
+       sha256 = "819e5f3d0c36cddf108979c816ee96fbe8da54d097939971501677cdabd2bed9";
        libraryHaskellDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
        ];
-       jailbreak = true;
        homepage = "http://github.com/dsorokin/aivika-experiment-chart";
        description = "Simulation experiments with charting for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
@@ -21335,6 +21348,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "alphachar" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens, parsec
+     , parsers, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "alphachar";
+       version = "0.0.1";
+       sha256 = "3b0e0f756de147603602b45e8d5018abd705d3a4c73ca662f306daec65e7b75d";
+       libraryHaskellDepends = [ base lens parsers ];
+       testHaskellDepends = [
+         base directory doctest filepath parsec QuickCheck template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/data61/alphachar";
+       description = "A character between a-z";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alpino-tools" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, conduit
      , containers, hexpat-pickle, MonadRandom, mtl, random-shuffle
@@ -23012,7 +23044,6 @@ self: {
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
        ];
-       doCheck = false;
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
@@ -23220,7 +23251,6 @@ self: {
          tasty-hunit tasty-quickcheck text time transformers unix
          unordered-containers
        ];
-       doCheck = false;
        homepage = "http://github.com/MichaelXavier/Angel";
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
@@ -26032,6 +26062,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec_0_13_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , QuickCheck, quickcheck-unicode, scientific, tasty
+     , tasty-quickcheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.1.0";
+       sha256 = "52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       homepage = "https://github.com/bos/attoparsec";
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-arff" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -26716,16 +26769,18 @@ self: {
      }) {};
 
   "avwx" = callPackage
-    ({ mkDerivation, attoparsec, base, HTTP, pretty-show, text }:
+    ({ mkDerivation, attoparsec, base, HTTP, lens, parsers, pretty-show
+     , text
+     }:
      mkDerivation {
        pname = "avwx";
-       version = "0.1.0.1";
-       sha256 = "6c1c7a58489a6b2b1e19c4b5ade3d606b80f61e663e755526adbcb5c5cfcd7e8";
+       version = "0.2.0.0";
+       sha256 = "6a667d54fd8eedb57fb7e48917646f8fb0acd1e68ecdccc0a3e95d3804bb5c13";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ attoparsec base HTTP text ];
+       libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ];
        executableHaskellDepends = [ base pretty-show ];
-       testHaskellDepends = [ base text ];
+       testHaskellDepends = [ attoparsec base text ];
        homepage = "https://github.com/hce/avwx";
        description = "Parse METAR weather reports";
        license = stdenv.lib.licenses.mit;
@@ -26816,7 +26871,6 @@ self: {
          resourcet tagged tasty tasty-hunit tasty-quickcheck text time
          transformers transformers-base
        ];
-       doCheck = false;
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -29339,6 +29393,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "binary-parsers" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , bytestring-lexing, deepseq, directory, filepath, QuickCheck
+     , quickcheck-instances, quickcheck-unicode, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "binary-parsers";
+       version = "0.1.0.0";
+       sha256 = "f3fcce48a05ff770c1c94f876962ced3440932783b9080fbc81c21022d63a702";
+       libraryHaskellDepends = [
+         base binary bytestring bytestring-lexing scientific
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring bytestring-lexing deepseq
+         directory filepath QuickCheck quickcheck-instances
+         quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck
+         text unordered-containers vector
+       ];
+       homepage = "https://github.com/winterland1989/binary-parsers";
+       description = "Extends binary with parsec/attoparsec style parsing combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-protocol" = callPackage
     ({ mkDerivation, base, binary, bytestring, mtl }:
      mkDerivation {
@@ -29379,7 +29457,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath hspec QuickCheck
        ];
-       doCheck = false;
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29642,7 +29719,6 @@ self: {
          base HUnit test-framework test-framework-hunit
        ];
        jailbreak = true;
-       doCheck = false;
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
@@ -30719,7 +30795,6 @@ self: {
          base base58string bitcoin-script bitcoin-tx bytestring hspec
          http-client lens text wreq
        ];
-       doCheck = false;
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Provides access to the RPC API of Bitcoin Core";
        license = stdenv.lib.licenses.mit;
@@ -30742,7 +30817,6 @@ self: {
          base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
          lens text wreq
        ];
-       doCheck = false;
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Higher level constructs on top of the bitcoin-api package";
        license = stdenv.lib.licenses.mit;
@@ -31351,7 +31425,6 @@ self: {
        testHaskellDepends = [
          base containers directory process shake stm text time unix vector
        ];
-       doCheck = false;
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
@@ -31833,7 +31906,6 @@ self: {
          QuickCheck quickcheck-properties semigroups text time
          unordered-containers vector
        ];
-       doCheck = false;
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -32165,8 +32237,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond-haskell";
-       version = "0.1.4.0";
-       sha256 = "5590a50af8e143df9b0fd9dcee284fde9f051a8684dd45f3c769ce1d54f10419";
+       version = "0.1.4.1";
+       sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900";
        libraryHaskellDepends = [
          aeson array base binary bond-haskell-compiler bytestring containers
          deepseq extra hashable mtl scientific text unordered-containers
@@ -32189,8 +32261,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond-haskell-compiler";
-       version = "0.1.4.0";
-       sha256 = "729134e6f72594997ddf4f96c237d9ac9ab8e6c6fc5a8098c1cf17623d6de266";
+       version = "0.1.4.1";
+       sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32243,6 +32315,7 @@ self: {
        homepage = "https://github.com/pkamenarsky/bookkeeper-permissions";
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -33882,6 +33955,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "c2ats" = callPackage
+    ({ mkDerivation, base, containers, HUnit, language-c, pretty
+     , regex-posix, test-framework, test-framework-hunit
+     , test-framework-th
+     }:
+     mkDerivation {
+       pname = "c2ats";
+       version = "0.1.0.1";
+       sha256 = "fd0b1a15d6545948ed719d77d3cd5cab528e3de2ff1dce371871114fb47c226f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers language-c pretty regex-posix
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit test-framework-th
+       ];
+       homepage = "https://github.com/metasepi/c2ats#readme";
+       description = "Translate C code into ATS";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "c2hs" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , dlist, filepath, HUnit, language-c, pretty, process, shelly
@@ -34096,6 +34192,7 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -34797,6 +34894,38 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "cabal2nix_2_0_2" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
+     , containers, deepseq, directory, distribution-nixpkgs, filepath
+     , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl
+     , optparse-applicative, pretty, process, SHA, split, text, time
+     , transformers, utf8-string, yaml
+     }:
+     mkDerivation {
+       pname = "cabal2nix";
+       version = "2.0.2";
+       sha256 = "f0c61d4674bbc9ba82d306adbb9fb39527aa73309fdea088489940fe39b02867";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+         directory distribution-nixpkgs filepath hackage-db language-nix
+         lens optparse-applicative pretty process SHA split text
+         transformers yaml
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+         directory distribution-nixpkgs filepath hackage-db language-nix
+         lens monad-par monad-par-extras mtl optparse-applicative pretty
+         process SHA split text time transformers utf8-string yaml
+       ];
+       homepage = "https://github.com/nixos/cabal2nix#readme";
+       description = "Convert Cabal files into Nix build instructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "cabal2spec" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , haskell98, old-locale, process, tar, time, unix, Unixutils, zlib
@@ -35372,7 +35501,6 @@ self: {
          array base bytestring containers directory filepath fortran-src
          hmatrix hspec mtl QuickCheck uniplate
        ];
-       doCheck = false;
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -35955,7 +36083,6 @@ self: {
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -36520,10 +36647,10 @@ self: {
          unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec unordered-containers ];
-       doCheck = false;
        homepage = "https://github.com/MichelBoucey/cayley-client";
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -38396,6 +38523,7 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude" = callPackage
@@ -38414,10 +38542,10 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
-       doCheck = false;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -38448,6 +38576,7 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-verilog" = callPackage
@@ -38465,6 +38594,7 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -38482,6 +38612,7 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classify" = callPackage
@@ -39081,12 +39212,23 @@ self: {
        sha256 = "886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       doCheck = false;
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "clock-extras" = callPackage
+    ({ mkDerivation, base, clock, hspec }:
+     mkDerivation {
+       pname = "clock-extras";
+       version = "0.1.0.1";
+       sha256 = "7fce6106ea22e4a9322b53f3e2feb94f03481d3f9d5c2fb3280118db6fb5b623";
+       libraryHaskellDepends = [ base clock ];
+       testHaskellDepends = [ base hspec ];
+       description = "A couple functions that probably should be in the 'clock' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "clocked" = callPackage
     ({ mkDerivation, base, clock, containers, MonadCatchIO-transformers
      , QtCore, transformers
@@ -39295,9 +39437,9 @@ self: {
          base binary hierarchical-clustering matrices mwc-random Rlang-QQ
          split tasty tasty-hunit tasty-quickcheck vector
        ];
-       doCheck = false;
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clustertools" = callPackage
@@ -39639,6 +39781,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "code-page" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "code-page";
+       version = "0.1";
+       sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/RyanGlScott/code-page";
+       description = "Windows code page library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "codec" = callPackage
     ({ mkDerivation, aeson, base, binary, binary-bits, bytestring
      , data-default-class, mtl, template-haskell, text, transformers
@@ -40157,6 +40312,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "colour-space" = callPackage
+    ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "colour-space";
+       version = "0.1.0.0";
+       sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48";
+       libraryHaskellDepends = [
+         base colour JuicyPixels manifolds semigroups vector-space
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/leftaroundabout/colour-space";
+       description = "Instances of the manifold-classes for colour types";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "coltrane" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, http-types, HUnit, mtl
      , regex-compat, text, wai, wai-extra, warp
@@ -41165,7 +41338,6 @@ self: {
          unbounded-delays
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -41529,8 +41701,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-connection";
-       version = "0.1.0.1";
-       sha256 = "c4020f9f2aba7baedeb7dceb9ac092e2aefaa7480d57eb38595800da911671fc";
+       version = "0.1.0.2";
+       sha256 = "6559115e670911b51a0ce0eb3ea4893fa1c2d32d9c2706af6c835137fbf682ce";
        libraryHaskellDepends = [
          base bytestring conduit connection resourcet transformers
        ];
@@ -41570,6 +41742,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_1_13_3" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , hspec, monad-control, network, primitive, process, QuickCheck
+     , resourcet, stm, streaming-commons, text, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.1.13.3";
+       sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit exceptions hspec process QuickCheck resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -41864,6 +42064,41 @@ self: {
        pname = "configuration-tools";
        version = "0.2.14";
        sha256 = "c54c40d72423207f63c7108ea6076612a179c0c35d7e10e540858ba92946f9fb";
+       revision = "1";
+       editedCabalFile = "7f01977bdb2fa42e3bf503d036db68e4c2d2aba13295b817c812ce17067ca1fc";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
+         base64-bytestring bytestring Cabal case-insensitive connection
+         data-default deepseq directory dlist enclosed-exceptions filepath
+         http-client http-client-tls http-types monad-control mtl
+         network-uri optparse-applicative process profunctors text tls
+         transformers unordered-containers x509 x509-system x509-validation
+         yaml
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols bytestring Cabal enclosed-exceptions
+         http-types monad-control mtl text transformers unordered-containers
+         wai warp warp-tls yaml
+       ];
+       homepage = "https://github.com/alephcloud/hs-configuration-tools";
+       description = "Tools for specifying and parsing configurations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "configuration-tools_0_2_15" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
+     , case-insensitive, connection, data-default, deepseq, directory
+     , dlist, enclosed-exceptions, filepath, http-client
+     , http-client-tls, http-types, monad-control, mtl, network-uri
+     , optparse-applicative, process, profunctors, text, tls
+     , transformers, unordered-containers, wai, warp, warp-tls, x509
+     , x509-system, x509-validation, yaml
+     }:
+     mkDerivation {
+       pname = "configuration-tools";
+       version = "0.2.15";
+       sha256 = "8231a7a893add8ae78ccb2b25e0fa98b0c0fd7d7a5f6e2e88d3711e93576121e";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
@@ -41881,6 +42116,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configurator" = callPackage
@@ -42091,8 +42327,8 @@ self: {
     ({ mkDerivation, base, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.2.5.1";
-       sha256 = "660941f0cfc79793a2102a8638802f5df009a8cc155ca3194c76e3902feaede8";
+       version = "0.3.0.0";
+       sha256 = "71bd103c5c3fa5faaf3c727fd42e9202ed6798c0cd7fb143ab9baa2e7dae5bc2";
        libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -42199,10 +42435,10 @@ self: {
        testHaskellDepends = [
          base http-client HUnit network tasty tasty-hunit text transformers
        ];
-       doCheck = false;
        homepage = "https://github.com/alphaHeavy/consul-haskell";
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consumers" = callPackage
@@ -43564,10 +43800,9 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, deepseq }:
      mkDerivation {
        pname = "cpuinfo";
-       version = "0.1.0.0";
-       sha256 = "31dda274cd488fcdb295617aa2ed754ee697ad653edef5cf7fba56cb8e942623";
+       version = "0.1.0.1";
+       sha256 = "d1b3e3992cc0c82edfb21f30e1684bb66e6a3cb23a26b777a079702362d05655";
        libraryHaskellDepends = [ attoparsec base bytestring deepseq ];
-       jailbreak = true;
        homepage = "https://github.com/TravisWhitaker/cpuinfo";
        description = "Haskell Library for Checking CPU Information";
        license = stdenv.lib.licenses.mit;
@@ -43609,8 +43844,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql";
-       version = "3.1.0";
-       sha256 = "0639f54c5c1e1a96b27203691aa0b37d59c4309aac1f75c20864d41ad86f4c53";
+       version = "3.1.1";
+       sha256 = "45b0d9599dfb6b5df02eb17e18d45cef8abd7e175d4eb7f99ab94f9d50866da3";
        libraryHaskellDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid vector
@@ -43858,6 +44093,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "craft" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
+     , bytestring, conduit, conduit-combinators, conduit-extra
+     , containers, cryptonite, derive, directory, exceptions
+     , fast-logger, filepath, formatting, free, hspec, hspec-megaparsec
+     , ini, lens, lifted-base, megaparsec, memory, MissingH
+     , monad-logger, mtl, path, path-io, process, process-extras
+     , pureMD5, QuickCheck, random, split, streaming-commons
+     , template-haskell, text, transformers, unix, unordered-containers
+     , versions, wreq, yaml
+     }:
+     mkDerivation {
+       pname = "craft";
+       version = "0.0.0.1";
+       sha256 = "34cb8c42afa115c0c834af170cb7c51a15fa8819e24bd310c1288a8ad6eb6ad3";
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal async base bytestring conduit
+         conduit-combinators conduit-extra containers cryptonite derive
+         directory exceptions fast-logger filepath formatting free ini lens
+         lifted-base megaparsec memory MissingH monad-logger mtl path
+         path-io process process-extras pureMD5 QuickCheck random split
+         streaming-commons template-haskell text transformers unix
+         unordered-containers versions wreq yaml
+       ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec QuickCheck
+       ];
+       jailbreak = true;
+       description = "A UNIX configuration management library in Haskell";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "craftwerk" = callPackage
     ({ mkDerivation, base, colour, mtl, vector-space }:
      mkDerivation {
@@ -44554,7 +44822,6 @@ self: {
          base byteable bytestring crypto-random tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       doCheck = false;
        homepage = "https://github.com/vincenthz/hs-crypto-numbers";
        description = "Cryptographic numbers: functions and algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -44578,7 +44845,6 @@ self: {
          crypto-random cryptohash tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
-       doCheck = false;
        homepage = "https://github.com/vincenthz/hs-crypto-pubkey";
        description = "Public Key cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -44664,6 +44930,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "crypto-simple" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "crypto-simple";
+       version = "0.1.0.0";
+       sha256 = "a90f3e2643bbeee1849581df44e8705c296d590cc8e25e0b6bf5bebc9fe62e6e";
+       libraryHaskellDepends = [ base bytestring cryptonite ];
+       testHaskellDepends = [
+         base bytestring cryptonite hspec QuickCheck
+       ];
+       homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme";
+       description = "A simple high level encryption interface based on cryptonite";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "crypto-totp" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , tagged, unix
@@ -44856,6 +45137,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptonite_0_20" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
+     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.20";
+       sha256 = "261bfac4e032f24658a31d8c34abd0c0f64f9de07be69ad43a9139a7c0b5c354";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testHaskellDepends = [
+         base byteable bytestring memory tasty tasty-hunit tasty-kat
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , cryptonite, resourcet, transformers
@@ -45110,7 +45413,6 @@ self: {
        sha256 = "dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
-       doCheck = false;
        homepage = "http://www.yesodweb.com/";
        description = "CSS parser and renderer";
        license = stdenv.lib.licenses.mit;
@@ -47318,17 +47620,20 @@ self: {
 
   "data-msgpack" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, deepseq, hashable, hspec, QuickCheck, text
-     , unordered-containers
+     , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.2";
-       sha256 = "59c591a565e0429f6de70d1d8e14c7588547bdff443f0769835f4a534e0690ee";
+       version = "0.0.3";
+       sha256 = "8df834c9495ff45c68a09a67a01dcf7ae5288d88c3e3af0d8b2060e19f841a6a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 deepseq
          hashable QuickCheck text unordered-containers
        ];
+       executableHaskellDepends = [ base bytestring groom ];
        testHaskellDepends = [
          base bytestring containers hashable hspec QuickCheck text
          unordered-containers
@@ -49700,16 +50005,17 @@ self: {
      }) {};
 
   "derive-storable" = callPackage
-    ({ mkDerivation, base, generic-storable, hspec, QuickCheck }:
+    ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.0.2";
-       sha256 = "76e8ae7d85fe9befa23a8667c4531b212cea777db7e1d6b573be54d3ce8681f5";
+       version = "0.1.0.3";
+       sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base generic-storable hspec QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
        description = "Derive Storable instances with help of GHC.Generics.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-storable-plugin" = callPackage
@@ -49722,6 +50028,7 @@ self: {
        homepage = "https://www.github.com/mkloczko/derive-storable-plugin/";
        description = "GHC core plugin supporting the derive-storable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-topdown" = callPackage
@@ -51143,6 +51450,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dimensional_1_0_1_3" = callPackage
+    ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector
+     }:
+     mkDerivation {
+       pname = "dimensional";
+       version = "1.0.1.3";
+       sha256 = "3bc566a59227115325caec0ea00a35e025e5ea471a3ab531cf595e5365aa93a7";
+       libraryHaskellDepends = [
+         base deepseq exact-pi numtype-dk vector
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/bjornbm/dimensional/";
+       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dimensional-codata" = callPackage
     ({ mkDerivation, base, dimensional, numtype-dk }:
      mkDerivation {
@@ -51392,7 +51716,6 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
        ];
-       doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
@@ -51791,6 +52114,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -52004,6 +52328,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-registry";
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-simplelocalnet" = callPackage
@@ -52058,6 +52383,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -52096,6 +52422,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -52386,7 +52713,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
@@ -52422,7 +52748,6 @@ self: {
          conduit-extra containers doctest hspec iproute mtl network random
          resourcet safe word8
        ];
-       doCheck = false;
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -52487,6 +52812,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "do-list_1_0_1" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "do-list";
+       version = "1.0.1";
+       sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/tserduke/do-list#readme";
+       description = "Do notation for free";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -52668,7 +53007,6 @@ self: {
          HUnit process QuickCheck setenv silently stringbuilder syb
          transformers with-location
        ];
-       doCheck = false;
        homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
@@ -52733,7 +53071,6 @@ self: {
        sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
-       doCheck = false;
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53456,10 +53793,10 @@ self: {
        testHaskellDepends = [
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
-       doCheck = false;
        homepage = "http://github.com/michaelxavier/drifter-postgresql";
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drmaa" = callPackage
@@ -54111,19 +54448,20 @@ self: {
   "dynamic-plot" = callPackage
     ({ mkDerivation, async, base, colour, constrained-categories
      , containers, data-default, deepseq, diagrams-cairo, diagrams-core
-     , diagrams-gtk, diagrams-lib, glib, gtk, lens, manifolds, MemoTrie
-     , MonadRandom, mtl, process, random, semigroups, tagged, time
-     , transformers, vector, vector-space
+     , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens
+     , manifolds, MemoTrie, MonadRandom, mtl, process, random
+     , semigroups, tagged, time, transformers, vector, vector-space
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.1.3.0";
-       sha256 = "e6fcb68028ffb4148b7cd00fd87a5bb34a4be3f8995669ad136b37dc24747588";
+       version = "0.1.4.0";
+       sha256 = "7b67a4433324a76e2a6892cbcb9ce2250db09dd32583d6d29b63161ca954b18d";
        libraryHaskellDepends = [
          async base colour constrained-categories containers data-default
-         deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib
-         gtk lens manifolds MemoTrie MonadRandom mtl process random
-         semigroups tagged time transformers vector vector-space
+         deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib
+         free-vector-spaces glib gtk lens manifolds MemoTrie MonadRandom mtl
+         process random semigroups tagged time transformers vector
+         vector-space
        ];
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
@@ -54505,7 +54843,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
        ];
-       doCheck = false;
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -55421,15 +55758,16 @@ self: {
      }) {};
 
   "elm-export" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, hspec
-     , hspec-core, mtl, QuickCheck, quickcheck-instances, text, time
+    ({ mkDerivation, base, bytestring, containers, directory
+     , formatting, hspec, hspec-core, mtl, QuickCheck
+     , quickcheck-instances, text, time
      }:
      mkDerivation {
        pname = "elm-export";
-       version = "0.4.0.1";
-       sha256 = "9aa94c4d0ed01a6f6344778eee2e87b6489fc9ddd1de87154acb2be67fb7b79e";
+       version = "0.4.1.0";
+       sha256 = "7932ebbf549f02637196a888fe6c2bbfa929f93f9b5dfe8474057f8adf6c3681";
        libraryHaskellDepends = [
-         base bytestring containers directory mtl text time
+         base bytestring containers directory formatting mtl text time
        ];
        testHaskellDepends = [
          base bytestring containers hspec hspec-core QuickCheck
@@ -56850,6 +57188,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ersaconcat" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, HTTP
+     , network-uri, process, QuickCheck, tagsoup, template-haskell
+     }:
+     mkDerivation {
+       pname = "ersaconcat";
+       version = "0.0.1";
+       sha256 = "7652c59b606769366babbff4b657cd8422ddb3f4aeb62afcc8ed0ce1a3ec139f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath HTTP network-uri process tagsoup
+       ];
+       executableHaskellDepends = [
+         base directory filepath HTTP network-uri process tagsoup
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/tonymorris/ersaconcat";
+       description = "A script to concatenate AIP ERSA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ersatz" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
      , directory, doctest, filepath, lens, mtl, parsec, process
@@ -56869,7 +57231,6 @@ self: {
          array base containers lens mtl parsec
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       doCheck = false;
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -57051,7 +57412,6 @@ self: {
          aeson base bytestring http-conduit text time
        ];
        testHaskellDepends = [ async base hspec MonadRandom mtl text ];
-       doCheck = false;
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
      }) {};
@@ -57377,27 +57737,27 @@ self: {
          aeson base connection dotnet-timespan stm tasty tasty-hunit text
          time
        ];
-       doCheck = false;
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventstore_0_13_1_3" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bytestring, cereal
+  "eventstore_0_13_1_4" = callPackage
+    ({ mkDerivation, aeson, array, base, cereal, classy-prelude
      , connection, containers, dns, dotnet-timespan, http-client
      , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
      , unordered-containers, uuid
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.13.1.3";
-       sha256 = "027dda722c410a7b528537c4f296040b90c16cf91d95362356e608c672de6b2a";
+       version = "0.13.1.4";
+       sha256 = "a72952384c37b1c11c9365fb7c2965bdbad1bf4dc6f54b66462116c7f03e92f7";
        libraryHaskellDepends = [
-         aeson array async base bytestring cereal connection containers dns
-         dotnet-timespan http-client protobuf random semigroups stm text
-         time unordered-containers uuid
+         aeson array base cereal classy-prelude connection containers dns
+         dotnet-timespan http-client protobuf random semigroups stm time
+         unordered-containers uuid
        ];
        testHaskellDepends = [
          aeson base connection dotnet-timespan stm tasty tasty-hunit text
@@ -57737,8 +58097,8 @@ self: {
     ({ mkDerivation, base, constraints, singletons }:
      mkDerivation {
        pname = "exinst";
-       version = "0.1.1";
-       sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147";
+       version = "0.1.2";
+       sha256 = "61f1ad1d9ea25e7ff6edca9ac4b01681e6ab5d0af577c1c07c78afdac1ef5cfa";
        libraryHaskellDepends = [ base constraints singletons ];
        jailbreak = true;
        homepage = "https://github.com/k0001/exinst";
@@ -57751,8 +58111,8 @@ self: {
     ({ mkDerivation, aeson, base, constraints, exinst, singletons }:
      mkDerivation {
        pname = "exinst-aeson";
-       version = "0.1.0.1";
-       sha256 = "bc916d6b4c3e6617b1b82e895b8a373f9ee1f2bf7c9b22efb43e8fb616995162";
+       version = "0.1.0.2";
+       sha256 = "da509d6ab2c73c22cf718c3b08dcf2327b42abb0f5d0273d38ae4c530f737fa1";
        libraryHaskellDepends = [
          aeson base constraints exinst singletons
        ];
@@ -57767,8 +58127,8 @@ self: {
     ({ mkDerivation, base, bytes, constraints, exinst, singletons }:
      mkDerivation {
        pname = "exinst-bytes";
-       version = "0.1.0.1";
-       sha256 = "5dc66779093560fce4d5c4722615dab2d330d5c29bca4937981b009a391a8e67";
+       version = "0.1.0.2";
+       sha256 = "cc830f4af107b32738f83ef87eb1f77f08453758645bd0519d734beb311dec29";
        libraryHaskellDepends = [
          base bytes constraints exinst singletons
        ];
@@ -57783,10 +58143,9 @@ self: {
     ({ mkDerivation, base, constraints, deepseq, exinst }:
      mkDerivation {
        pname = "exinst-deepseq";
-       version = "0.1";
-       sha256 = "ea7e155a3a09064f65c39cd5e4323a64b8bf8dc4aa32de33b3495207315c361d";
+       version = "0.1.0.1";
+       sha256 = "078e2bb2f7759555976305fcabae776e7ae331f21a9ac3e5d563f923198f3799";
        libraryHaskellDepends = [ base constraints deepseq exinst ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
@@ -57797,8 +58156,8 @@ self: {
     ({ mkDerivation, base, constraints, exinst, hashable, singletons }:
      mkDerivation {
        pname = "exinst-hashable";
-       version = "0.1.0.1";
-       sha256 = "7e76bd3604659dcb861a269362e1311bfe26ac92d5b88d6d6aa8253136c9ba68";
+       version = "0.1.0.2";
+       sha256 = "3a3051b1a0ccdd13317dcf190944609604f6ce5004a7b05d8327b7202a90ee65";
        libraryHaskellDepends = [
          base constraints exinst hashable singletons
        ];
@@ -59040,7 +59399,6 @@ self: {
          text time transformers
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/prowdsponsor/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
@@ -61565,14 +61923,13 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.0.0";
-       sha256 = "7a5a95fb465d87810e6653d39235d861516f53229144cd9d46ab7a3bdf316cd3";
+       version = "0.1.1.0";
+       sha256 = "aea55a29d9ae80d7007e78a2b49ab49495feb0aa640ac8d9c158d3afbaf0a04f";
        libraryHaskellDepends = [ base foldl math-functions profunctors ];
        testHaskellDepends = [
          base foldl profunctors quickcheck-instances statistics tasty
          tasty-quickcheck vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
@@ -62700,15 +63057,19 @@ self: {
      }) {};
 
   "free-vector-spaces" = callPackage
-    ({ mkDerivation, base, lens, linear, MemoTrie, vector-space }:
+    ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space
+     }:
      mkDerivation {
        pname = "free-vector-spaces";
-       version = "0.1.0.0";
-       sha256 = "9b8d239b900d47869d019fb67c36f369e9ca53a8e95cdad14d00486e7992dbbc";
-       libraryHaskellDepends = [ base lens linear MemoTrie vector-space ];
+       version = "0.1.1.0";
+       sha256 = "fa4066b3cb1e6e58ca471e953154acaca9f978cfc81d3987552da79c4805f1b4";
+       libraryHaskellDepends = [
+         base lens linear MemoTrie vector vector-space
+       ];
        homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -62858,6 +63219,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "french-cards" = callPackage
+    ({ mkDerivation, base, hspec, HUnit }:
+     mkDerivation {
+       pname = "french-cards";
+       version = "0.1.1";
+       sha256 = "5c70660593be3ecf1af9a9a30a41498f36aa45bd69825bf7b3793187d7576fd3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
+       homepage = "https://github.com/tserduke/french-cards#readme";
+       description = "French Playing Cards";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fresco-binding" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, messagepack
      , text, unix
@@ -63139,7 +63513,6 @@ self: {
          async base directory filepath tasty tasty-hunit temporary-rc
          unix-compat
        ];
-       doCheck = false;
        homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
@@ -65411,7 +65784,6 @@ self: {
        testHaskellDepends = [
          array base binary bytestring containers mtl
        ];
-       doCheck = false;
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65627,7 +65999,6 @@ self: {
          mtl old-time optparse-applicative pretty process split time
        ];
        testHaskellDepends = [ base doctest hspec ];
-       doCheck = false;
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
@@ -66161,7 +66532,6 @@ self: {
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process tasty tasty-hunit terminal-size time unix
        ];
-       doCheck = false;
        homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
@@ -68260,10 +68630,10 @@ self: {
        testHaskellDepends = [
          aeson base directory doctest Glob hspec process transformers
        ];
-       doCheck = false;
        homepage = "https://github.com/myfreeweb/gitson";
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitter" = callPackage
@@ -68516,10 +68886,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.16";
-       sha256 = "cb6129842e91bf08c13841ce9409f52c4c827533ca8b75d6ea557567e84190ba";
-       revision = "1";
-       editedCabalFile = "ff2ebb1142cb8d3d6613a70050b237b454cd6d177ffaee0bed694fe68c82703d";
+       version = "2.17";
+       sha256 = "b0d7ade81c100e760b13079feeac8c4a701a9b24464191c27517f8829880f7a6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -68532,9 +68900,11 @@ self: {
        ];
        executableHaskellDepends = [ base lens text ];
        testHaskellDepends = [ base HUnit ];
+       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gll" = callPackage
@@ -70968,6 +71338,7 @@ self: {
        homepage = "http://github.com/tgolson/gpio";
        description = "Haskell GPIO interface, designed specifically for the RaspberryPi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpolyline" = callPackage
@@ -71646,7 +72017,6 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
-       doCheck = false;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -71742,10 +72112,10 @@ self: {
          aeson aeson-casing base bytestring file-embed network scientific
          tasty tasty-hunit text time vector
        ];
-       doCheck = false;
        homepage = "https://github.com/AndrewRademacher/haskell-graylog";
        description = "Support for graylog output";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greencard" = callPackage
@@ -72341,7 +72711,6 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk2 ];
-       doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -72643,7 +73012,6 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -73087,6 +73455,48 @@ self: {
        pname = "hOpenPGP";
        version = "2.5.1";
        sha256 = "6b590806d05485dea63095f91f7c201d578b3bd7de86eee672f141eb9efd08ce";
+       revision = "1";
+       editedCabalFile = "ea8e25ddecdd0bdcfcbac5a9a94d7b2a9d59e09a2ee29aacfde16df50483de14";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hOpenPGP_2_5_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.5.2";
+       sha256 = "856c0f223602cfc775c8173cd64378064208b8133eabc37c0f6da8126221b8c2";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
@@ -73109,6 +73519,7 @@ self: {
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -75006,6 +75417,7 @@ self: {
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -76209,7 +76621,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
-       doCheck = false;
        homepage = "http://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -77478,6 +77889,20 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_18_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.18.4";
+       sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryPkgconfigDepends = [ glib ];
+       homepage = "https://github.com/haskell-gi/haskell-gi-base";
+       description = "Foundation for libraries generated by haskell-gi";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "haskell-google-trends" = callPackage
     ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
      , regex-base, regex-posix, tagsoup, text, wreq
@@ -77659,10 +78084,10 @@ self: {
          base containers filemanip filepath haskell-src-exts mtl pretty-show
          tasty tasty-golden traverse-with-class
        ];
-       doCheck = false;
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-names_0_8_0" = callPackage
@@ -77717,10 +78142,10 @@ self: {
          text transformers transformers-base transformers-compat
          unordered-containers vector
        ];
-       doCheck = false;
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -77995,6 +78420,7 @@ self: {
          base containers directory filepath mtl pretty-show smallcheck tasty
          tasty-golden tasty-smallcheck
        ];
+       doCheck = false;
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -79032,7 +79458,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
-       doCheck = false;
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the core Bitcoin protocol features";
        license = stdenv.lib.licenses.publicDomain;
@@ -79371,16 +79796,14 @@ self: {
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.2";
-       sha256 = "92c7742ff50527dd5ff45cf65c2009f364b06e17bdc4e41874a75bbf0c1f75fc";
+       version = "0.69.2.1";
+       sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory filepath json unix utf8-string
        ];
-       executableHaskellDepends = [
-         base bytestring directory filepath HUnit json unix utf8-string
-       ];
+       executableHaskellDepends = [ base directory filepath unix ];
        testHaskellDepends = [
          base bytestring directory filepath HUnit json unix utf8-string
        ];
@@ -79473,12 +79896,41 @@ self: {
          data-default-class QuickCheck quickcheck-instances rebase tasty
          tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
-       doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_15_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , data-default-class, dlist, either, hashable, hashtables, loch-th
+     , mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, scientific
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.15.1";
+       sha256 = "5285147d09d044dea3fa1e9579e436ce8347f41a8b3d3c8da5d2e5d1f7c21421";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring
+         bytestring-tree-builder contravariant contravariant-extras
+         data-default-class dlist either hashable hashtables loch-th mtl
+         placeholders postgresql-binary postgresql-libpq profunctors
+         scientific semigroups text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         data-default-class QuickCheck quickcheck-instances rebase tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base-prelude, bytestring, either, free, list-t
      , text, transformers, vector
@@ -79702,7 +80154,6 @@ self: {
          base bytestring directory HUnit mtl syb text
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "http://github.com/lymar/hastache";
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
@@ -81080,7 +81531,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
-       doCheck = false;
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
@@ -81168,7 +81618,6 @@ self: {
          async base bytestring HUnit mtl slave-thread stm test-framework
          test-framework-hunit text time
        ];
-       doCheck = false;
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
@@ -82336,8 +82785,8 @@ self: {
     ({ mkDerivation, base, containers, text, unordered-containers }:
      mkDerivation {
        pname = "hext";
-       version = "0.1.0.3";
-       sha256 = "76e2cd8d655fead634401f65d698f2ef03617dae2bd2a6287e9f461f11861588";
+       version = "0.1.0.4";
+       sha256 = "a2e76f7f25853d5533dcec2819c6c1e267d53828088498861be3d493ee6b1451";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82454,8 +82903,8 @@ self: {
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.0.2.2";
-       sha256 = "36610511a051f13e8b604f090eff467ff88bf40d2edc809d99d7246b9ac22d5f";
+       version = "0.0.2.3";
+       sha256 = "22ced71f926ecece0ab3b33fdfabd004fb1812eaab1f2234280e012cbf2aba98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82468,6 +82917,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://github.com/danstiner/hfmt";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
@@ -82996,6 +83446,7 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "hieraclus" = callPackage
@@ -83240,6 +83691,29 @@ self: {
        license = "GPL";
      }) {};
 
+  "highlighting-kate_0_6_3" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers, Diff
+     , directory, filepath, mtl, parsec, pcre-light, process
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "highlighting-kate";
+       version = "0.6.3";
+       sha256 = "71dab85c49b038053b90062ed882e486233cbaa2b762d017224d06482075840d";
+       configureFlags = [ "-fpcre-light" ];
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers mtl parsec pcre-light
+         utf8-string
+       ];
+       testHaskellDepends = [
+         base blaze-html containers Diff directory filepath process
+       ];
+       homepage = "http://github.com/jgm/highlighting-kate";
+       description = "Syntax highlighting";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hills" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
      , optparse-applicative, text, transformers
@@ -83348,10 +83822,10 @@ self: {
        testHaskellDepends = [
          base directory haskell-src-exts hspec monad-loops mtl text
        ];
-       doCheck = false;
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hindent_5_2_1" = callPackage
@@ -85359,8 +85833,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        testSystemDepends = [ ocilib ];
-       doHaddock = false;
-       doCheck = false;
        homepage = "https://github.com/fpinsight/hocilib";
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
@@ -85986,6 +86458,7 @@ self: {
          transformers uniplate unix vector vector-algorithms wai warp
        ];
        testHaskellDepends = [ base directory filepath process temporary ];
+       testTarget = "--test-option=--no-net";
        homepage = "http://www.haskell.org/hoogle/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
@@ -86018,6 +86491,7 @@ self: {
          utf8-string vector wai wai-logger warp warp-tls zlib
        ];
        executableHaskellDepends = [ base ];
+       testTarget = "--test-option=--no-net";
        homepage = "http://hoogle.haskell.org/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
@@ -86048,6 +86522,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        jailbreak = true;
+       testTarget = "--test-option=--no-net";
        homepage = "http://hoogle.haskell.org/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
@@ -86205,6 +86680,38 @@ self: {
        license = "unknown";
      }) {};
 
+  "hopenpgp-tools_0_19_3" = callPackage
+    ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
+     , base, base16-bytestring, binary, binary-conduit, bytestring
+     , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
+     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
+     , http-client-tls, http-types, ixset-typed, lens, monad-loops
+     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, wl-pprint-terminfo, yaml
+     }:
+     mkDerivation {
+       pname = "hopenpgp-tools";
+       version = "0.19.3";
+       sha256 = "4f1b7ce4fa6f1efa39fd0388204d24d82b9293e8cf1087b2790013a350bbd26f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
+         binary-conduit bytestring conduit conduit-extra containers
+         crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
+         http-client http-client-tls http-types ixset-typed lens monad-loops
+         openpgp-asciiarmor optparse-applicative resourcet text time
+         time-locale-compat transformers unordered-containers
+         wl-pprint-extras wl-pprint-terminfo yaml
+       ];
+       executableToolDepends = [ alex happy ];
+       homepage = "http://floss.scru.org/hopenpgp-tools";
+       description = "hOpenPGP-based command-line tools";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hopenssl" = callPackage
     ({ mkDerivation, base, bytestring, mtl, openssl }:
      mkDerivation {
@@ -89695,6 +90202,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_2_4" = callPackage
+    ({ mkDerivation, base, directory, hspec-core, hspec-discover
+     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.2.4";
+       sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
+         transformers
+       ];
+       testHaskellDepends = [
+         base directory hspec-core hspec-discover hspec-expectations
+         hspec-meta HUnit QuickCheck stringbuilder transformers
+       ];
+       jailbreak = true;
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -89763,6 +90294,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_2_4" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq
+     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
+     , quickcheck-io, random, setenv, silently, tf-random, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.2.4";
+       sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475";
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv tf-random time transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations hspec-meta
+         HUnit process QuickCheck quickcheck-io random setenv silently
+         tf-random time transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
@@ -89779,6 +90335,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_2_4" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.2.4";
+       sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
@@ -89851,10 +90424,10 @@ self: {
          ansi-terminal base Diff hscolour HUnit nicify-lib text
        ];
        testHaskellDepends = [ aeson base hspec HUnit text ];
-       doCheck = false;
        homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -91701,6 +92274,8 @@ self: {
        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
@@ -91712,19 +92287,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client-tls_0_3_1_1" = callPackage
+  "http-client-tls_0_3_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , cryptonite, data-default-class, hspec, http-client, http-types
-     , memory, network, tls, transformers
+     , cryptonite, data-default-class, exceptions, hspec, http-client
+     , http-types, memory, network, tls, transformers
      }:
      mkDerivation {
        pname = "http-client-tls";
-       version = "0.3.1.1";
-       sha256 = "a724fd0dfca81c1454834a888e637c27aeb77a3efc26de06718080cb3cc52af3";
+       version = "0.3.3";
+       sha256 = "ec1c676989aa7a53aa414d4bf2613573a8766dcf81db826365bdf20ce981a064";
        libraryHaskellDepends = [
          base bytestring case-insensitive connection cryptonite
-         data-default-class http-client http-types memory network tls
-         transformers
+         data-default-class exceptions http-client http-types memory network
+         tls transformers
        ];
        testHaskellDepends = [ base hspec http-client http-types ];
        jailbreak = true;
@@ -92060,6 +92635,63 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-pony" = callPackage
+    ({ mkDerivation, base, bytestring, network, pipes, pipes-network
+     , pipes-safe, transformers
+     }:
+     mkDerivation {
+       pname = "http-pony";
+       version = "0.1.0.2";
+       sha256 = "0158da9e0796d2f7b4969c7ea2bbbe38991304e58d47a80f0816ded1d0b89a7b";
+       libraryHaskellDepends = [
+         base bytestring network pipes pipes-network pipes-safe transformers
+       ];
+       homepage = "https://github.com/nfjinjing/http-pony";
+       description = "A type unsafe http library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "http-pony-serve-wai" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , case-insensitive, http-types, network, pipes, pipes-bytestring
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "http-pony-serve-wai";
+       version = "0.1.0.0";
+       sha256 = "7ead2939a5e4408996fd6a4d64075f4118446ebde4972112dd60e3a621a3425f";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring case-insensitive
+         http-types network pipes pipes-bytestring transformers wai
+       ];
+       description = "Serve a WAI application with http-pony";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "http-pony-transformer-case-insensitive" = callPackage
+    ({ mkDerivation, base, case-insensitive, lens, profunctors }:
+     mkDerivation {
+       pname = "http-pony-transformer-case-insensitive";
+       version = "0.1.0.0";
+       sha256 = "5e43b3ee6caefb5ffda5abc056c9c4a4519a8af4cf5dd1d04e851838ef883206";
+       libraryHaskellDepends = [ base case-insensitive lens profunctors ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "http-pony-transformer-http" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, pipes
+     , pipes-attoparsec, transformers
+     }:
+     mkDerivation {
+       pname = "http-pony-transformer-http";
+       version = "0.1.0.0";
+       sha256 = "645623db8c4bf92746358fbbc0cf4e7d19392565f4c019f9dc8d1df515efeba3";
+       libraryHaskellDepends = [
+         attoparsec base bytestring pipes pipes-attoparsec transformers
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-proxy" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , bytestring-lexing, case-insensitive, conduit, conduit-extra
@@ -93156,10 +93788,10 @@ self: {
          aeson attoparsec base bytestring hedis hspec hspec-contrib HUnit
          text time uuid
        ];
-       doCheck = false;
        homepage = "http://github.com/dbp/hworker";
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hworker-ses" = callPackage
@@ -93177,6 +93809,7 @@ self: {
        homepage = "http://github.com/dbp/hworker-ses";
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hws" = callPackage
@@ -93508,13 +94141,12 @@ self: {
      }:
      mkDerivation {
        pname = "hxt-tagsoup";
-       version = "9.1.3";
-       sha256 = "e7601d375af58c5a806002a61c1e077f60e70ab04e708fbbeb090e6e644ae4e6";
+       version = "9.1.4";
+       sha256 = "d77b290d63acf0ac8e5a07c5c69753f9984b97e0c9d2c0befadd7dd5b144b283";
        libraryHaskellDepends = [
          base hxt hxt-charproperties hxt-unicode tagsoup
        ];
-       jailbreak = true;
-       homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+       homepage = "https://github.com/UweSchmidt/hxt";
        description = "TagSoup parser for HXT";
        license = "unknown";
      }) {};
@@ -94111,7 +94743,6 @@ self: {
          base containers directory doctest filepath unordered-containers
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "http://github.com/ekmett/hyphenation";
        description = "Configurable Knuth-Liang hyphenation";
        license = stdenv.lib.licenses.bsd3;
@@ -94663,12 +95294,55 @@ self: {
          optparse-applicative process tagged tasty tasty-golden tasty-rerun
          time transformers
        ];
-       doCheck = false;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
+  "idris_0_12_3" = callPackage
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
+     , ansi-wl-pprint, array, async, base, base64-bytestring, binary
+     , blaze-html, blaze-markup, bytestring, cheapskate, containers
+     , deepseq, directory, filepath, fingertree, fsnotify, gmp
+     , haskeline, ieee754, libffi, mtl, network, optparse-applicative
+     , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty
+     , tasty-golden, tasty-rerun, terminal-size, text, time
+     , transformers, transformers-compat, trifecta, uniplate, unix
+     , unordered-containers, utf8-string, vector
+     , vector-binary-instances, zip-archive
+     }:
+     mkDerivation {
+       pname = "idris";
+       version = "0.12.3";
+       sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6";
+       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
+         base base64-bytestring binary blaze-html blaze-markup bytestring
+         cheapskate containers deepseq directory filepath fingertree
+         fsnotify haskeline ieee754 libffi mtl network optparse-applicative
+         parsers pretty process regex-tdfa safe split terminal-size text
+         time transformers transformers-compat trifecta uniplate unix
+         unordered-containers utf8-string vector vector-binary-instances
+         zip-archive
+       ];
+       librarySystemDepends = [ gmp ];
+       executableHaskellDepends = [
+         base directory filepath haskeline transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath haskeline
+         optparse-applicative process tagged tasty tasty-golden tasty-rerun
+         time transformers
+       ];
+       homepage = "http://www.idris-lang.org/";
+       description = "Functional Programming Language with Dependent Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gmp;};
+
   "ieee" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -95868,8 +96542,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "indexed";
-       version = "0.1";
-       sha256 = "2274650021b803c6e55828f18b27a08d7b7b95767c306804154dea5ba2bfa5b7";
+       version = "0.1.3";
+       sha256 = "ef84090ec6bf79e7dc6e9d570fc370c9eea6cd251d3c023979f6e1f8d3fbf5c2";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/indexed";
        description = "Haskell98 indexed functors, monads, comonads";
@@ -96255,6 +96929,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c_0_5_5_9" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.5.5.9";
+       sha256 = "2e48cae75fe1e4fd9f7c0ab4e7a4cbb4dcb9d2e9075d40adc33ac9038297fe22";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         directory filepath hashable mtl parsec parsers QuickCheck
+         template-haskell transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -96432,6 +97131,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "inspector-wrecker" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , connection, data-default, http-client, http-client-tls
+     , http-types, optparse-applicative, text, time, wrecker
+     }:
+     mkDerivation {
+       pname = "inspector-wrecker";
+       version = "0.1.0.0";
+       sha256 = "71bcfb62046ae519c66e8eefd71a77753512d06b2fa73e523bcdb3585fda42ed";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive connection data-default
+         http-client http-client-tls http-types optparse-applicative text
+         time wrecker
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/skedgeme/inspector-wrecker#readme";
+       description = "Create benchmarks from the HAR files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "instance-control" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -96716,13 +97440,12 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.1.0.5";
-       sha256 = "23243eb47b718de5e49c3b5db730b874607793a47cfe37efba1ea284b5cd5578";
+       version = "0.1.0.6";
+       sha256 = "d2871aaf50275fc6ecf17e151e181d30c1619048b693574fbfddb6b211548acf";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
        ];
-       jailbreak = true;
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97330,6 +98053,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip6addr_0_5_1_3" = callPackage
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
+     mkDerivation {
+       pname = "ip6addr";
+       version = "0.5.1.3";
+       sha256 = "4edd17f9cf77b0e6ae59c9016d5dc72b3467959bd779264783a4fe7c02aa9340";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
+       homepage = "https://github.com/MichelBoucey/ip6addr";
+       description = "Commandline tool to generate IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ipatch" = callPackage
     ({ mkDerivation, base, bytestring, darcs, directory, filepath
      , hashed-storage, process, unix
@@ -97580,13 +98318,13 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.1.1.1";
-       sha256 = "73f5a1ced86966659bad47f2e6a04419aac16319500cae4784361430751b808a";
+       version = "2.2.0.0";
+       sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834";
        libraryHaskellDepends = [
          attoparsec base bytestring hashable memory primitive text time
          vector
        ];
-       testHaskellDepends = [ base HUnit text ];
+       testHaskellDepends = [ base hashable HUnit text ];
        homepage = "https://github.com/glguy/irc-core";
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
@@ -99166,6 +99904,37 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "jose_0_4_0_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, byteable, bytestring, cryptonite, data-default-class
+     , hspec, lens, memory, mtl, network-uri, QuickCheck
+     , quickcheck-instances, safe, semigroups, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, text, time
+     , unordered-containers, vector, x509
+     }:
+     mkDerivation {
+       pname = "jose";
+       version = "0.4.0.3";
+       sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors byteable
+         bytestring cryptonite data-default-class lens memory mtl
+         network-uri QuickCheck quickcheck-instances safe semigroups
+         template-haskell text time unordered-containers vector x509
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors byteable
+         bytestring cryptonite data-default-class hspec lens memory mtl
+         network-uri QuickCheck quickcheck-instances safe semigroups tasty
+         tasty-hspec tasty-quickcheck template-haskell text time
+         unordered-containers vector x509
+       ];
+       homepage = "https://github.com/frasertweedale/hs-jose";
+       description = "Javascript Object Signing and Encryption and JSON Web Token library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, cereal
      , containers, cryptonite, doctest, either, hspec, HUnit, memory
@@ -100154,8 +100923,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.7";
-       sha256 = "7b52f0890ed569f5962fbbb3fa9a340496711b4ca13fb4ab6bb843aea64828ab";
+       version = "0.2.9";
+       sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100262,7 +101031,6 @@ self: {
          scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
          text time unordered-containers vector
        ];
-       doCheck = false;
        homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
@@ -100641,15 +101409,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "kawhi_0_2_0" = callPackage
+  "kawhi_0_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "kawhi";
-       version = "0.2.0";
-       sha256 = "cbabf52a49d6f323445d9db536382fb43471a8a1065671f9d5b2073c42d53871";
+       version = "0.2.1";
+       sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677";
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-client http-conduit
          http-types mtl safe scientific text
@@ -102669,6 +103437,7 @@ self: {
        ];
        description = "Fpga bus core and serialization for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdiff" = callPackage
@@ -102845,10 +103614,9 @@ self: {
     ({ mkDerivation, base, bool-extras }:
      mkDerivation {
        pname = "language-cil";
-       version = "0.2.2";
-       sha256 = "caf1a739da2681f6fd5c2c6825081a2dc0cefe8f33957554ec8aaf51ec557e2c";
+       version = "0.4.0";
+       sha256 = "20c46cc14d63a752a6c20e71a58c590a4405bd158e1f5155edee273be177a084";
        libraryHaskellDepends = [ base bool-extras ];
-       jailbreak = true;
        homepage = "https://github.com/tomlokhorst/language-cil";
        description = "Manipulating Common Intermediate Language AST";
        license = stdenv.lib.licenses.bsd3;
@@ -103387,7 +104155,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -105496,6 +106264,7 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "libtagc" = callPackage
@@ -105630,16 +106399,20 @@ self: {
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, HTTP, process
+    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
+     , directory, http-conduit, process
      }:
      mkDerivation {
        pname = "licensor";
-       version = "0.1.0";
-       sha256 = "3fd79e5758020abbb0b9c583c5ec9f3e324ad4edd471f320478469600e4ef099";
-       isLibrary = false;
+       version = "0.2.0";
+       sha256 = "87ec4cbc25e9efa51d4bf5d7904db62169807c164041995dacc77c165d3071e5";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory http-conduit process
+       ];
        executableHaskellDepends = [
-         base Cabal containers directory HTTP process
+         base Cabal cmdargs containers directory
        ];
        homepage = "https://github.com/jpvillaisaza/licensor";
        description = "A license compatibility helper";
@@ -106098,6 +106871,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linearmap-category" = callPackage
+    ({ mkDerivation, base, constrained-categories, containers
+     , free-vector-spaces, ieee754, lens, linear, semigroups, vector
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "linearmap-category";
+       version = "0.1.0.0";
+       sha256 = "965294deb7e4e15d11126e84ee7a5f158312f15d07c8e3adc0514b9143e3173f";
+       libraryHaskellDepends = [
+         base constrained-categories containers free-vector-spaces ieee754
+         lens linear semigroups vector vector-space
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/leftaroundabout/linearmap-family";
+       description = "Native, complete, matrix-free linear algebra";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linearscan" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
@@ -107918,6 +108711,7 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logic-TPTP" = callPackage
@@ -107945,8 +108739,8 @@ self: {
      }:
      mkDerivation {
        pname = "logic-classes";
-       version = "1.7";
-       sha256 = "6af3404b06900e7e2f5a56b96182af2bf7764fe0ab680b9611cd34ff52a82f11";
+       version = "1.7.1";
+       sha256 = "4c403e8b8487d7d4843c76ad3982a2661eff4fc687bb7e8c507f9114008e6550";
        libraryHaskellDepends = [
          applicative-extras atp-haskell base containers HUnit mtl parsec
          pretty PropLogic safe safecopy set-extra syb template-haskell
@@ -109270,10 +110064,9 @@ self: {
     ({ mkDerivation, base, binary, bytestring, machines }:
      mkDerivation {
        pname = "machines-binary";
-       version = "0.3.0.2";
-       sha256 = "c0c6c1a3869b3890d1b003a4adf4e91a5ae0921e775a9bfc126aa11bee663726";
+       version = "0.3.0.3";
+       sha256 = "60ff456d658ea1a427f32ee5ae1c726e2e7703942bd33edf28b457d753c20652";
        libraryHaskellDepends = [ base binary bytestring machines ];
-       jailbreak = true;
        homepage = "http://github.com/aloiscochard/machines-binary";
        description = "Binary utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
@@ -109316,12 +110109,11 @@ self: {
      }:
      mkDerivation {
        pname = "machines-process";
-       version = "0.2.0.6";
-       sha256 = "2a51ffae469eda92ccd7a8d2d1301b0b756ec0c0672346b92572d58909a15831";
+       version = "0.2.0.8";
+       sha256 = "7a159328a70756acc36940a3f3f5430187ecf7a4d4f01b2b92b119d3e14ffa2d";
        libraryHaskellDepends = [
          base chunked-data machines machines-io process
        ];
-       jailbreak = true;
        homepage = "http://github.com/aloiscochard/machines-process";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
@@ -109541,6 +110333,7 @@ self: {
        homepage = "https://github.com/jpvillaisaza/mailchimp-haskell";
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -110195,18 +110988,20 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers
-     , trivial-constraint, vector, vector-space, void
+     , deepseq, hmatrix, MemoTrie, microlens, microlens-th, semigroups
+     , tagged, transformers, trivial-constraint, vector, vector-space
+     , void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.2.2.0";
-       sha256 = "95bfb764205c8d2038ec1dacbe30ca89a4bb85d19292dd55e77274f75e71fbc1";
+       version = "0.2.3.0";
+       sha256 = "ae9bcf5eb972acee8eaec5f4180fb634466e6bc76849edd83d3c28cf20fdfa3e";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
-         MemoTrie semigroups tagged transformers trivial-constraint vector
-         vector-space void
+         MemoTrie microlens microlens-th semigroups tagged transformers
+         trivial-constraint vector vector-space void
        ];
+       jailbreak = true;
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
@@ -110679,7 +111474,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
          vector-th-unbox
        ];
-       doCheck = false;
        homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
@@ -111922,9 +112716,9 @@ self: {
        testHaskellDepends = [
          async base lens mwc-random primitive QuickCheck unix
        ];
-       doHaddock = false;
        description = "High-performance application metric tracking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metricsd-client" = callPackage
@@ -112060,6 +112854,45 @@ self: {
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microformats2-parser_1_0_1_6" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+     , base-compat, blaze-html, blaze-markup, bytestring, containers
+     , data-default, either, errors, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, streaming-commons, tagsoup, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai-extra, warp
+     , xml-lens, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "microformats2-parser";
+       version = "1.0.1.6";
+       sha256 = "9937ae3658bf1bfbb34f03cc8f0fcd1c236f72cd52f5845cfbd19f02a3ed33f8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
+         containers data-default either errors html-conduit lens-aeson
+         network-uri pcre-heavy safe tagsoup text time transformers
+         unordered-containers vector xml-lens xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base base-compat blaze-html blaze-markup
+         data-default network network-uri options scotty streaming-commons
+         text wai-extra warp
+       ];
+       testHaskellDepends = [
+         aeson-qq base base-compat bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
+       ];
+       homepage = "https://github.com/myfreeweb/microformats2-parser";
+       description = "A Microformats 2 parser";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -112627,6 +113460,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mime-mail-ses_0_3_2_3" = callPackage
+    ({ mkDerivation, base, base64-bytestring, byteable, bytestring
+     , conduit, cryptohash, http-client, http-conduit, http-types
+     , mime-mail, old-locale, text, time, transformers, xml-conduit
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "mime-mail-ses";
+       version = "0.3.2.3";
+       sha256 = "03f977386c2cdf122097a0327509e4151eb10e320d8cec1791d259aa067f4d4c";
+       libraryHaskellDepends = [
+         base base64-bytestring byteable bytestring conduit cryptohash
+         http-client http-conduit http-types mime-mail old-locale text time
+         transformers xml-conduit xml-types
+       ];
+       homepage = "http://github.com/snoyberg/mime-mail";
+       description = "Send mime-mail messages via Amazon SES";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mime-string" = callPackage
     ({ mkDerivation, base, base64-string, bytestring, iconv, mtl
      , network, old-time
@@ -113930,7 +114784,6 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
-       doCheck = false;
        homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
@@ -114752,10 +115605,10 @@ self: {
          random-shuffle text tls transformers-base
        ];
        testHaskellDepends = [ base hspec mtl old-locale text time ];
-       doCheck = false;
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -114875,6 +115728,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.1";
+       sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -117872,6 +118748,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ndjson-conduit_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }:
+     mkDerivation {
+       pname = "ndjson-conduit";
+       version = "0.1.0.5";
+       sha256 = "c037b8f7c47b146f1384585541ae8a4f9218bc4456f428935f973ae07da49db1";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit
+       ];
+       homepage = "https://github.com/srijs/haskell-ndjson-conduit";
+       description = "Conduit-based parsing and serialization for newline delimited JSON";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "neat" = callPackage
     ({ mkDerivation, base, filepath, parsec }:
      mkDerivation {
@@ -118109,14 +119000,14 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, composition-extra
      , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai
      , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat
-     , semigroups, text, transformers, tries, unordered-containers
-     , wai-middleware-content-type, wai-middleware-verbs
-     , wai-transformers
+     , semigroups, tasty, tasty-hspec, text, transformers, tries
+     , unordered-containers, wai-middleware-content-type
+     , wai-middleware-verbs, wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "7.2.1";
-       sha256 = "f2a813bccfb40ea242c2787ee85ab02fed43a2a7d2644509066c66fc939472ed";
+       version = "7.2.2";
+       sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9";
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
@@ -118126,8 +119017,8 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity
-         pred-set pred-trie regex-compat semigroups text transformers tries
-         unordered-containers wai-middleware-content-type
+         pred-set pred-trie regex-compat semigroups tasty tasty-hspec text
+         transformers tries unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        description = "Declarative, compositional Wai responses";
@@ -118391,7 +119282,6 @@ self: {
          QuickCheck tagged test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       doCheck = false;
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
@@ -118505,7 +119395,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest HUnit test-framework test-framework-hunit
        ];
-       doCheck = false;
        homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
@@ -118547,10 +119436,10 @@ self: {
          attoparsec base bytestring exceptions hspec hspec-attoparsec
          hspec-expectations mtl network network-simple transformers uuid
        ];
-       doCheck = false;
        homepage = "http://github.com/solatis/haskell-network-anonymous-i2p";
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-anonymous-tor" = callPackage
@@ -119568,6 +120457,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "next-ref" = callPackage
+    ({ mkDerivation, base, hspec, stm }:
+     mkDerivation {
+       pname = "next-ref";
+       version = "0.1.0.1";
+       sha256 = "2db4b4e501c17ccb4db473787ef2e305c940b101dcd30de1e95c0c5b9c41e709";
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base hspec ];
+       jailbreak = true;
+       description = "A concurrency primitive for a slow consumer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nextstep-plist" = callPackage
     ({ mkDerivation, base, parsec, pretty, QuickCheck }:
      mkDerivation {
@@ -120386,7 +121288,6 @@ self: {
        testHaskellDepends = [
          base directory process transformers uniplate
        ];
-       doCheck = false;
        homepage = "https://github.com/ndmitchell/nsis#readme";
        description = "DSL for producing Windows Installer using NSIS";
        license = stdenv.lib.licenses.bsd3;
@@ -121096,6 +121997,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "octane_0_16_3" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
+     , bytestring, containers, data-binary-ieee754, data-default-class
+     , deepseq, file-embed, http-client, http-client-tls
+     , overloaded-records, regex-compat, tasty, tasty-hspec
+     , tasty-quickcheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.16.3";
+       sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 data-default-class deepseq file-embed
+         overloaded-records regex-compat text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring http-client http-client-tls
+       ];
+       testHaskellDepends = [
+         base binary binary-bits bytestring containers tasty tasty-hspec
+         tasty-quickcheck text
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -121673,7 +122605,6 @@ self: {
          aeson base containers contravariant multiset postgresql-simple
          product-profunctors profunctors QuickCheck semigroups text time
        ];
-       doCheck = false;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -121775,6 +122706,7 @@ self: {
        jailbreak = true;
        description = "Open haddock HTML documentation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-pandoc" = callPackage
@@ -122658,7 +123590,6 @@ self: {
        testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
        ];
-       doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-options/";
        description = "A powerful and easy-to-use command-line option parser";
        license = stdenv.lib.licenses.mit;
@@ -123550,6 +124481,32 @@ self: {
        license = "unknown";
      }) {};
 
+  "pagerduty_0_0_8" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring
+     , bytestring-conversion, conduit, data-default-class, exceptions
+     , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
+     , monad-control, mtl, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pagerduty";
+       version = "0.0.8";
+       sha256 = "2f8f9ef70a672dd9160beb1e87d9b88d8cbd6f137637f4aed98df756ea270463";
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring bytestring-conversion conduit
+         data-default-class exceptions generics-sop http-client http-types
+         lens lens-aeson mmorph monad-control mtl template-haskell text time
+         time-locale-compat transformers transformers-base
+         transformers-compat unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/brendanhay/pagerduty";
+       description = "Client library for PagerDuty Integration and REST APIs";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pagination" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
      mkDerivation {
@@ -124886,6 +125843,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "partial-order" = callPackage
+    ({ mkDerivation, base, containers, HUnit, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "partial-order";
+       version = "0.1.2";
+       sha256 = "9a343b7206ddd717d9a1bb5562052fb503a33ebef8434d8f7f5e1eea04cef5d1";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers HUnit test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/mtesseract/haskell-partial-order";
+       description = "Provides typeclass suitable for types admitting a partial order";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "partial-uri" = callPackage
     ({ mkDerivation, base, network-uri }:
      mkDerivation {
@@ -126178,6 +127153,7 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -126308,6 +127284,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -126437,7 +127414,6 @@ self: {
          monad-control mtl path-pieces persistent persistent-template
          scientific template-haskell text time transformers utf8-string
        ];
-       doCheck = false;
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -126780,23 +127756,22 @@ self: {
      }) {};
 
   "pg-store" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hspec
-     , postgresql-libpq, QuickCheck, template-haskell, text
-     , transformers
+    ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl
+     , postgresql-libpq, QuickCheck, template-haskell, text, time
      }:
      mkDerivation {
        pname = "pg-store";
-       version = "0.0.1";
-       sha256 = "27032e33207c53c65452bfc3ea3d90620069850297e3edb5aa3e9274e6130c7f";
+       version = "0.1.1";
+       sha256 = "5f8d688811e4e59accce33f43fe2168adb9a4809b794d6e27db028af605298af";
        libraryHaskellDepends = [
-         attoparsec base bytestring postgresql-libpq template-haskell text
-         transformers
+         attoparsec base bytestring mtl postgresql-libpq template-haskell
+         text time
        ];
        testHaskellDepends = [
-         base bytestring hspec postgresql-libpq QuickCheck text
+         base bytestring hspec mtl postgresql-libpq QuickCheck text
        ];
        homepage = "https://github.com/vapourismo/pg-store";
-       description = "Dead simple storage interface to PostgreSQL";
+       description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -126824,6 +127799,7 @@ self: {
        jailbreak = true;
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -126998,8 +127974,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.8.0";
-       sha256 = "da086d093e31f1277d7a3f5876d57122f9f5517747399a3f001986e3f05854e8";
+       version = "0.0.9.0";
+       sha256 = "6161c3b669536f6701aa1e5a03745ab5d2aaf06ce45e463282a027a177f7cde7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127512,6 +128488,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-aeson_0_4_1_7" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
+     , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-aeson";
+       version = "0.4.1.7";
+       sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring pipes pipes-attoparsec
+         pipes-bytestring pipes-parse transformers
+       ];
+       homepage = "https://github.com/k0001/pipes-aeson";
+       description = "Encode and decode JSON streams using Aeson and Pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-async" = callPackage
     ({ mkDerivation, base, hspec, lifted-async, lifted-base
      , monad-control, pipes, pipes-safe, stm, transformers-base
@@ -128045,7 +129039,6 @@ self: {
        sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340";
        libraryHaskellDepends = [ base monad-control mongoDB pipes ];
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
-       doCheck = false;
        homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
@@ -130055,7 +131048,6 @@ self: {
          transformers uuid vector
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -130197,10 +131189,10 @@ self: {
          quickcheck-assertions quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-th text time
        ];
-       doCheck = false;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-schema" = callPackage
@@ -130245,7 +131237,6 @@ self: {
          aeson base base16-bytestring bytestring containers cryptohash
          filepath HUnit tasty tasty-golden tasty-hunit text time vector
        ];
-       doCheck = false;
        description = "Mid-Level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131221,6 +132212,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pretty-types_0_2_3_1" = callPackage
+    ({ mkDerivation, base, hspec, mtl, tagged }:
+     mkDerivation {
+       pname = "pretty-types";
+       version = "0.2.3.1";
+       sha256 = "e56c49d1099aaeafe0b982ef9e60cb7194fd987c4b659a8d7bcde380d3b8784f";
+       libraryHaskellDepends = [ base mtl tagged ];
+       testHaskellDepends = [ base hspec tagged ];
+       homepage = "https://github.com/sheyll/pretty-types#readme";
+       description = "A small pretty printing DSL for complex types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prettyFunctionComposing" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -131954,6 +132959,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "progress-reporting" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, time }:
+     mkDerivation {
+       pname = "progress-reporting";
+       version = "1.0.0";
+       sha256 = "8dddfbd5007871c47e53d01ad3366605679107504f23de568ccde0ed73a633f8";
+       libraryHaskellDepends = [ base deepseq mtl time ];
+       description = "Functionality for reporting function progress";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "progressbar" = callPackage
     ({ mkDerivation, base, io-reactive }:
      mkDerivation {
@@ -133342,7 +134358,6 @@ self: {
          HUnit mtl optparse-applicative parsec process protolude silently
          stm text time transformers transformers-compat utf8-string vector
        ];
-       doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
@@ -133366,6 +134381,7 @@ self: {
        ];
        description = "Generate PureScript data types from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -133494,8 +134510,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.1.0.0";
-       sha256 = "2938607770675541738af018e086b365e34fab98f389110ec34abb4fef79ca69";
+       version = "1.1.0.2";
+       sha256 = "bbd8ad5f868b9a5f94ee193bdb07c3c1eae8faca55fe876594e04d8746703689";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptohash hashable
          http-client http-types QuickCheck text time transformers
@@ -133505,10 +134521,10 @@ self: {
          aeson base bytestring hspec http-client http-types QuickCheck text
          transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -135767,6 +136783,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "raz" = callPackage
+    ({ mkDerivation, base, deepseq, MonadRandom }:
+     mkDerivation {
+       pname = "raz";
+       version = "0.1.0.0";
+       sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215";
+       libraryHaskellDepends = [ base deepseq MonadRandom ];
+       testHaskellDepends = [ base MonadRandom ];
+       homepage = "https://github.com/Lysxia/raz.haskell";
+       description = "Random Access Zippers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "razom-text-util" = callPackage
     ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin, text
      , text-position
@@ -136731,7 +137761,6 @@ self: {
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
-       doCheck = false;
        homepage = "https://gitlab.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
@@ -139546,6 +140575,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "result_0_2_5_1" = callPackage
+    ({ mkDerivation, base, bifunctors, keys, mtl, transformers }:
+     mkDerivation {
+       pname = "result";
+       version = "0.2.5.1";
+       sha256 = "090a6c4e797ff408df1fcbd55877f1e94749beb3b65dc4260e75ef9c3a576b18";
+       libraryHaskellDepends = [ base bifunctors keys mtl transformers ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/srijs/haskell-result";
+       description = "Encode success or at least one error";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "resumable-exceptions" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -139574,7 +140617,6 @@ self: {
          utf8-string vector
        ];
        testHaskellDepends = [ base doctest ];
-       doCheck = false;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
@@ -139601,10 +140643,10 @@ self: {
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
-       doCheck = false;
        homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -140466,6 +141508,7 @@ self: {
        homepage = "https://github.com/docmunch/rollbar-haskell";
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roller" = callPackage
@@ -141672,7 +142715,6 @@ self: {
          quickcheck-instances tasty tasty-quickcheck template-haskell time
          vector
        ];
-       doCheck = false;
        homepage = "http://acid-state.seize.it/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
@@ -143606,6 +144648,7 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seacat" = callPackage
@@ -144736,6 +145779,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-cookie_0_3_2" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
+     , blaze-markup, bytestring, cereal, cookie, cryptonite
+     , data-default, deepseq, exceptions, hspec, http-media, http-types
+     , memory, mtl, QuickCheck, servant, servant-blaze, servant-server
+     , text, time, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-auth-cookie";
+       version = "0.3.2";
+       sha256 = "c77ba7d3fb289c792aa99f6691c7d2b53f3e5dd4a2bc9ea9ebae41a3addf8080";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder bytestring cereal cookie
+         cryptonite data-default exceptions http-types memory mtl servant
+         servant-server time transformers wai
+       ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup bytestring cereal cryptonite
+         data-default http-media mtl servant servant-blaze servant-server
+         text wai warp
+       ];
+       testHaskellDepends = [
+         base bytestring cereal cryptonite data-default deepseq hspec
+         QuickCheck servant-server time
+       ];
+       description = "Authentication via encrypted cookies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-hmac" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, case-insensitive, cereal
@@ -144926,10 +146001,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-ede";
-       version = "0.5.1";
-       sha256 = "54e929c1c77acb04e808aabc485cf80f19724330e233ae5b6255d41d45ac957c";
-       revision = "2";
-       editedCabalFile = "7145131abeb7f67475bf1c11bcf95cafff1483b370d7c53f10c49c8a29c7e519";
+       version = "0.6";
+       sha256 = "a091b69bf4c5762ab90d9d8a31ed88eb88baa23c4586356e11717f334a24ce28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144938,9 +146011,8 @@ self: {
          xss-sanitize
        ];
        executableHaskellDepends = [
-         base ede http-media servant-server warp
+         base ede http-media servant-server text unordered-containers warp
        ];
-       jailbreak = true;
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -145046,6 +146118,7 @@ self: {
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -145256,6 +146329,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-purescript_0_4_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, http-types, lens, mainland-pretty, purescript-bridge
+     , servant, servant-foreign, servant-server, servant-subscriber
+     , text
+     }:
+     mkDerivation {
+       pname = "servant-purescript";
+       version = "0.4.0.1";
+       sha256 = "614d9813e7c96b23ae5955c0a91b5f5637c1c0e89bdf61a18f1fcdb80955ef5c";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath http-types lens
+         mainland-pretty purescript-bridge servant servant-foreign
+         servant-server servant-subscriber text
+       ];
+       testHaskellDepends = [
+         aeson base containers lens mainland-pretty purescript-bridge
+         servant servant-foreign servant-subscriber text
+       ];
+       homepage = "https://github.com/eskimor/servant-purescript#readme";
+       description = "Generate PureScript accessor functions for you servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, data-default-class, hspec, hspec-core
@@ -145896,6 +146994,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "sets_0_0_5_2" = callPackage
+    ({ mkDerivation, base, commutative, composition, containers
+     , contravariant, hashable, keys, mtl, QuickCheck
+     , quickcheck-instances, semigroupoids, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, transformers-base
+     , unordered-containers, witherable
+     }:
+     mkDerivation {
+       pname = "sets";
+       version = "0.0.5.2";
+       sha256 = "be20d5b7b4a5770b7089879f3ef7226c485f4d5bb17e87f979f3bb6475e48713";
+       libraryHaskellDepends = [
+         base commutative composition containers contravariant hashable keys
+         mtl QuickCheck semigroupoids semigroups transformers
+         transformers-base unordered-containers witherable
+       ];
+       testHaskellDepends = [
+         base commutative containers contravariant QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         unordered-containers
+       ];
+       description = "Ducktyped set interface for Haskell containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "setters" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -146245,7 +147369,6 @@ self: {
          js-flot js-jquery process QuickCheck random time transformers unix
          unordered-containers utf8-string
        ];
-       doCheck = false;
        homepage = "http://shakebuild.com";
        description = "Build system library, like Make, but more accurate dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -146827,7 +147950,6 @@ self: {
          transformers-base unix-compat
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -147931,6 +149053,7 @@ self: {
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -147943,6 +149066,7 @@ self: {
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simplenote" = callPackage
@@ -148161,7 +149285,6 @@ self: {
        testHaskellDepends = [
          base Cabal directory filepath process tasty tasty-golden
        ];
-       doCheck = false;
        homepage = "http://www.github.com/goldfirere/singletons";
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
@@ -148249,6 +149372,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sixfiguregroup" = callPackage
+    ({ mkDerivation, base, digit, directory, doctest, filepath, lens
+     , parsec, parsers, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "sixfiguregroup";
+       version = "0.0.1";
+       sha256 = "d98c0de2dfa1d15adc1db96284359aea3954f1cd735eafda9bf9b9ce687c14d0";
+       libraryHaskellDepends = [ base digit lens parsers ];
+       testHaskellDepends = [
+         base directory doctest filepath parsec QuickCheck template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/data61/sixfiguregroup";
+       description = "A six figure group of time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "size-based" = callPackage
     ({ mkDerivation, base, dictionary-sharing, template-haskell
      , testing-type-modifiers
@@ -148375,7 +149516,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
-       doCheck = false;
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
@@ -149303,7 +150443,6 @@ self: {
          test-framework-quickcheck2 text time transformers transformers-base
          unix-compat unordered-containers vector zlib
        ];
-       doCheck = false;
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
        license = stdenv.lib.licenses.bsd3;
@@ -151189,7 +152328,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring process text unordered-containers utf8-string
        ];
-       doCheck = false;
        description = "Implementation of source maps as proposed by Google and Mozilla";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151502,7 +152640,6 @@ self: {
        editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       doCheck = false;
        homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
@@ -152132,8 +153269,8 @@ self: {
      }:
      mkDerivation {
        pname = "spy";
-       version = "0.10";
-       sha256 = "f0020bed11e5e8c42dab4e2f04f00bb0f19a2251738596eca1fcd704408776ac";
+       version = "0.14";
+       sha256 = "c257084e554d50bc1bf76029e292ae61af6a73f922320f7cf2bac306ac0565f5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -152747,6 +153884,80 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "stack_1_2_0" = callPackage
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
+     , attoparsec, base, base-compat, base16-bytestring
+     , base64-bytestring, binary, binary-tagged, blaze-builder, byteable
+     , bytestring, Cabal, clock, conduit, conduit-extra, containers
+     , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance
+     , either, enclosed-exceptions, errors, exceptions, extra
+     , fast-logger, filelock, filepath, fsnotify, generic-deriving
+     , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client
+     , http-client-tls, http-conduit, http-types, lifted-async
+     , lifted-base, microlens, monad-control, monad-logger, monad-unlift
+     , mono-traversable, mtl, neat-interpolation, open-browser
+     , optparse-applicative, optparse-simple, path, path-io, persistent
+     , persistent-sqlite, persistent-template, pretty, process
+     , project-template, QuickCheck, regex-applicative-text, resourcet
+     , retry, safe, semigroups, smallcheck, split, stm, store
+     , streaming-commons, tar, template-haskell, temporary, text
+     , text-binary, th-reify-many, time, tls, transformers
+     , transformers-base, unicode-transforms, unix, unix-compat
+     , unordered-containers, vector, vector-binary-instances, yaml
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "stack";
+       version = "1.2.0";
+       sha256 = "6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson annotated-wl-pprint ansi-terminal async attoparsec base
+         base-compat base16-bytestring base64-bytestring binary
+         binary-tagged blaze-builder byteable bytestring Cabal clock conduit
+         conduit-extra containers cryptohash cryptohash-conduit deepseq
+         directory edit-distance either enclosed-exceptions errors
+         exceptions extra fast-logger filelock filepath fsnotify
+         generic-deriving hashable hastache hit hpack hpc http-client
+         http-client-tls http-conduit http-types lifted-async lifted-base
+         microlens monad-control monad-logger monad-unlift mtl open-browser
+         optparse-applicative path path-io persistent persistent-sqlite
+         persistent-template pretty process project-template
+         regex-applicative-text resourcet retry safe semigroups split stm
+         store streaming-commons tar template-haskell temporary text
+         text-binary time tls transformers transformers-base
+         unicode-transforms unix unix-compat unordered-containers vector
+         vector-binary-instances yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal containers directory either filelock filepath
+         gitrev hpack http-client lifted-base microlens monad-control
+         monad-logger mtl optparse-applicative optparse-simple path path-io
+         text transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring Cabal conduit conduit-extra containers
+         cryptohash directory exceptions filepath hspec http-conduit
+         monad-logger mono-traversable neat-interpolation path path-io
+         QuickCheck resourcet retry smallcheck store template-haskell
+         temporary text th-reify-many transformers vector
+       ];
+       jailbreak = true;
+       doCheck = false;
+       preCheck = "export HOME=$TMPDIR";
+       postInstall = ''
+         exe=$out/bin/stack
+         mkdir -p $out/share/bash-completion/completions
+         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
+       '';
+       homepage = "http://haskellstack.org";
+       description = "The Haskell Tool Stack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "stack-hpc-coveralls" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib
@@ -153450,7 +154661,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
        ];
-       doCheck = false;
        homepage = "https://github.com/bos/statistics";
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd3;
@@ -154599,6 +155809,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "streaming-commons_0_1_16" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , deepseq, directory, hspec, network, process, QuickCheck, random
+     , stm, text, transformers, unix, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-commons";
+       version = "0.1.16";
+       sha256 = "17fdf509823e72996265de9260eaf58e33350e746dea058a36392c843ea8106e";
+       libraryHaskellDepends = [
+         array async base blaze-builder bytestring directory network process
+         random stm text transformers unix zlib
+       ];
+       testHaskellDepends = [
+         array async base blaze-builder bytestring deepseq hspec network
+         QuickCheck text unix zlib
+       ];
+       homepage = "https://github.com/fpco/streaming-commons";
+       description = "Common lower-level functions needed by various streaming data libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-eversion" = callPackage
     ({ mkDerivation, base, doctest, foldl, microlens, pipes
      , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -155824,6 +157057,7 @@ self: {
        ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supero" = callPackage
@@ -156052,9 +157286,26 @@ self: {
          aeson base bytestring text time transformers
        ];
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
-       doCheck = false;
        description = "Implementation of swagger data model";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "swagger_0_3_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "swagger";
+       version = "0.3.0";
+       sha256 = "c7144fb22a0d223eb2463a896200936eab665dc01f39affc103d2ee6a38f54d0";
+       libraryHaskellDepends = [
+         aeson base bytestring text time transformers
+       ];
+       testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
+       description = "Implementation of swagger data model";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger2" = callPackage
@@ -156078,7 +157329,6 @@ self: {
          hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
          text time unordered-containers vector
        ];
-       doHaddock = false;
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
@@ -156344,7 +157594,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        testSystemDepends = [ gmp gmpxx symengine ];
-       doCheck = false;
        homepage = "http://github.com/symengine/symengine.hs#readme";
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -156701,8 +157950,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-alsa";
-       version = "0.5.0.4";
-       sha256 = "2a7966095f5195977c0c70575009ac57a604b16b1c625da4ac23811ef1e447e0";
+       version = "0.5.0.5";
+       sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26";
        libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
@@ -156810,8 +158059,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-llvm";
-       version = "0.8.1";
-       sha256 = "fa63abd89d8f87abe872ba9834ba7a204555b46deec823dfa0e87dd70dbf2e76";
+       version = "0.8.1.1";
+       sha256 = "5d826192a0ce80c07e535993492fb6e53160fb603ab7047ce7a12c48a4fee7ce";
        libraryHaskellDepends = [
          base containers event-list llvm-extra llvm-tf midi non-empty
          non-negative numeric-prelude pathtype random sox storable-record
@@ -156969,7 +158218,6 @@ self: {
        testHaskellDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
        ];
-       doCheck = false;
        homepage = "https://github.com/fpco/haskell-filesystem";
        description = "High-level, byte-based file and directory path manipulations (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -156991,8 +158239,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "system-info";
-       version = "0.1.0.1";
-       sha256 = "e037238c975acc226dc5d2d483267d5d2c09ada7a966f269d858a824e15f5c88";
+       version = "0.1.0.2";
+       sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
@@ -157818,6 +159066,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tagsoup-selection" = callPackage
+    ({ mkDerivation, base, containers, parsec, tagsoup }:
+     mkDerivation {
+       pname = "tagsoup-selection";
+       version = "0.1.0.1";
+       sha256 = "2d7159e2d8010b877983dbc3b106fabb19451eb00f65ed7a9bf9a3b7ca231c73";
+       libraryHaskellDepends = [ base containers parsec tagsoup ];
+       jailbreak = true;
+       description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tagstream-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, data-default, hspec
@@ -158832,6 +160092,7 @@ self: {
        homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teleport" = callPackage
@@ -159287,7 +160548,6 @@ self: {
          base base-unicode-symbols HUnit test-framework test-framework-hunit
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
@@ -160865,6 +162125,8 @@ self: {
        pname = "th-desugar";
        version = "1.6";
        sha256 = "c8f8ece2bde9b12070ea50bc089fbc672f144659225d837478fbc793777f634f";
+       revision = "1";
+       editedCabalFile = "ba5a42169a8e996cf9d82fdb1a6a2faa1fab3f71f1c58e77f51cd655007d312d";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-expand-syns th-lift
          th-orphans
@@ -160873,7 +162135,7 @@ self: {
          base containers hspec HUnit mtl syb template-haskell th-expand-syns
          th-lift th-orphans
        ];
-       homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
+       homepage = "https://github.com/goldfirere/th-desugar";
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161065,7 +162327,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
-       doCheck = false;
        homepage = "https://github.com/joelteon/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
@@ -161437,6 +162698,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threads-extras" = callPackage
+    ({ mkDerivation, base, stm, threads }:
+     mkDerivation {
+       pname = "threads-extras";
+       version = "0.1.0.1";
+       sha256 = "fc31c11c50e55f53578a46c3b9529729281c4256010caed89aba614d2cf086b3";
+       libraryHaskellDepends = [ base stm threads ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
+       description = "Extends the threads package with a bounded thread group";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "threads-pool" = callPackage
     ({ mkDerivation, base, containers, mtl, stm }:
      mkDerivation {
@@ -161515,15 +162789,14 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.6.0.6";
-       sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d";
+       version = "0.7.0.0";
+       sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e";
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
          template-haskell text transformers unordered-containers vault
          vector websockets websockets-snap
        ];
-       jailbreak = true;
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
@@ -161659,7 +162932,6 @@ self: {
          old-locale profunctors QuickCheck random system-posix-redirect text
          time vector-space
        ];
-       doCheck = false;
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
@@ -162498,17 +163770,17 @@ self: {
      }) {};
 
   "timestamp-subprocess-lines" = callPackage
-    ({ mkDerivation, base, bytestring, old-locale, process, split, time
+    ({ mkDerivation, base, bytestring, process, split, time
      , transformers
      }:
      mkDerivation {
        pname = "timestamp-subprocess-lines";
-       version = "0.1.0.3";
-       sha256 = "35aae25c87e8849d9eb9efe581aa94340da27c16f6f72c7ee5ea40b7d621c9ee";
+       version = "0.1.0.4";
+       sha256 = "2542b9977d1bf472ca8c929a6d390b223fdfff5cab940ca6bf1b632b31996bd1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring old-locale process split time transformers
+         base bytestring process split time transformers
        ];
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
@@ -163259,6 +164531,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "toxcore" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary
+     , data-default-class, hspec, QuickCheck, saltine, toxcore
+     }:
+     mkDerivation {
+       pname = "toxcore";
+       version = "0.0.2";
+       sha256 = "859eff7c76714fb802b1868a9d5165122217f3c3284c0cb0e7f7fb39921d7a72";
+       libraryHaskellDepends = [
+         base bytestring bytestring-arbitrary data-default-class QuickCheck
+         saltine
+       ];
+       librarySystemDepends = [ toxcore ];
+       testHaskellDepends = [
+         base data-default-class hspec QuickCheck saltine
+       ];
+       jailbreak = true;
+       homepage = "https://toktok.github.io";
+       description = "Haskell bindings to the C reference implementation of Tox";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {toxcore = null;};
+
   "toysolver" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-builder
      , containers, data-default-class, data-interval, deepseq
@@ -163465,8 +164760,8 @@ self: {
      }:
      mkDerivation {
        pname = "traildb";
-       version = "0.1.0.2";
-       sha256 = "d9f92a220123ccf6bc33bd1a70736a2cf9631cae2e3252f39237d9a87b9ffac8";
+       version = "0.1.1.0";
+       sha256 = "15378affdaaa360d3f7c2f9e39866b9f73d60b3092ca9ab4ef4f82a33a373b3b";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions lens primitive text
          time transformers unix vector
@@ -163777,6 +165072,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "transient-universe_0_3_4" = 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.3.4";
+       sha256 = "14a52d54f3328742b248f781ec06b44d8be532e943dbbd2a23149868593081f8";
+       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 ];
+       jailbreak = true;
+       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 {
@@ -165731,6 +167052,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-spec_0_3_0_1" = callPackage
+    ({ mkDerivation, base, pretty }:
+     mkDerivation {
+       pname = "type-spec";
+       version = "0.3.0.1";
+       sha256 = "aecd1a319efc13eb42b73b489cf374f94bf126f19fdc28b2f5cd6f73dda3a241";
+       libraryHaskellDepends = [ base pretty ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sheyll/type-spec#readme";
+       description = "Type Level Specification by Example";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-spine" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -166123,6 +167458,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "u2f" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
+     , base64-bytestring, binary, bytestring, cryptohash, cryptonite
+     , either-unwrap, hspec, text
+     }:
+     mkDerivation {
+       pname = "u2f";
+       version = "0.1.0.0";
+       sha256 = "b7d123b1eee52751bc1310e2acca2129241bf5588a2587dcfe37691e1ff17205";
+       libraryHaskellDepends = [
+         aeson asn1-encoding asn1-types base base64-bytestring binary
+         bytestring cryptohash cryptonite either-unwrap text
+       ];
+       testHaskellDepends = [ base bytestring hspec text ];
+       jailbreak = true;
+       homepage = "https://github.com/EButlerIV/u2f";
+       description = "Haskell Universal Two Factor helper toolbox library thing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uAgda" = callPackage
     ({ mkDerivation, array, base, BNFC-meta, cmdargs, containers, mtl
      , parsec, pretty, split, transformers
@@ -168287,7 +169642,6 @@ self: {
          base bytestring mtl postgresql-simple text time users uuid
        ];
        testHaskellDepends = [ base hspec postgresql-simple users-test ];
-       doCheck = false;
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
@@ -169383,7 +170737,6 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        jailbreak = true;
-       doCheck = false;
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -169694,6 +171047,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-split" = callPackage
+    ({ mkDerivation, base, QuickCheck, split, tasty, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "vector-split";
+       version = "1.0.0.0";
+       sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base QuickCheck split tasty tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/fhaust/vector-split#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vector-static" = callPackage
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
@@ -170578,6 +171948,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wahsp" = callPackage
+    ({ mkDerivation, aeson, base, data-default-class, kansas-comet
+     , natural-transformation, remote-monad, scotty, semigroups, stm
+     , text, wai-middleware-static
+     }:
+     mkDerivation {
+       pname = "wahsp";
+       version = "0.2";
+       sha256 = "e634e0743dbbf93f2dffc68b68a8cc86a7ee3b62a044932f192c5f491e81fe74";
+       revision = "1";
+       editedCabalFile = "145ecbcceca09e635f744466b1d439a6144cd83e3d0c74a2478e4470bbffbacd";
+       libraryHaskellDepends = [
+         aeson base data-default-class kansas-comet natural-transformation
+         remote-monad scotty semigroups stm text wai-middleware-static
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nshaheed/WebAudioHs/";
+       description = "A haskell binding of the Web Audio API ala blank-canvas";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , bytestring-builder, hspec, http-types, network, text
@@ -170719,10 +172111,10 @@ self: {
          process tasty tasty-hunit text wai wai-extra wai-websockets warp
          websockets
        ];
-       doCheck = false;
        homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-devel" = callPackage
@@ -171062,7 +172454,6 @@ self: {
          fast-logger http-types network unix unix-time wai
        ];
        testHaskellDepends = [ base doctest ];
-       doCheck = false;
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171085,27 +172476,29 @@ self: {
      }) {};
 
   "wai-make-assets" = callPackage
-    ({ mkDerivation, base, bytestring, directory, getopt-generics
-     , hspec, http-types, lens, mockery, shake, silently
-     , string-conversions, wai, wai-app-static, warp, wreq
+    ({ mkDerivation, base, bytestring, data-default, directory
+     , filepath, getopt-generics, hspec, http-types, lens, mockery
+     , shake, silently, string-conversions, wai, wai-app-static, warp
+     , wreq
      }:
      mkDerivation {
        pname = "wai-make-assets";
-       version = "0.1.1";
-       sha256 = "0e05db16a0d5d93439833d29b33aed97cd9b2093b99f8939ada104eded63877f";
+       version = "0.2";
+       sha256 = "7e871b15d889dc8f7d185eab424eff0362bf120e6b7a5e4e43eb2e411e7ad640";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory http-types shake string-conversions wai
-         wai-app-static warp
+         base bytestring data-default directory filepath http-types shake
+         string-conversions wai wai-app-static warp
        ];
        executableHaskellDepends = [
-         base bytestring directory getopt-generics http-types shake
-         string-conversions wai wai-app-static warp
+         base bytestring data-default directory filepath getopt-generics
+         http-types shake string-conversions wai wai-app-static warp
        ];
        testHaskellDepends = [
-         base bytestring directory hspec http-types lens mockery shake
-         silently string-conversions wai wai-app-static warp wreq
+         base bytestring data-default directory filepath hspec http-types
+         lens mockery shake silently string-conversions wai wai-app-static
+         warp wreq
        ];
        homepage = "https://github.com/soenkehahn/wai-make-assets#readme";
        description = "Compiling and serving assets";
@@ -171244,6 +172637,7 @@ self: {
        homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-content-type" = callPackage
@@ -171271,9 +172665,9 @@ self: {
          shakespeare tasty tasty-hspec text transformers transformers-base
          unordered-containers urlpath wai wai-transformers warp
        ];
-       doCheck = false;
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -171781,10 +173175,10 @@ self: {
        testHaskellDepends = [
          base bytestring data-default postgresql-simple text wai-session
        ];
-       doCheck = false;
        homepage = "https://github.com/hce/postgresql-session#readme";
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -172047,7 +173441,6 @@ self: {
          simple-sendfile stm streaming-commons text time transformers unix
          unix-compat vault wai word8
        ];
-       doCheck = false;
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
@@ -172758,7 +174151,6 @@ self: {
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
-       doCheck = false;
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
@@ -174024,6 +175416,7 @@ self: {
        homepage = "http://github.com/sboosali/workflow-windows#readme";
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wp-archivebot" = callPackage
@@ -174087,6 +175480,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wrecker" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, base
+     , bytestring, clock, clock-extras, deepseq, hspec, hspec-discovery
+     , http-client, http-types, next-ref, optparse-applicative
+     , statistics, stm, stm-chans, tabular, text, threads
+     , threads-extras, time, unagi-chan, unix, unordered-containers
+     , vector, vty
+     }:
+     mkDerivation {
+       pname = "wrecker";
+       version = "0.1.0.1";
+       sha256 = "ab82b2795d70901ce63b25215e03cad28ba57dba4dadb51b44712a84fb965eb0";
+       libraryHaskellDepends = [
+         aeson aeson-qq ansi-terminal ansigraph base bytestring clock
+         clock-extras deepseq http-client http-types next-ref
+         optparse-applicative statistics stm stm-chans tabular text threads
+         threads-extras time unagi-chan unix unordered-containers vector vty
+       ];
+       testHaskellDepends = [ base hspec hspec-discovery ];
+       jailbreak = true;
+       homepage = "https://github.com/skedgeme/wrecker#readme";
+       description = "A HTTP Performance Benchmarker";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {hspec-discovery = null;};
+
   "wreq" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
@@ -174120,7 +175539,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time
          transformers unix-compat uuid vector
        ];
-       doCheck = false;
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -174636,6 +176054,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_6_4" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.6.4";
+       sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, mtl, pem, x509
@@ -174709,12 +176150,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-validation_1_6_4" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
+     , bytestring, containers, cryptonite, data-default-class, hourglass
+     , memory, mtl, pem, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-validation";
+       version = "1.6.4";
+       sha256 = "ad14ca56c70964fee09a5ff06f738ea7bdff599be27baed24a35115efc5967a4";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base byteable bytestring containers
+         cryptonite data-default-class hourglass memory mtl pem x509
+         x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 Certificate and CRL validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x86-64bit" = callPackage
     ({ mkDerivation, base, monads-tf, QuickCheck, tardis, vector }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.3";
-       sha256 = "cd8115c071ac2e4a9961f9a0ffe2a1733abe44f677f8cce8a0a6fcf6bda69af7";
+       version = "0.3.1";
+       sha256 = "8ace704629ca875748dc7d60b5dbd3b4ac029035e0298f874182a5dec8228628";
        libraryHaskellDepends = [
          base monads-tf QuickCheck tardis vector
        ];
@@ -175177,9 +176638,9 @@ self: {
          base blaze-markup bytestring text time time-locale-compat
          zip-archive
        ];
-       doCheck = false;
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx" = callPackage
@@ -175210,6 +176671,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xlsx_0_3_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
+     , conduit, containers, data-default, Diff, errors, extra, filepath
+     , groom, lens, mtl, mtl-compat, network-uri, old-locale
+     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.3.0";
+       sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3";
+       libraryHaskellDepends = [
+         base base64-bytestring binary-search bytestring conduit containers
+         data-default errors extra filepath lens mtl mtl-compat network-uri
+         old-locale safe text time transformers vector xml-conduit
+         zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff groom lens mtl raw-strings-qq
+         smallcheck tasty tasty-hunit tasty-smallcheck time vector
+         xml-conduit
+       ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-tabular" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
@@ -175227,6 +176717,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xlsx-tabular_0_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , lens, text, xlsx
+     }:
+     mkDerivation {
+       pname = "xlsx-tabular";
+       version = "0.1.0.2";
+       sha256 = "0650c6e22c4b1f2be1d91a62cdf6160a17f2a18cfe7918cc30523a923218689d";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default lens text xlsx
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/kkazuo/xlsx-tabular#readme";
+       description = "Xlsx table decode utility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-templater" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers
      , data-default, parsec, text, time, transformers, xlsx
@@ -175786,7 +177294,6 @@ self: {
          base bytestring containers filepath HUnit hxt process QuickCheck
          text unix
        ];
-       doCheck = false;
        description = "Fast XML generation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175917,7 +177424,6 @@ self: {
        testHaskellDepends = [
          base containers extensible-exceptions QuickCheck X11
        ];
-       doCheck = false;
        postInstall = ''
          shopt -s globstar
          mkdir -p $out/share/man/man1
@@ -176615,12 +178121,43 @@ self: {
          HUnit mockery resourcet text transformers unordered-containers
          vector
        ];
-       doCheck = false;
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_18_7" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , semigroups, temporary, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.18.7";
+       sha256 = "b8cebafe9294b34258114b8ea5576d26c2d0070645ab9bfc84000b367931a944";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         enclosed-exceptions filepath resourcet scientific semigroups text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml
@@ -177295,7 +178832,6 @@ self: {
          http-types monad-logger network-uri persistent-sqlite resourcet
          text wai-extra yesod yesod-auth yesod-core yesod-test
        ];
-       doCheck = false;
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -177968,10 +179504,10 @@ self: {
          file-embed hedis lens monad-logger stm text time uuid yesod
        ];
        testHaskellDepends = [ base ];
-       doHaddock = false;
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-json" = callPackage
@@ -179716,7 +181252,6 @@ self: {
          base bytestring conduit containers exceptions filepath hspec path
          path-io QuickCheck text time transformers
        ];
-       doCheck = false;
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
@@ -179869,7 +181404,6 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
-       doCheck = false;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
index 471b2c81584e..223d19b70f03 100644
--- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
+++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
@@ -2,4 +2,4 @@
 
 COMMAND=$1
 shift
-exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@"
+exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@"
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 3cb1efbce739..bf7fd18f820a 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,7 +23,7 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.
 
-{ lib, stdenv, hoogle, rehoo, writeText
+{ lib, stdenv, hoogle, writeText
 , ghc, packages ? [ ghc.ghc ]
 }:
 
@@ -54,7 +54,7 @@ let
 in
 stdenv.mkDerivation {
   name = "hoogle-local-0.1";
-  buildInputs = [hoogle rehoo];
+  buildInputs = [ghc hoogle];
 
   phases = [ "buildPhase" ];
 
@@ -68,22 +68,11 @@ stdenv.mkDerivation {
 
     mkdir -p $out/share/doc/hoogle
 
-    function import_dbs() {
-        find $1 -name '*.txt' | while read f; do
-          newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
-          if [[ -f $f && ! -f ./$newname ]]; then
-            cp -p $f "./$newname"
-            hoogle convert -d "$(dirname $f)" "./$newname"
-          fi
-        done
-    }
-
     echo importing builtin packages
     for docdir in ${ghc.doc}/${docLibGlob}/*; do
       name="$(basename $docdir)"
       ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then
-        import_dbs $docdir
         ln -sfn $docdir $out/share/doc/hoogle/$name
       fi
     done
@@ -92,10 +81,9 @@ stdenv.mkDerivation {
     for i in $docPackages; do
       if [[ ! $i == $out ]]; then
         for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do
-          name=`basename $docdir`
+          name="$(basename $docdir)"
           docdir=$docdir/html
           if [[ -d $docdir ]]; then
-            import_dbs $docdir
             ln -sfn $docdir $out/share/doc/hoogle/$name
           fi
         done
@@ -103,13 +91,7 @@ stdenv.mkDerivation {
     done
 
     echo building hoogle database
-    # FIXME: rehoo is marked as depricated on Hackage
-    chmod 644 *.hoo *.txt
-    rehoo -j$NIX_BUILD_CORES -c64 .
-
-    mv default.hoo .x
-    rm -fr downloads *.dep *.txt *.hoo
-    mv .x $out/share/doc/hoogle/default.hoo
+    hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle
 
     echo building haddock index
     # adapted from GHC's gen_contents_index
diff --git a/pkgs/development/haskell-modules/patches/spy.patch b/pkgs/development/haskell-modules/patches/spy.patch
deleted file mode 100644
index 4c4e1844361b..000000000000
--- a/pkgs/development/haskell-modules/patches/spy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/Spy/Watcher.hs b/src/Spy/Watcher.hs
-     index 8512613..4df67d4 100644
---- a/src/Spy/Watcher.hs
-+++ b/src/Spy/Watcher.hs
-@@ -50,7 +50,7 @@ plainFormat = Plain
- spy :: Spy -> IO b -> IO ()
- spy config after = withManager $ \wm ->
-     runIndefinitely
--      (watchTree wm (decodeString $ dir config)
-+      (watchTree wm (dir config)
-                   (not . skipEvent config . eventPath)
-                   (handleEvent config)) 
-       (const after)
-@@ -106,9 +106,9 @@ eventTime (Modified _ t) = t
- eventTime (Removed _ t) = t
- 
- eventPath :: Event -> FilePath
--eventPath (Added fp _) = encodeString fp
--eventPath (Modified fp _) = encodeString fp
--eventPath (Removed fp _) = encodeString fp
-+eventPath (Added fp _) = fp
-+eventPath (Modified fp _) = fp
-+eventPath (Removed fp _) = fp
- 
- eventType :: Event -> FilePath
- eventType (Added _ _) = "Added"
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 0a8d41ed9094..6999ee07e3d0 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.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "elixir";
     rev = "v${version}";
-    sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy";
+    sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index ba39965cb351..b4bd532dc1d9 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -8,7 +8,7 @@ let
   recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
   env = (
   let
-    paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
+    paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ;
   in buildEnv {
     name = "${python.name}-env";
 
diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix
new file mode 100644
index 000000000000..672a89cc3c02
--- /dev/null
+++ b/pkgs/development/libraries/czmqpp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
+
+stdenv.mkDerivation rec {
+  name = "czmqpp-${version}";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "czmqpp";
+    rev = "v${version}";
+    sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja";
+  };
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chris-martin ];
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  propagatedBuildInputs = [ czmq ];
+
+  # https://github.com/zeromq/czmqpp/issues/42
+  patches = [ ./socket.patch ];
+}
diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch
new file mode 100644
index 000000000000..0464bcf77971
--- /dev/null
+++ b/pkgs/development/libraries/czmqpp/socket.patch
@@ -0,0 +1,17 @@
+--- /src/socket.cpp
++++ /src/socket.cpp
+@@ -60,12 +60,12 @@
+ int socket::bind(const std::string& address)
+ {
+     // format-security: format not a string literal and no format arguments.
+-    return zsocket_bind(self_, address.c_str());
++    return zsocket_bind(self_, "%s", address.c_str());
+ }
+ int socket::connect(const std::string& address)
+ {
+     // format-security: format not a string literal and no format arguments.
+-    return zsocket_connect(self_, address.c_str());
++    return zsocket_connect(self_, "%s", address.c_str());
+ }
+
+ bool operator==(const socket& sock_a, const socket& sock_b)
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 2a48d045c515..4ca991b9667a 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.14";
+  version = "3.4.15";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
-    sha256 = "35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23";
+    sha256 = "161lbs0ijkkc94xx6yz87q36a055hl6d5hdwyz5s1wpm0lwh2apb";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index db35a13cc411..b85859f0e624 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.3";
+  version = "3.5.4";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef";
+    sha256 = "1sx8p7v452s9m854r2c5pvcd1k15a3caiv5h35fhrxz0691h2f2f";
   };
 })
diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix
index 3793a14b4dcc..34c3d26c55ec 100644
--- a/pkgs/development/libraries/hunspell/wrapper.nix
+++ b/pkgs/development/libraries/hunspell/wrapper.nix
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
   buildCommand = ''
     makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
   '';
-  inherit (hunspell) meta;
-}
\ No newline at end of file
+  meta = removeAttrs hunspell.meta ["outputsToInstall"];
+}
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 78644200e0b1..8fda2b7e5843 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,11 +11,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchurl {
     url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
-    sha256 = "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb";
+    sha256 = "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind";
   };
 
   configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 07689fbdd277..54196ae48ffe 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,13 +3,15 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.26";
+  name = "ldb-1.1.27";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "1rmjv12pf57vga8s5z9p9d90rlfckc1lqjbcp89r83cq5fkwfhw8";
+    sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [
     python pkgconfig readline tdb talloc tevent popt
     libxslt docbook_xsl docbook_xml_dtd_42
@@ -24,6 +26,8 @@ stdenv.mkDerivation rec {
     "--builtin-libraries=replace"
   ];
 
+  stripDebugList = "bin lib modules";
+
   meta = with stdenv.lib; {
     description = "A LDAP-like embedded database";
     homepage = http://ldb.samba.org/;
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 34ad2532d41d..b2b007765820 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj";
   };
 
+  outputs = [ "out" "lib" "dev" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
     ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
@@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
   '' else null;
 
   preFixup = ''
-    sed -i $out/lib/libarchive.la \
+    sed -i $lib/lib/libarchive.la \
       -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \
       -e 's|-llzo2|-L${lzo}/lib -llzo2|'
   '';
@@ -42,7 +44,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       This library has code for detecting and reading many archive formats and
       compressions formats including (but not limited to) tar, shar, cpio, zip, and
-      compressed with gzip, bzip2, lzma, xz, .. 
+      compressed with gzip, bzip2, lzma, xz, ...
     '';
     homepage = http://libarchive.org;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 053d6ba8e7d4..4037de5a9cf7 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,13 +1,14 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
 , clutter_gtk, libsoup /*, libmemphis */ }:
 
-let version = "0.12.13"; in
 stdenv.mkDerivation rec {
+  major = "0.12";
+  version = "${major}.14";
   name = "libchamplain-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz";
-    sha256 = "1arzd1hsgq14rbiwa1ih2g250x6ljna2s2kiqfrw155c612s9cxk";
+    url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz";
+    sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index dbe818ba561c..15e0fbc6f796 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "libconfuse-${version}";
-  version = "2.8";
+  version = "3.0";
 
   src = fetchFromGitHub {
-    sha256 = "0s0asxnml4rlv17ijz5w57x949anag28wx7wdahqx6mgqz0w2j2k";
+    sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5";
     rev = "v${version}";
     repo = "libconfuse";
     owner = "martinh";
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 142025c1e51d..d2c202b970a1 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchsvn, python }:
+{ stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
   name = "ctemplate-${version}";
 
   version = "2.3";
 
-  src = fetchsvn {
-    url = "http://ctemplate.googlecode.com/svn/tags/${name}";
-    sha256 = "1kvh82mhazf4qz7blnv0rcax7vi524dmz6v6rp89z2h3qjilbvc7";
+  src = fetchurl {
+    url = "https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-${version}.tar.gz";
+    sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index afc8a44397d8..a3b011629141 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,12 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.3.3";
+  name = "libinput-${version}";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1kmiv1mcrxniigdcs65w23897mczsx0hasxc6p13hjk58zzfvj1h";
+    sha256 = "0708259k2qpdyi8z8n74d2pprjdvivmqkskjkq7s7ypchn9mb5js";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
new file mode 100644
index 000000000000..39806d7d22c3
--- /dev/null
+++ b/pkgs/development/libraries/libite/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
+
+stdenv.mkDerivation rec {
+  name = "libite-${version}";
+  version = "1.8.2";
+
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "libite";
+    rev = "v${version}";
+    sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libconfuse ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Lightweight library of frog DNA";
+    longDescription = ''
+      Libite is a lightweight library of frog DNA. It can be used to fill
+      the gaps in any dinosaur project. It holds useful functions and macros
+      developed by both Finit and the OpenBSD project. Most notably the
+      string functions: strlcpy(3), strlcat(3) and the highly useful *BSD
+      sys/queue.h and sys/tree.h API's.
+
+      Libite is the frog DNA missing in GNU libc. However, -lite does not
+      aim to become another GLIB! One noticeable gap in GLIBC is the missing
+      _SAFE macros in the BSD sys/queue.h API — highly recommended when
+      traversing lists to delete/free nodes.
+    '';
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
+
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 9171471882ca..69c30b7cca4b 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -8,8 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn";
   };
 
+  outputs = [ "out" "dev" "doc" ];
+
   propagatedBuildInputs = [ libgpgerror ];
 
+  postInstall = ''
+    mkdir -p $dev/bin
+    mv $out/bin/*-config $dev/bin/
+    rmdir --ignore-fail-on-non-empty $out/bin
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://www.gnupg.org;
     description = "CMS and X.509 access library";
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
new file mode 100644
index 000000000000..3905ba1b2716
--- /dev/null
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, boost, mysql }:
+
+stdenv.mkDerivation rec {
+  name = "libmysqlconnectorcpp-${version}";
+  version = "1.1.7";
+
+  src = fetchurl {
+    url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz";
+    sha256 = "0qy7kxz8h1zswr50ysyl2cc9gy0ip2j7ikl714m7lq3gsay3ydav";
+  };
+
+  buildInputs = [ cmake boost mysql ];
+
+  cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ];
+
+  meta = {
+    homepage = http://dev.mysql.com/downloads/connector/cpp/;
+    description = "C++ library for connecting to mysql servers.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index a59420a7045d..dc0beb07db94 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn";
   };
 
+  outputs = [ "out" "dev" ];
+
+  setOutputFlags = false;
+
+  preConfigure = ''
+    configureFlagsArray=(--includedir=$dev/include --libdir=$out/lib)
+  '';
+
   propagatedBuildInputs = [ expat curl fftw ];
 
   meta = {
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 3aa708e568a9..734760c8830b 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "0avri5c3sr31ax0vjvzla1a11xb4irnrc6571lm6w4zxigqakkqk";
+    sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi";
   };
 
+  outputs = [ "out" "dev" "doc" ];
+
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
   buildInputs = [ readline ];
   propagatedBuildInputs = [ cln libxml2 glib ];
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d3127437de61..fedc5287b49b 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
   };
 
+  outputs = [ "out" "lib" "dev" "doc" ];
+
   buildInputs = [ jasper ];
 
   propagatedBuildInputs = [ lcms2 ];
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix
index 0e1d3a4bb4c8..ef0236406213 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/pkgs/development/libraries/libshout/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k";
   };
 
+  outputs = [ "out" "dev" "doc" ];
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libvorbis libtheora speex ];
 
diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix
new file mode 100644
index 000000000000..abe0538b8a9c
--- /dev/null
+++ b/pkgs/development/libraries/libstdc++5/default.nix
@@ -0,0 +1,115 @@
+{ stdenv, fetchurl, fetchpatch, flex, bison, file }:
+
+stdenv.mkDerivation rec {
+  name = "libstdc++5-${version}";
+  version = "3.3.6";
+
+  src = [
+    (fetchurl {
+      url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
+      sha256 = "1dpyrpsgakilz2rnh5f8gvrzq5pwzvndacc0df6m04bpqn5fx6sg";
+    })
+    (fetchurl {
+      url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
+      sha256 = "14lxl81f7adpc9jxfiwzdxsdzs5zv4piv8xh7f9w910hfzrgvsby";
+    })
+  ];
+
+  patches = [
+    ./no-sys-dirs.patch
+    (fetchpatch {
+      name = "siginfo.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa";
+      sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j";
+      addPrefixes = true;
+    })
+    (fetchpatch {
+      name = "gcc-3.4.3-no_multilib_amd64.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa";
+      sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm";
+      addPrefixes = true;
+    })
+  ];
+
+  postPatch = ''
+    # fix build issue with recent gcc
+    sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c
+
+    # No fixincludes
+    sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+  '';
+
+  preConfigure = ''
+    mkdir ../build
+    cd ../build
+    configureScript=../$sourceRoot/configure
+  '';
+
+  preBuild = ''
+    # libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
+    # Thing.
+    export CPP="gcc -E"
+
+    # Use *real* header files, otherwise a limits.h is generated
+    # that does not include Glibc's limits.h (notably missing
+    # SSIZE_MAX, which breaks the build).
+    export NIX_FIXINC_DUMMY="$(cat $NIX_CC/nix-support/orig-libc-dev)/include"
+
+    # The path to the Glibc binaries such as `crti.o'.
+    glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"
+
+    # Figure out what extra flags to pass to the gcc compilers
+    # being generated to make sure that they use our glibc.
+    EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2"
+
+    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
+    for i in $extraLDFlags; do
+      EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
+    done
+
+    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
+    # the startfiles.
+    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
+    # for the startfiles.
+    makeFlagsArray=( \
+      "''${makeFlagsArray[@]}" \
+      NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+      SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+      CFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
+      CFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
+      CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
+      CXXFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
+      FLAGS_FOR_TARGET="$EXTRA_FLAGS" \
+      LDFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
+      LDFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
+      BOOT_CFLAGS="$EXTRA_FLAGS" \
+      BOOT_LDFLAGS="$EXTRA_FLAGS"
+      )
+  '';
+
+  hardeningDisable = [ "format" ];
+
+  nativeBuildInputs = [ flex bison file ];
+
+  configureFlags = [ "--disable-multilib" "--enable-__cxa-atexit" "--enable-threads=posix" "--enable-languages=c++" "--enable-clocale=gnu" ];
+
+  buildFLags = [ "all-target-libstdc++-v3" ];
+
+  installFlags = [ "install-target-libstdc++-v3" ];
+
+  postInstall = ''
+    # Remove includefiles and libs provided by gcc
+    shopt -s extglob
+    rm -rf $out/{bin,include,share,man,info}
+    rm -f $out/lib/*.a
+    rm -rf $out/lib/!(libstdc++*)
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://gcc.gnu.org/;
+    license = licenses.lgpl3Plus;
+    description = "GNU Compiler Collection, version ${version} -- C++ standard library";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch
new file mode 100644
index 000000000000..8c91d75f2a53
--- /dev/null
+++ b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch
@@ -0,0 +1,53 @@
+diff -ru3 gcc-3.3.6-old/gcc/cppdefault.c gcc-3.3.6/gcc/cppdefault.c
+--- gcc-3.3.6-old/gcc/cppdefault.c	2003-11-07 02:13:31.000000000 +0300
++++ gcc-3.3.6/gcc/cppdefault.c	2016-09-02 16:00:03.492484016 +0300
+@@ -26,6 +26,10 @@
+ #include "system.h"
+ #include "cppdefault.h"
+ 
++#undef LOCAL_INCLUDE_DIR
++#undef SYSTEM_INCLUDE_DIR
++#undef STANDARD_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru3 gcc-3.3.6-old/gcc/gcc.c gcc-3.3.6/gcc/gcc.c
+--- gcc-3.3.6-old/gcc/gcc.c	2004-04-01 20:55:17.000000000 +0400
++++ gcc-3.3.6/gcc/gcc.c	2016-09-02 16:01:24.843520114 +0300
+@@ -6130,10 +6130,6 @@
+ 		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
+ 	}
+ 
+-      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1,
+-			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
+-      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2,
+-			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
+ #if 0 /* Can cause surprises, and one can use -B./ instead.  */
+       add_prefix (&startfile_prefixes, "./", NULL,
+ 		  PREFIX_PRIORITY_LAST, 1, NULL, 0);
+diff -ru3 gcc-3.3.6-old/gcc/Makefile.in gcc-3.3.6/gcc/Makefile.in
+--- gcc-3.3.6-old/gcc/Makefile.in	2004-04-01 20:55:23.000000000 +0400
++++ gcc-3.3.6/gcc/Makefile.in	2016-09-02 16:00:03.493484017 +0300
+@@ -260,7 +260,11 @@
+ PARTITION_H = $(srcdir)/../include/partition.h
+ 
+ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+-NATIVE_SYSTEM_HEADER_DIR = /usr/include
++# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
++# `fixinc' from fixing header files in /usr/include.  However,
++# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
++# it to some dummy directory.
++NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
+ # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+ 
+@@ -2201,7 +2205,7 @@
+   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
+   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
+-  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
++  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
+   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
+   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+   @TARGET_SYSTEM_ROOT_DEFINE@
diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix
index 0d929941044c..061b2cfedfbf 100644
--- a/pkgs/development/libraries/libtunepimp/default.nix
+++ b/pkgs/development/libraries/libtunepimp/default.nix
@@ -4,6 +4,14 @@
 stdenv.mkDerivation rec {
   name = "libtunepimp-0.5.3";
 
+  outputs = [ "out" "lib" "dev" ];
+
+  setOutputFlags = false;
+
+  preConfigure = ''
+    configureFlagsArray=(--includedir=$dev/include --libdir=$lib/lib)
+  '';
+
   propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec
     libmad libogg libvorbis flac libofa libtool ];
 
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 975bcc3d3089..ec85542c9207 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype
-, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu
-, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal
-, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
-, qt4, poppler, librsvg, gtk2
-, withApps ? true }:
+{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
+, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
+, cairo, poppler, librsvg, libpng, libtiff, libXrandr
+, xineLib, boost
+, withApps ? false
+, withSDL ? false, SDL
+, withQt4 ? false, qt4
+}:
 
 stdenv.mkDerivation rec {
   name = "openscenegraph-${version}";
-  version = "3.2.1";
+  version = "3.2.3";
 
   src = fetchurl {
-    url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
-    sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
+    sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9";
   };
 
+  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+
   buildInputs = [
-    cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper
-    gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg
-    xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf
-    pkgconfig kbproto SDL qt4 poppler librsvg gtk2
-  ];
+    freetype libjpeg jasper libxml2 zlib gdal curl libX11
+    cairo poppler librsvg libpng libtiff libXrandr boost
+    xineLib
+  ] ++ lib.optional withSDL SDL
+    ++ lib.optional withQt4 qt4;
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [
-    "-DMATH_LIBRARY="
-    "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1"
-    "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1"
-  ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
 
   meta = with stdenv.lib; {
     description = "A 3D graphics toolkit";
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 6daa12745653..b253a27a7db3 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation {
-  name = "opensubdiv-3.0.4";
+  name = "opensubdiv-3.0.5";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
-    rev = "v3_0_4";
-    sha256 = "14ylpzk4121gi3fl02dwmqjp5sbaqpkm4gd0lh6jijccdih0xsc0";
+    rev = "v3_0_5";
+    sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 447b8fe15ec0..d226a51d0f8e 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcre2-10.21";
+  name = "pcre2-${version}";
+  version = "10.22";
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6";
+    sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j";
   };
 
   configureFlags = [
@@ -13,11 +14,17 @@ stdenv.mkDerivation rec {
     "--enable-jit"
   ];
 
-  meta = {
-	description = "Perl Compatible Regular Expressions";
+  outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
+
+  postFixup = ''
+    moveToOutput bin/pcre2-config "$dev"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perl Compatible Regular Expressions";
     homepage = "http://www.pcre.org/";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ttuegel ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index fa373a7e97f4..9094eca26e5d 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }:
+{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
 
-let
-  rev = "5d412bad60";
-in
 stdenv.mkDerivation rec {
-  name = "pkcs11-helper-20121123-${rev}";
+  name = "pkcs11-helper-${version}";
+  version = "1.11";
 
-  src = fetchurl {
-    url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}";
-    name = "${name}.tar.gz";
-    sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp";
+  src = fetchFromGitHub {
+    owner = "OpenSC";
+    repo = "pkcs11-helper";
+    rev = "${name}";
+    sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q";
   };
 
   buildInputs = [ pkgconfig openssl autoreconfHook ];
 
   meta = with stdenv.lib; {
     homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
-    license = with licenses; [ "BSD" gpl2 ];
+    license = with licenses; [ bsd3 gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 3c40ae247f65..024531a3027a 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.5";
+  name = "talloc-2.1.8";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq";
+    sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 0843d05e0282..f7449dcf1ab9 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.8";
+  name = "tdb-1.3.11";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186";
+    sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 95eb0255bdcb..2856f025a888 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.28";
+  name = "tevent-0.9.30";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "0a9ml52jjnzz7qg9z750mavlvs1yibjwrzy4yl55dc95j0vm7n84";
+    sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
new file mode 100644
index 000000000000..43a8f7db8d68
--- /dev/null
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "vsqlite-${version}";
+  version = "0.3.13";
+
+  src = fetchurl {
+    url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz";
+    sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
+  };
+
+  buildInputs = [ boost sqlite ];
+
+  meta = {
+    homepage = http://vsqlite.virtuosic-bytes.com/;
+    description = "C++ wrapper library for sqlite.";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index acd71d65c0eb..fc2981f7f1f7 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -22,6 +22,7 @@ let
       url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz";
       x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b";
       x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1";
+      patches = [ ./gcc-5.patch];
     };
 
     "2.8" = {
@@ -30,7 +31,7 @@ let
       x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
 
       # TODO: Add support for aparapi, java parallel api
-      patches = [ ./01-remove-aparapi-samples.patch ];
+      patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch];
     };
   };
 
diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/pkgs/development/misc/amdapp-sdk/gcc-5.patch
new file mode 100644
index 000000000000..dc8538db4c1f
--- /dev/null
+++ b/pkgs/development/misc/amdapp-sdk/gcc-5.patch
@@ -0,0 +1,11 @@
+--- include/CL/cl.hpp
++++ include/CL/cl.hpp
+@@ -201,7 +201,7 @@
+ #include <functional>
+ #define __CL_FUNCTION_TYPE typename std::function
+ #define CL_USE_CPP_FUNCTORS
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
++#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
+ #include <tr1/functional>
+ #define __CL_FUNCTION_TYPE typename std::tr1::function
+ #define CL_USE_CPP_FUNCTORS
diff --git a/pkgs/development/node-packages/README b/pkgs/development/node-packages/README
deleted file mode 100644
index 48354324a053..000000000000
--- a/pkgs/development/node-packages/README
+++ /dev/null
@@ -1,13 +0,0 @@
-How to update the NPM packages
-==============================
-- Install node2nix:
-
-nix-env -f '<nixpkgs>' -iA node2nix
-
-- Modify node-packages.json, add, update or remove package entries
-
-- Run the script:
-
-sh generate.sh
-
-- Done!
diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
new file mode 100644
index 000000000000..d1820e765b9b
--- /dev/null
+++ b/pkgs/development/node-packages/README.md
@@ -0,0 +1,11 @@
+NPM packages
+===========
+ 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA node2nix`.
+ 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update,
+    or remove package entries.
+ 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.
+ 4. Build your new package to test your changes: `cd /path/to/nixpkgs &&
+   nix-build -A nodePackages.<new-or-updated-package>`. To build against a
+   specific node.js version (e.g. 5.x): `nix-build -A
+   nodePackages_5_x.<new-or-updated-package>`
+ 5. Add, commit, and share your changes!
diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch
new file mode 100644
index 000000000000..a46ffaa7bd9e
--- /dev/null
+++ b/pkgs/development/perl-modules/dbiclassx-fix.patch
@@ -0,0 +1,24 @@
+From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001
+From: Peter Rabbitson <ribasushi@cpan.org>
+Date: Tue, 13 Sep 2016 17:15:48 +0200
+Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite)
+ libsqlite version
+
+---
+ Changes              | 2 ++
+ t/prefetch/grouped.t | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t
+index 4aad6b1..c0d2224 100644
+--- a/t/prefetch/grouped.t
++++ b/t/prefetch/grouped.t
+@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all;
+ 
+   # add an extra track to one of the cds, and then make sure we can get it on top
+   # (check if limit works)
+-  my $top_cd = $cd_rs->slice (1,1)->next;
++  my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next;
+   $top_cd->create_related ('tracks', {
+     title => 'over the top',
+   });
diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
deleted file mode 100644
index a5f86d105c3f..000000000000
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }:
-
-buildPythonApplication (rec {
-  name = "buildbot-slave-0.8.10";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "mirror://pypi/b/buildbot-slave/${name}.tar.gz";
-    sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg";
-  };
-
-  patchPhase = ''
-    substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail
-  '';
-
-  propagatedBuildInputs = [ twisted ];
-
-  # What's up with this?! 'trial' should be 'test', no?
-  #
-  # running tests
-  # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-  #    or: setup.py --help [cmd1 cmd2 ...]
-  #    or: setup.py --help-commands
-  #    or: setup.py cmd --help
-  #
-  # error: invalid command 'trial'
-  doCheck = false;
-
-  postInstall = ''
-    mkdir -p "$out/share/man/man1"
-    cp docs/buildslave.1 "$out/share/man/man1"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://buildbot.net/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    description = "Continuous integration system that automates the build/test cycle";
-
-    longDescription =
-      '' The BuildBot is a system to automate the compile/test cycle
-         required by most software projects to validate code changes.  By
-         automatically rebuilding and testing the tree each time something
-         has changed, build problems are pinpointed quickly, before other
-         developers are inconvenienced by the failure.  The guilty
-         developer can be identified and harassed without human
-         intervention.  By running the builds on a variety of platforms,
-         developers who do not have the facilities to test their changes
-         everywhere before checkin will at least know shortly afterwards
-         whether they have broken the build or not.  Warning counts, lint
-         checks, image size, compile time, and other build parameters can
-         be tracked over time, are more visible, and are therefore easier
-         to improve.
-
-         The overall goal is to reduce tree breakage and provide a platform
-         to run tests or code-quality checks that are too annoying or
-         pedantic for any human to waste their time with.  Developers get
-         immediate (and potentially public) feedback about their changes,
-         encouraging them to be more careful about testing before checking
-         in code.
-      '';
-    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.all;
-  };
-})
diff --git a/pkgs/development/tools/build-managers/buildbot/9.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 0f33cd0c6642..4431105d18f8 100644
--- a/pkgs/development/tools/build-managers/buildbot/9.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -7,10 +7,10 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.0rc2";
+  version = "0.9.0rc3";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "06xzbjzji3by4hldwr850fc989ymsfl2s8nil21klv2g00dgmcmk";
+    sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb";
   };
 
   buildInputs = with pythonPackages; [
@@ -59,19 +59,20 @@ pythonPackages.buildPythonApplication (rec {
   ] ++ plugins;
 
   preInstall = ''
-    # buildbot tries to import 'buildslaves' but does not
-    # include the module in it's package, so get rid of those references
-    sed -i.bak -e '66,$d' buildbot/test/__init__.py
-    sed -i.bak -e '506,$d' buildbot/test/unit/test_worker_base.py
-    sed -i.bak -e '648,$d' buildbot/test/unit/test_worker_ec2.py
-    sed -i.bak -e '289,$d' buildbot/test/unit/test_worker_libvirt.py
-    sed -i.bak -e '190,$d' buildbot/test/unit/test_worker_openstack.py
-    sed -i.bak -e '60,84d' buildbot/test/integration/test_configs.py
-
     # writes out a file that can't be read properly
     sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
   '';
 
+  postFixup = ''
+    buildPythonPath "$out"
+    patchPythonScript "$out/bin/buildbot"
+    mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot
+    echo "#!/bin/bash" > $out/bin/buildbot
+    echo "export PYTHONPATH=$out/lib/python2.7/site-packages:$PYTHONPATH" >> $out/bin/buildbot
+    echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot
+    chmod -c 755 $out/bin/buildbot
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://buildbot.net/;
     description = "Continuous integration system that automates the build/test cycle";
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 177b7b3d946b..384452e27d9c 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -5,21 +5,17 @@
 
 let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-pkg-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-pkg";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/95/47/1fef931d410cc24127564c2e193e7c1c184f5c5f481930f77c6d6840cfab/${name}.tar.gz";
-      sha256 = "01wc9bmqq1rfayqnjm7rkjhbcj7h6ah4vv10s6hglnq9s4axvxp6";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
 
-    # doesn't seem to break without this...
-    patchPhase = ''
-      sed -i.bak -e '/"setuptools >= 21.2.1",/d' setup.py
-    '';
-
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot Packaging Helper";
@@ -31,14 +27,15 @@ let
 in {
 
   www = pythonPackages.buildPythonPackage rec {
-    name = "buildbot_www-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot_www";
+    version = "0.9.0rc3";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e0/d7/f1023cdb7340a15ee1fc9916e87c4d634405a87164a051e2c59bf9d51ef1/${name}-py2-none-any.whl";
-      sha256 = "1006x56x4w4p2mbrzm7jy51c0xxz48lzhdwvx7j4hrjs07mapndj";
+      url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl";
+      sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
@@ -52,12 +49,13 @@ in {
   };
 
   console-view = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-console-view-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-console-view";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/51/e24cc1b596e5b262a272cba3687476a13ec7d9ea24bf1f4fd0cd72902bb6/${name}.tar.gz";
-      sha256 = "0970gq1sxnfd0nlrnd3mj25i3cginlw2pj5ffqsd57n5hlqg48ib";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
@@ -71,12 +69,13 @@ in {
   };
 
   waterfall-view = pythonPackages.buildPythonPackage rec {
-    name = "buildbot-waterfall-view-${version}";
-    version = "0.9.0rc2";
+    name = "${pname}-${version}";
+    pname = "buildbot-waterfall-view";
+    version = "0.9.0rc3";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c2/21/3895355b05f91977a8b8e5435f85354e927c2ef547a25432a6bacf792a67/${name}.tar.gz";
-      sha256 = "1zybrbbsyplv93zkin8cb3z1bqqr6px4p203ldcpn7lds5s9vk00";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+      sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 36b57a41aa73..2c8e17a37c00 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -4,12 +4,13 @@
 }:
 
 pythonPackages.buildPythonApplication (rec {
-  name = "buildbot-worker-${version}";
-  version = "0.9.0rc2";
+  name = "${pname}-${version}";
+  pname = "buildbot-worker";
+  version = "0.9.0rc3";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/6a/be/ae80e5e87bc92ac813cd944c08d3b6168090145fc168e7a553e88c07067a/${name}.tar.gz";
-    sha256 = "19l28s2fyzln6nv2ypbdg11xiz7lrjy0n64fzhngfalv61x2bp8j";
+    url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+    sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 919c80e7ce58..d824c3e2c964 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
+{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc. 
+    # Nixpkgs' Glibc.
     optional (stdenv ? glibc) ./search-path.patch ++
     optional (stdenv ? cross) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
+  buildInputs = [ curl expat zlib bzip2 ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs);
 
   configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive"
     + stdenv.lib.optionalString useQt4 " --qt-gui";
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
new file mode 100644
index 000000000000..98813f143cbb
--- /dev/null
+++ b/pkgs/development/tools/glock/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "glock-${version}";
+  version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
+
+  goPackagePath = "github.com/robfig/glock";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "robfig";
+    repo = "glock";
+    sha256 = "10jwn3k71p340g8d43zjx7k1j534rcd7rss8pif09mpfrn9qndhh";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/robfig/glock;
+    description = "A command-line tool to lock Go dependencies to specific revisions";
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/development/tools/glock/deps.nix
new file mode 100644
index 000000000000..b7392d757cfc
--- /dev/null
+++ b/pkgs/development/tools/glock/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/agtorre/gocolorize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agtorre/gocolorize";
+      rev = "f42b554bf7f006936130c9bb4f971afd2d87f671";
+      sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09";
+      sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg";
+    };
+  }
+]
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
new file mode 100644
index 000000000000..04c35f7b8bb7
--- /dev/null
+++ b/pkgs/development/tools/goa/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
+
+buildGoPackage rec {
+  name = "goa-${version}";
+  version = "1.0.0";
+
+  goPackagePath = "github.com/goadesign/goa";
+  subPackages = [ "goagen" ];
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "goadesign";
+    repo = "goa";
+    sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  allowGoReference = true;
+
+  outputs = [ "out" ];
+
+  preInstall = ''
+    export bin=$out
+  '';
+
+  postInstall = ''
+    # goagen needs GOPATH to be set
+    wrapProgram $out/bin/goagen \
+      --prefix GOPATH ":" $out/share/go
+
+    # and it needs access to all its dependancies
+    mkdir -p $out/share/go
+    cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/
+  '';
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://goa.design;
+    description = "A framework for building microservices in Go using a unique design-first approach";
+    license = licenses.mit;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix
new file mode 100644
index 000000000000..14e9234be8a2
--- /dev/null
+++ b/pkgs/development/tools/goa/deps.nix
@@ -0,0 +1,111 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/armon/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-metrics";
+      rev = "3df31a1ada83e310c2e24b267c8e8b68836547b4";
+      sha256 = "1l99f1bzvdhyqhnsrpi1pd07bps0msilzilrd7m4w7i1m5kra529";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimfeld/httppath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimfeld/httppath";
+      rev = "c8e499c3ef3c3e272ed8bdcc1ccf39f73c88debc";
+      sha256 = "0452zvrzjvy8pk5q6ykivz2cks082r4lmh7hghscxfqw6gf3siwi";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimfeld/httptreemux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimfeld/httptreemux";
+      rev = "96acf0909c0b45ebf4a25a816cedc6d317e63679";
+      sha256 = "0f9qbm1b8l7b21i2v8vmjyzfwf1mgkvxlk5250bwkp5i8n4ml2r6";
+    };
+  }
+  {
+    goPackagePath = "github.com/goadesign/goa";
+    fetch = {
+      type = "git";
+      url = "https://github.com/goadesign/goa";
+      rev = "ea323df387ea68f8ac9fd79336f523c25e12c92e";
+      sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1";
+    };
+  }
+  {
+    goPackagePath = "github.com/manveru/faker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/manveru/faker";
+      rev = "717f7cf83fb78669bfab612749c2e8ff63d5be11";
+      sha256 = "1p6laz0hnb2vhfvam83rz6vl2amajqa6nifnsj2lg3mcs9ga8c0f";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6";
+      sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744";
+      sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
+      sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
+    };
+  }
+  {
+    goPackagePath = "github.com/zach-klippenstein/goregen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zach-klippenstein/goregen";
+      rev = "795b5e3961ea1912fde60af417ad85e86acc0d6a";
+      sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
+      sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09";
+      sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f";
+      sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h";
+    };
+  }
+]
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 0fd9f143ce9a..359ab125be99 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }:
+{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
   name = "bsdbuild-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
   };
 
-  buildInputs = [ perl groff ed ];
+  buildInputs = [ perl mandoc ed ];
   nativeBuildInputs = [ pkgconfig libtool gettext ];
 
   prePatch = ''
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index f538c2138926..c90e356e044f 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
+{ stdenv, fetchurl, fetchpatch, runCommand, zlib }:
 
 let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
@@ -15,43 +15,47 @@ let ccache = stdenv.mkDerivation rec {
     substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)'
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
-  passthru = {
+  passthru = let
+      cc = stdenv.cc.cc;
+      ccname = if stdenv.cc.isClang then "clang" else "gcc";
+      cxxname = if stdenv.cc.isClang then "clang++" else "g++";
+    in {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
     links = extraConfig: stdenv.mkDerivation rec {
       name = "ccache-links";
       passthru = {
-        inherit gcc;
-        isGNU = true;
+        inherit (stdenv.cc) isClang;
+        inherit (cc) isGNU;
       };
-      inherit (gcc.cc) lib;
+      inherit (cc) lib;
       buildCommand = ''
         mkdir -p $out/bin
-        if [ -x "${gcc.cc}/bin/gcc" ]; then
-          cat > $out/bin/gcc << EOF
+        if [ -x "${cc}/bin/${ccname}" ]; then
+          cat > $out/bin/${ccname} << EOF
           #!/bin/sh
           ${extraConfig}
-          exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@"
+          exec ${ccache}/bin/ccache ${cc}/bin/${ccname} "\$@"
         EOF
-          chmod +x $out/bin/gcc
+          chmod +x $out/bin/${ccname}
         fi
-        if [ -x "${gcc.cc}/bin/g++" ]; then
-          cat > $out/bin/g++ << EOF
+        if [ -x "${cc}/bin/${cxxname}" ]; then
+          cat > $out/bin/${cxxname} << EOF
           #!/bin/sh
           ${extraConfig}
-          exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@"
+          exec ${ccache}/bin/ccache ${cc}/bin/${cxxname} "\$@"
         EOF
-          chmod +x $out/bin/g++
+          chmod +x $out/bin/${cxxname}
         fi
-        for executable in $(ls ${gcc.cc}/bin); do
+        for executable in $(ls ${cc}/bin); do
           if [ ! -x "$out/bin/$executable" ]; then
-            ln -s ${gcc.cc}/bin/$executable $out/bin/$executable
+            ln -s ${cc}/bin/$executable $out/bin/$executable
           fi
         done
-        for file in $(ls ${gcc.cc} | grep -vw bin); do
-          ln -s ${gcc.cc}/$file $out/$file
+        for file in $(ls ${cc} | grep -vw bin); do
+          ln -s ${cc}/$file $out/$file
         done
       '';
     };
@@ -63,7 +67,7 @@ let ccache = stdenv.mkDerivation rec {
     downloadPage = https://ccache.samba.org/download.html;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.unix;
   };
 };
 in ccache
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
new file mode 100644
index 000000000000..b6cbeb88402b
--- /dev/null
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "rainicorn-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "RustDT";
+    repo = "Rainicorn";
+    rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4";
+    sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01";
+  };
+
+  depsSha256 = "1ckrf77s1glrqi0gvrv9wqmip4i97dk0arn0iz87jg4q2wfss85k";
+
+  meta = with stdenv.lib; {
+    description = "Rust IDEs.  parse-analysis";
+    homepage = https://github.com/RustDT/Rainicorn;
+    license = with licenses; [ mit asl20 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index e93006b89ce3..d573a6c5b60c 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,27 +4,24 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.3.16";
+  version = "4.4.0";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "0i4nvb1yd9qnbgbfc8wbl7ghpmba2jr98hj4y4j4sbjfk65by3xw";
+      sha256 = "19zgnw0qn5f775p581mq5ry086rhcnnhqc6x82hzmwfysbsyl7xs";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha256 = "1w9b1584kh1n4fw0wxbyslxp6w09if53fv4p9zz7vn4smm79ndfz";
+      sha256 = "1m4nf1yidwkmlwald0ycwzvnsp5p93nc4bs1xh67phw0b2db99x9";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha256 = "1vhz2j30p285blspg7prr9bsah6f922p0mv7mhmk6xzgf6fgn764";
+      sha256 = "1bpdpwqa9sw2n7vw2g8q4c1mzgh8wgwn4p7sbryc2ki90yz8ibga";
     }
   );
 
   buildInputs = [ unzip ];
-  phases = [ "unpackPhase" ]
-   ++ (lib.optionals (stdenv.system != "x86_64-darwin") [ "patchPhase" ])
-   ++ [ "installPhase " ];
 
-  patchPhase = ''
+  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index bb6cffdb1224..b7a25a29c1c9 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
 
 with stdenv.lib;
 let
-  version = "0.13.13";
+  version = "0.13.20";
   isHeadless = releaseType == "headless";
 
   arch = if stdenv.system == "x86_64-linux" then {
@@ -27,12 +27,12 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "1ip0h2kh16s07nk6xqpm0i0yb0x32zn306414j15gqg3j0j0mzpn"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = "1hvj51cggp6cbxyndbl4z07kadzxxk3diiqkkv0jm9s0nrwvq9zr"; };
+      headless = fetchurl        { inherit name url; sha256 = "0nf1sxcgnbx52iwx7jgkjxass10lzz1iyskvgk0gq3ky9cg4ixfb"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "0rgjdxdcqf9m3ghzr076q3xi1g01ix14jldjwn6jgnvggzqkph9l"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = "14dwlakn7z8jziy0hgm3nskr7chp7753z1dakxlymz9h5653cx8b"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "0hda2z1q22xanl328kic5q09ck59mr3aa5cy4dbjv86s4dx9kxfq"; };
     };
   };
 
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 18e13b8be949..f9be01aa9289 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -2,11 +2,7 @@
 , giflib, libXt, pkgconfig }:
 
 let
-  openscenegraph_ = openscenegraph.override {
-    inherit ffmpeg giflib;
-    withApps = false;
-  };
-  openscenegraph__ = openscenegraph_.overrideDerivation (self: {
+  openscenegraph_ = openscenegraph.overrideDerivation (self: {
     src = fetchFromGitHub {
       owner = "OpenMW";
       repo = "osg";
@@ -15,19 +11,19 @@ let
     };
   });
 in stdenv.mkDerivation rec {
-  version = "0.39.0";
+  version = "0.40.0";
   name = "openmw-${version}";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
     rev = name;
-    sha256 = "0haz8p0hwzgpj634q34if6x57rkc3zsndry5pz4a25m23sn1i72y";
+    sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig libXt ];
+  buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal pkgconfig libXt ];
 
   meta = with stdenv.lib; {
     description = "An unofficial open source engine reimplementation of the game Morrowind";
diff --git a/pkgs/games/ut2004/default.nix b/pkgs/games/ut2004/default.nix
new file mode 100644
index 000000000000..3f306ac6eb54
--- /dev/null
+++ b/pkgs/games/ut2004/default.nix
@@ -0,0 +1,9 @@
+{ callPackage }:
+
+{
+  ut2004-demo = callPackage ./demo.nix { };
+
+  ut2004 = gamePacks: callPackage ./wrapper.nix {
+    inherit gamePacks;
+  };
+}
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
new file mode 100644
index 000000000000..f5fcdc088c8f
--- /dev/null
+++ b/pkgs/games/ut2004/demo.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl }:
+
+let
+  arch =
+    if stdenv.system == "x86_64-linux" then "amd64"
+    else if stdenv.system == "i686-linux" then "x86"
+    else throw "Unsupported architecture";
+
+in stdenv.mkDerivation rec {
+  name = "ut2004-demo-${version}";
+  version = "3334";
+
+  src = fetchurl {
+    url = "http://treefort.icculus.org/ut2004/UT2004-LNX-Demo${version}.run.gz";
+    sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7";
+  };
+
+  buildCommand = ''
+    cat $src | gunzip > setup.run
+    chmod +x setup.run
+    ./setup.run --noexec --target .
+    mkdir $out
+    tar -xaf ut2004demo.tar.bz2 -C $out
+    tar -xaf linux-${arch}.tar.bz2 -C $out
+
+    rm $out/System/libSDL-1.2.so.0
+    rm $out/System/openal.so
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version";
+    homepage = "http://www.unrealtournament2004.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ abbradar ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix
new file mode 100644
index 000000000000..31d0763be4d2
--- /dev/null
+++ b/pkgs/games/ut2004/wrapper.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, runCommand, buildEnv, makeWrapper, makeDesktopItem, gamePacks, libstdcxx5, SDL, openal }:
+
+let
+  game = buildEnv {
+    name = "ut2004-game";
+    paths = gamePacks;
+    ignoreCollisions = true;
+    pathsToLink = [ "/" "/System" ];
+    postBuild = ''
+      ln -s ${lib.getLib SDL}/lib/libSDL-1.2.so.0 $out/System
+      ln -s ${lib.getLib openal}/lib/libopenal.so $out/System/openal.so
+      for i in $out/System/*-bin; do
+        path="$(readlink -f "$i")"
+        rm "$i"
+        cp "$path" "$i"
+        chmod +w "$i"
+        patchelf \
+          --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+          --set-rpath "$out/System:${lib.makeLibraryPath [ libstdcxx5 ]}" \
+          "$i"
+      done
+    '';
+  };
+
+  desktop = makeDesktopItem {
+    name = "ut2004";
+    desktopName = "Unreal Tournament 2004";
+    comment = "A first-person shooter video game developed by Epic Games and Digital Extreme";
+    genericName = "First-person shooter";
+    categories = "Application;Game;";
+    exec = "ut2004";
+  };
+
+in runCommand "ut2004" {
+  nativeBuildInputs = [ makeWrapper ];
+} ''
+  mkdir -p $out/bin
+  for i in ${game}/System/*-bin; do
+    name="$(basename "$i")"
+    makeWrapper $i $out/bin/''${name%-bin} \
+      --run "cd ${game}/System"
+  done
+
+  mkdir -p $out/share/applications
+  ln -s ${desktop}/share/applications/* $out/share/applications
+''
diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh
deleted file mode 100644
index ca6b4fe1092c..000000000000
--- a/pkgs/games/ut2004demo/builder.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-source $stdenv/setup
-
-skip=7976
-
-bunzip2 < $src | (dd bs=1 count=$skip of=/dev/null && dd bs=1M) | tar xvf - ut2004demo.tar
-
-mkdir $out
-
-(cd $out && tar xvf -) < ut2004demo.tar
-
-
-# Patch the executable from ELF OS/ABI type `Linux' (3) to `SVR4' (0).
-# This doesn't seem to matter to ld-linux.so.2 at all, except that it
-# refuses to load `Linux' executables when invokes explicitly, that
-# is, when we do `ld-linux.so.2 $out/System/ut2004-bin', which we need
-# to override the hardcoded ELF interpreter with our own.
-
-# This is a horrible hack, of course.  A better solution would be to
-# patch Glibc so it accepts the `Linux' ELF type as well (why doesn't
-# it?); or to use FreeBSD's `brandelf' program to set to ELF type
-# (which is a bit cleaner than patching using `dd' :-) ).
-
-#(cd $out/System && (echo -en "\000" | dd bs=1 seek=7 of=ut2004-bin conv=notrunc))
-
-
-# Set the ELF interpreter to our own Glibc.
-for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"
-done
diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix
deleted file mode 100644
index 27b81edf630b..000000000000
--- a/pkgs/games/ut2004demo/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{stdenv, fetchurl, xorg, mesa}:
-
-assert stdenv.system == "i686-linux";
-
-let {
-
-  raw = stdenv.mkDerivation {
-    name = "ut2004-demo-3120";
-    src = fetchurl {
-      urls = [
-        ("http://store.node-10.ds-servers.com/file/BcFLgoIgAADQA7kw0qZctDAF+4cj"
-          + "mbnDMFOJTAyM0-cejkEIuDvQ6Uv9ZbvcWMnRmXXxhA0LyvzoKdvsnXne0D1DGTLiR0"
-          + "I1CmM2M-E5ryH-tD3yweCXyNyH1WGI3Wh09ja29mHtzGF1rxEyhRfQ7ggCKdfCrhvz"
-          + "H9oTJXSCAtGuSKdVDhe6tNtrqa151MIircZtRLPxQcGmJ+n3-iUeWYgHuqbmrK4ur7"
-          + "Qcy6QrAhYa+e5jcfYjgPF3VGsw4qx+0ilxJUCiuYCX2H8A6X3rxJILa26w3O425W2G"
-          + "kHPiQWrhFT8cIOyqSr8+dMO5Xi5-/ut2004-lnx-demo-3120.run.bz2")
-        http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2
-      ];
-      sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli";
-    };
-    builder = ./builder.sh;
-  };
-
-  body = stdenv.mkDerivation {
-    name = raw.name;
-    builder = ./make-wrapper.sh;
-    inherit raw mesa;
-    inherit (xorg) libX11 libXext;
-  };
-
-}
-
-# http://mirror1.icculus.org/ut2004/ut2004-lnxpatch3204.tar.bz2
-# 5f659552095b878a029b917d216d9664
diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh
deleted file mode 100644
index 53ef90a615b0..000000000000
--- a/pkgs/games/ut2004demo/make-wrapper.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-
-cat > $out/bin/ut2004demo <<EOF
-#! $SHELL -e
-
-cd $raw/System
-
-LD_LIBRARY_PATH=$libX11/lib:$libXext/lib\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH ./ut2004-bin "\$@"
-EOF
-
-chmod +x $out/bin/ut2004demo
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 1e95d63e5172..adde818efcef 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb
+{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
 , withDebug ? false }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cups automake autoconf glib libxml2 libusb
+    cups automake autoconf glib libxml2 libusb libtool
   ];
 
   # lgmon3's --enable-libdir flag is used soley for specifying in which
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 7121ef689ae8..084925ef5910 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,7 @@
 # TODO check that no license information gets lost
-{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
-, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf
+{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
+, which, fetchgit, llvmPackages
+, xkb_switch, rustracerd, fzf
 , Cocoa ? null
 }:
 
@@ -80,7 +80,9 @@ rec {
   neosnippet          = neosnippet-vim;
   nerdcommenter       = The_NERD_Commenter;
   nerdtree            = The_NERD_tree;
+  polyglot            = vim-polyglot;
   quickrun            = vim-quickrun;
+  repeat              = vim-repeat;
   signature           = vim-signature;
   stylish-haskell     = vim-stylish-haskell;
   stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
@@ -92,6 +94,7 @@ rec {
   tmux-navigator      = vim-tmux-navigator;
   tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
   tslime              = tslime-vim;
+  unite               = unite-vim;
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   watchdogs           = vim-watchdogs;
@@ -497,6 +500,17 @@ rec {
 
   };
 
+  acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "acp-2013-02-05";
+    src = fetchgit {
+      url = "git://github.com/eikenb/acp";
+      rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e";
+      sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg";
+    };
+    dependencies = [];
+
+  };
+
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "elm-vim-2016-07-25";
     src = fetchgit {
@@ -838,6 +852,17 @@ rec {
 
   };
 
+  rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "rainbow-2016-08-08";
+    src = fetchgit {
+      url = "git://github.com/luochen1990/rainbow";
+      rev = "eeb35ccece20f2648b44580c484c6e57eec3c92b";
+      sha256 = "0s1ygjm5czzj1idrw4f13gg60zljznb6bs7fps4i3wl2mbmw5641";
+    };
+    dependencies = [];
+
+  };
+
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-xkbswitch-2016-01-31";
     src = fetchgit {
@@ -1146,6 +1171,17 @@ rec {
 
   };
 
+  vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-repeat-2015-05-09";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-repeat";
+      rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415";
+      sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7";
+    };
+    dependencies = [];
+
+  };
+
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 6cef8885ce0b..71c65f74a9c5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -33,6 +33,7 @@
 "github:ctrlpvim/ctrlp.vim"
 "github:digitaltoad/vim-jade"
 "github:eagletmt/neco-ghc"
+"github:eikenb/acp"
 "github:elmcast/elm-vim"
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
@@ -64,6 +65,7 @@
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
 "github:lokaltog/vim-easymotion"
+"github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
 "github:mhinz/vim-startify"
 "github:mkasa/lushtags"
@@ -91,6 +93,7 @@
 "github:thinca/vim-quickrun"
 "github:tomasr/molokai"
 "github:tpope/vim-eunuch"
+"github:tpope/vim-repeat"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 902f0e37e35f..3bfd59de7ed6 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -73,8 +73,11 @@ stdenv.mkDerivation rec {
     ./patches/15.9-kcl_str.patch
     ./patches/15.9-mtrr.patch
     ./patches/15.9-preempt.patch
-    ./patches/15.9-sep_printf.patch
-  ];
+    ./patches/15.9-sep_printf.patch ]
+  ++ optionals ( kernel != null &&
+                 (builtins.compareVersions kernel.version "4.6") >= 0 )
+               [ ./patches/kernel-4.6-get_user_pages.patch
+                 ./patches/kernel-4.6-page_cache_release-put_page.patch ];
 
   buildInputs =
     [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch
new file mode 100644
index 000000000000..1e7209ed5ed1
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch
@@ -0,0 +1,25 @@
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index 9c70211..b2242af 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -3220,7 +3220,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3238,7 +3238,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+-- 
+2.9.2
+
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch
new file mode 100644
index 000000000000..28820790e492
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch
@@ -0,0 +1,16 @@
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index b2242af..586129c 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -3249,7 +3249,7 @@ void ATI_API_CALL KCL_UnlockUserPages(unsigned long* page_list, unsigned int pag
+     unsigned int i;
+     for (i=0; i<page_cnt; i++)
+     {
+-        page_cache_release((struct page*)page_list[i]);
++        put_page((struct page*)page_list[i]);
+     }
+ }
+ 
+-- 
+2.9.2
+
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index f60951f5541e..5cc875f5c90a 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "fanctl-${version}";
 
-  version = "0.9.0";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz";
-    sha256 = "03dv5zzb8fkl9kkbhznxm48d6j3fjms74fn0s1zip2gz53l1s14n";
+    sha256 = "0lj7371n06sg5mlbbfgvm0qhzgp464n6v55rgs7kmmx4d37gb5fl";
   };
 
   # The Ubuntu package creates a number of state/config directories upon
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
deleted file mode 100644
index fdc5cc802a1a..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.14.77";
-  extraMeta.branch = "3.14";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1v3cc3ddla2b8gkwbms4x3lbjygw87r13150nikf1gc0hf64rqp0";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 47057215ce21..ab703469c2b5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,10 +95,6 @@ rec {
     sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j";
   };
 
-  grsecurity_3_14 = throw "grsecurity stable is no longer supported";
-
-  grsecurity_4_4 = throw "grsecurity stable is no longer supported";
-
   grsecurity_testing = grsecPatch
     { kver   = "4.7.4";
       grrev  = "201609152234";
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index ec35fabd05ac..3ce9617ec5b1 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-  enableParallelBuilding = true;
-
   NIX_CFLAGS_COMPILE = [ "-march=core2" ];
 
   postPatch = ''
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 5254aa8e94b4..f0501fa57d63 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-${version}";
-  version = "0.6.4";
+  version = "0.7.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "consul";
     inherit rev;
-    sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
+    sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7";
   };
 
   # Keep consul.ui for backward compatability
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
new file mode 100644
index 000000000000..63cd71e146b9
--- /dev/null
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig,
+  boost, libyamlcpp, libsodium, sqlite, protobuf,
+  libmysql, postgresql, lua, openldap, geoip, curl
+}:
+
+stdenv.mkDerivation rec {
+  name = "powerdns-${version}";
+  version = "4.0.1";
+
+  src = fetchurl {
+    url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
+    sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi";
+  };
+
+  buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ];
+
+  # nix destroy with-modules arguments, when using configureFlags
+  preConfigure = ''
+    configureFlagsArray=(
+      "--with-modules=bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote"
+      --with-sqlite3
+      --with-socketdir=/var/lib/powerdns
+      --enable-libsodium
+      --enable-tools
+      --disable-dependency-tracking
+      --disable-silent-rules
+      --enable-reproducible
+      --enable-unit-tests
+    )
+  '';
+  checkPhase = "make check";
+
+  meta = with stdenv.lib; {
+    description = "Authoritative DNS server";
+    homepage = http://www.powerdns.com/;
+    platforms = platforms.linux;
+    # cannot find postgresql libs on macos x
+    license = licenses.gpl2;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 7ce23d5d6b3a..5d4501b81ccf 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.0.7100";
+  version = "3.0.7200";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "0fxqk4p8p72bjzlbl8da988xr6bryr1zpvaaf8if6vnclly4vmny";
+    sha256 = "1j1fa54as8s75qky5gw9bw3b19mgn72nv89ip2hgln6bjv1b40jq";
   };
 
   propagatedBuildInputs = with pkgs; [
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 71095ce3583b..d4f22ab81eed 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.5pre";
+  version = "1.1.5";
   name = "longview-${version}";
 
   src = fetchFromGitHub {
     owner = "linode";
     repo = "longview";
-    rev = "5bcc9b60896b72de2d14f046f911477c26eb70ba";
-    sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02";
+    rev = "v${version}";
+    sha256 = "1i9lli8iw8sb1bd633i82fzhx5gz85ma9d1hra41pkv2p3h823pa";
   };
 
   patches = [
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2368ba18a494..e5cb3fa988ff 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -18,13 +18,15 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.3.8";
+  name = "samba-4.3.11";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "041b5frh4ikcka922aqhqjvlv4w2s7jycyykpvsknj0a79ncd79p";
+    sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach";
   };
 
+  outputs = [ "out" "dev" "man" ];
+
   patches =
     [ ./4.x-no-persistent-install.patch
       ./4.x-fix-ctdb-deps.patch
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index b44b173c05c7..a86862a14a56 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.4323";
+  version = "2.0.0.4326";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1c50z7cwkm3pfn5inac96b7lazvxr2778aix4cp5b0rm01r2414x";
+    sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
new file mode 100644
index 000000000000..0ecbdab9ad6c
--- /dev/null
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, gcc }:
+
+buildGoPackage rec {
+  name = "cockroach-${version}";
+  version = "beta-20160915";
+
+  goPackagePath = "github.com/cockroachdb/cockroach";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "cockroachdb";
+    repo = "cockroach";
+    rev = version;
+    sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3";
+  };
+
+  buildInputs = [ gcc ];
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.cockroachlabs.com;
+    description = "A scalable, survivable, strongly-consistent SQL database";
+    license = licenses.asl20;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/servers/sql/cockroachdb/deps.nix b/pkgs/servers/sql/cockroachdb/deps.nix
new file mode 100644
index 000000000000..da2ab57f91a1
--- /dev/null
+++ b/pkgs/servers/sql/cockroachdb/deps.nix
@@ -0,0 +1,471 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/VividCortex/ewma";
+    fetch = {
+      type = "git";
+      url = "https://github.com/VividCortex/ewma";
+      rev = "8b9f1311551e712ea8a06b494238b8a2351e1c33";
+      sha256 = "1w8gf6310dxl57jdq1b04wbh4ssb0nvck3926bbd86mnw78z0byl";
+    };
+  }
+  {
+    goPackagePath = "github.com/backtrace-labs/go-bcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/backtrace-labs/go-bcd";
+      rev = "c5383e2df7004f8b2fb2f10a33167d757bb0fbfb";
+      sha256 = "0v7al14ql8vddj8bw2yp1pp47nfdhq6vglbv6fmpg5sf5yfsp9xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/biogo/store";
+    fetch = {
+      type = "git";
+      url = "https://github.com/biogo/store";
+      rev = "913427a1d5e89604e50ea1db0f28f34966d61602";
+      sha256 = "0xgz1g9digvvw64rmzw90a6iyxlljiiz2i1x0x0d8mw4wyaxcipz";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenk/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenk/backoff";
+      rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6";
+      sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/readline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/readline";
+      rev = "a193146c91dea4b6cf30f355e99fb85f73d20f07";
+      sha256 = "0amg5p3xadmj4p58f63f8kkggs9q3f3jhi7ijzb79grbg1lj2rj2";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/c-jemalloc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/c-jemalloc";
+      rev = "42e6a32cd7a4dff9c70d80323681d46d046181ef";
+      sha256 = "16ddzw35xj2vz8324mac5bhhr9akvjrg14lgq2mn5nfw1zs42r7n";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/c-protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/c-protobuf";
+      rev = "951f3e665896e7ba939fd1f2db9aeaae6ca988f8";
+      sha256 = "032ncrq4p48riwk8zj6p3rp65p87k9793lg107ja6mf8nx0v3z3l";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/c-rocksdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/c-rocksdb";
+      rev = "b5ca031b93fde49bfa2ba99aba423136aebf3c06";
+      sha256 = "1vwq8fbcgwvq2mqv1vwm3b671iklg26s7zd3bgxr5rl076mhn6s5";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/c-snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/c-snappy";
+      rev = "d4e7b428fe7fc09e93573df3448567a62df8c9fa";
+      sha256 = "09c1pnks51ypvqh97yf9mvi034cc3bb8dj3vkl9v959pg5ix91g4";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/cmux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/cmux";
+      rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d";
+      sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/cockroach";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/cockroach";
+      rev = "3fff05767cd3eda2197ce102391c0de447fef606";
+      sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/pq";
+      rev = "40c6b2414c76cdb84aacc955f79dc844e48ad0c0";
+      sha256 = "16pnyndzlsk5rbbrimpkg6mf9w2qf0z64pk2k70ja4a65kihlw9g";
+    };
+  }
+  {
+    goPackagePath = "github.com/codahale/hdrhistogram";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codahale/hdrhistogram";
+      rev = "f8ad88b59a584afeee9d334eff879b104439117b";
+      sha256 = "1y1llqaczhc5hqa71pwa1ns8nchizpl678lp23vl51c04swn8h8n";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "656167d760543d442eae62f0c8c4f92c05f59508";
+      sha256 = "1v4bwfh7ziklfcdapnyky00gjivcn1n30b72pwmbdlk7283p555k";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599";
+      sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj";
+    };
+  }
+  {
+    goPackagePath = "github.com/dustin/go-humanize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/go-humanize";
+      rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8";
+      sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k";
+    };
+  }
+  {
+    goPackagePath = "github.com/elastic/gosigar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/elastic/gosigar";
+      rev = "7c0ce0d4814c8d4950d7e7f40ed3b6359e757875";
+      sha256 = "1nar7jia3xfgwnvazp25m9b0kxxklarrq9fzdr63j3nqy2fnwvca";
+    };
+  }
+  {
+    goPackagePath = "github.com/elazarl/go-bindata-assetfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/elazarl/go-bindata-assetfs";
+      rev = "e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b";
+      sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk";
+    };
+  }
+  {
+    goPackagePath = "github.com/facebookgo/clock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/facebookgo/clock";
+      rev = "600d898af40aa09a7a93ecb9265d87b0504b6f03";
+      sha256 = "1z3jxwsqll65il7rcdx5j4dggg6w143z24h3agk09xvsc2iyj7a2";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "a4cceea7a401a73fefafd1a21fedbd4694124a82";
+      sha256 = "1b23izdgxlz010qrqgazm5yg0bc3pkni1qdf8n3z3xcn58hcx2yg";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "2c1988e8c18d14b142c0b472624f71647cf39adb";
+      sha256 = "176x3yv6l0i49ddv73r9v6w9qcmgrfzy8db26r01yk7sczq75nd5";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "7d79101e329e5a3adf994758c578dab82b90c017";
+      sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/grpc-gateway";
+      rev = "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092";
+      sha256 = "0nl9hddmxw2s4cqpg70k1913fna101lxrha6dgplw8g8rjikfna4";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "d8ff598a019f2c7bad0980917a588193cf26666e";
+      sha256 = "11sdd5fi2w0szk850n4y35x4v2ndy62c3ss9alha5xcj4jh1j0yq";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "737b74a46c4bf788349f72cb256fed10aea4d0ac";
+      sha256 = "13bip4vamvij8dx0v0nhrikz6qhsimd0w4i55424c76ws6ph84i8";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "7cafcd837844e784b526369c9bce262804aebc60";
+      sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "80f8150043c80fb52dee6bc863a709cdac7ec8f8";
+      sha256 = "0brk4di63f56x9fsidn8dk7c2azan1kjzrli79h262j9pd17c3jm";
+    };
+  }
+  {
+    goPackagePath = "github.com/lightstep/lightstep-tracer-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lightstep/lightstep-tracer-go";
+      rev = "f3c66066ce6023ad1bd721cfbd9fbd6292eb08cc";
+      sha256 = "1ci38j6d3spy2279l6anxxvm7k85h4fr08pdfw9ghrv96ajmaizb";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "d6bea18f789704b5f83375793155289da36a3c7f";
+      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "daf2955e742cf123959884fdff4685aa79b63135";
+      sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203";
+    };
+  }
+  {
+    goPackagePath = "github.com/opentracing/basictracer-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/basictracer-go";
+      rev = "c7c0202a8a77f658aeb2193a27b6c0cfcc821038";
+      sha256 = "09mh7dlhr3lyw8kwpa07ywjzr3bg7847ky4hvx551lhyqk0bfv0l";
+    };
+  }
+  {
+    goPackagePath = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev = "855519783f479520497c6b3445611b05fc42f009";
+      sha256 = "15amxprc5n0dgr42jd1lkcn697m7pcvmksps9g1gw38ahyicxq8g";
+    };
+  }
+  {
+    goPackagePath = "github.com/petermattis/goid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petermattis/goid";
+      rev = "208e1c5be6bf38853827abdc6290b5f6a0c404d5";
+      sha256 = "0d511pdyrv9lkzq04agnm7019c1769vmdq8kyh66pq2np1x6jsl2";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "a22138067af1c4942683050411a841ade67fe1eb";
+      sha256 = "0fay1zxi8y4kj1q33mqxdsbicg9cplknnmzz87c9saq7rb4k6f36";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8";
+      sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq";
+    };
+  }
+  {
+    goPackagePath = "github.com/rcrowley/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rcrowley/go-metrics";
+      rev = "bdb33529eca3e55eac7328e07c57012a797af602";
+      sha256 = "146hfddgdi8rkg25v1f25klz3sy5slp0gny2lwjyi63jwly07512";
+    };
+  }
+  {
+    goPackagePath = "github.com/rubyist/circuitbreaker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rubyist/circuitbreaker";
+      rev = "7e3e7fbe9c62b943d487af023566a79d9eb22d3b";
+      sha256 = "01fshh514bq2bk7f6xv7zr781m23d3k1mla1lh8azqw5874m7a07";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8";
+      sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6";
+      sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
+      sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f";
+      sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "f676131e2660dc8cd88de99f7486d34aa8172635";
+      sha256 = "0gj4fpary501n32ag49mkd0vymqw01am0lv78l9db9dvd2im0i4m";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "a548aac93ed489257b9d959b40fe1e8c1e20778c";
+      sha256 = "022vl9s6hf8qzdrxfivzd3dg1gsr1vns0j3a3xfdkgv5z9qyvy83";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf";
+      sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
+      sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "2910a502d2bf9e43193af9d68ca516529614eed3";
+      sha256 = "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b";
+      sha256 = "0w2g3pcxxgnp3fk0qy7ail8mxdxv3cf1yavdx8rrjn9idyd261df";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/inf.v0";
+      rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v1";
+      rev = "9f9df34309c04878acc86042b16630b0f696e1de";
+      sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm";
+    };
+  }
+]
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 699520a2df55..a56df1a9c28c 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -14,7 +14,6 @@ mariadb = everything // {
   lib = client; # compat. with the old mariadb split
 };
 
-
 common = rec { # attributes common to both builds
   version = "10.1.16";
 
@@ -155,6 +154,9 @@ everything = stdenv.mkDerivation (common // {
   postInstall = common.postInstall + ''
     rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data
     rm "$out"/share/man/man1/mysql-test-run.pl.1
+
+    # Don't install mysqlbug to prevent a dependency on gcc.
+    rm $out/bin/mysqlbug
   '';
 });
 
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
deleted file mode 100644
index 0e27211a0606..000000000000
--- a/pkgs/servers/sql/monetdb/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-
-  name = "monetdb-2009-05-01";
-
-  src = fetchurl {
-    url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
-    sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
-  };
-
-  flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
-          // {
-            java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
-            /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
-          };
-
-  buildInputs = [ pcre
-                   openssl readline libxml2 ]; # optional python perl php java ?
-
-  cfg = {
-    geomSupport = true;
-    javaSupport = true;
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir $TMP/build
-    sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
-  '';
-
-  meta = {
-    description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
-    homepage = http://monetdb.cwi.nl/;
-    license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
-  };
-}
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
new file mode 100644
index 000000000000..a2052eca9c2d
--- /dev/null
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
+, boost, cctools, CoreServices }:
+
+# Note: zlib is not required; MySQL can use an internal zlib.
+
+stdenv.mkDerivation rec {
+  name = "mysql-${version}";
+  version = "5.7.15";
+
+  src = fetchurl {
+    url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
+    sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch";
+  };
+
+  preConfigure = stdenv.lib.optional stdenv.isDarwin ''
+    ln -s /bin/ps $TMPDIR/ps
+    export PATH=$PATH:$TMPDIR
+  '';
+
+  buildInputs = [ cmake bison ncurses openssl readline zlib boost ]
+     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DWITH_SSL=yes"
+    "-DWITH_READLINE=yes"
+    "-DWITH_EMBEDDED_SERVER=yes"
+    "-DWITH_ZLIB=yes"
+    "-DHAVE_IPV6=yes"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_SYSCONFDIR=etc/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
+    "-DINSTALL_MANDIR=share/man"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_SCRIPTDIR=bin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
+    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
+  ];
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  prePatch = ''
+    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+  '';
+  postInstall = ''
+    sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
+    rm -r $out/mysql-test "$out"/lib/*.a
+    rm $out/share/man/man1/mysql-test-run.pl.1
+  '';
+
+  passthru.mysqlVersion = "5.7";
+
+  meta = {
+    homepage = http://www.mysql.com/;
+    description = "The world's most popular open source database";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6cdca83256d9..6cab8597869e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1824,14 +1824,15 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2016-05-22";
+    name = "xf86-video-intel-2016-09-08";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz;
-      sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz;
+      sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;
+    configureFlags = "--with-default-dri=3";
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index e71c2f770b9b..372fd3cfa526 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -89,8 +89,16 @@ let
       cc
     ];
 
-  # Add a utility function to produce derivations that use this
-  # stdenv and its shell.
+  # `mkDerivation` wraps the builtin `derivation` function to
+  # produce derivations that use this stdenv and its shell.
+  #
+  # See also:
+  #
+  # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv
+  #   Details on how to use this mkDerivation function
+  #
+  # * https://nixos.org/nix/manual/#ssec-derivation
+  #   Explanation about derivations in general
   mkDerivation =
     { buildInputs ? []
     , nativeBuildInputs ? []
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 730f8a90ce2d..d0d220b1de80 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.4.4";
+  name = "xorriso-1.4.6";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "1izv8dvwacyh432vv1rm6lyjrq0v205kyakfra6iwa146c9m9fgr";
+    sha256 = "112p0ghwzxrcjbsir1n2jxhq103ckrw93wzvd55qqvzfgs674vsj";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 060247aa532d..f1faf69ed589 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "avfs-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
   src = fetchurl {
     url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
-    sha256 = "1j7ysjkv0kbkwjagcdgwcnbii1smd58pwwlpz0l7amki5dxygpn6";
+    sha256 = "005iw01ppjslfzbbx52dhmp1f7a8d071s5pxvjlk11zdv4h22rbb";
   };
 
-  buildInputs = [ pkgconfig fuse xz ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ fuse xz ];
 
   configureFlags = [
     "--enable-library"
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index be908b162c32..05c3d6a7819b 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.147";
+  version = "1.148";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "0nz1ymf9yn8aw2va7mhnzz2y5pf6r651sap8k09r92h1224i0wbj";
+    sha256 = "1d0qqzln5w7f7kkw75cp8g8hg43f85xj0h68y6j6yw7d62q1406g";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index a536321fc74e..d00e1abc7a5d 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.98";
+  version = "5.112";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5";
+    sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 1687c9fffafc..4d5eabfebc90 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -30,9 +30,9 @@ pythonPackages.buildPythonApplication rec {
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
   propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
-    [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
+    map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
-    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
+    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index d743a68c83b9..0e3922d2928a 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -6,6 +6,8 @@ buildRustPackage rec {
   name = "exa-${version}";
   version = "2016-04-20";
 
+  # NOTE: There is an impurity caused by `exa` depending on
+  # https://github.com/rust-datetime/zoneinfo-compiled.git
   depsSha256 = "0qsqkgc1wxigvskhaamgfp5pyc2kprsikhcfccysgs07w44nxkd0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix
new file mode 100644
index 000000000000..297d6557f5e9
--- /dev/null
+++ b/pkgs/tools/misc/mandoc/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "mandoc-${version}";
+  version = "1.13.4";
+
+  src = fetchurl {
+    url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz";
+    sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a";
+  };
+
+  buildInputs = [ zlib ];
+
+  configureLocal = ''
+    HAVE_WCHAR=1
+    MANPATH_DEFAULT="/run/current-system/sw/share/man"
+    OSNAME="NixOS"
+    PREFIX="$out"
+    HAVE_MANPATH=1
+    LD_OHASH="-lutil"
+    BUILD_DB=0
+  '';
+
+  preConfigure = ''
+    echo $configureLocal > configure.local
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://mdocml.bsd.lv/";
+    description = "suite of tools compiling mdoc and man";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ramkromberg ];
+  };
+}
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 3b6b7bde08de..cb0859cfa68b 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0cnhv9a6vdrp2wmyl69fb1yklbx1x5pblsy4a5a36gwxmaill05k";
+    sha256 = "0gxr9hcscxq7h8nwinm1arjfy2rw4i1iwq6ghnm7pw7ay1n7sfzq";
   };
 
   pythonPaths = [ pycrypto requests2 ];
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 197b92295a82..79565af8e926 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
 
 stdenv.mkDerivation rec {
-  # The last release from 2012, 0.12, lacks '-targets'
-  name = "xclip-0.12-svn-20140209";
+  name = "xclip-${version}";
+  version = "0.13";
 
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/xclip/code/trunk";
-    rev = "87";
-    sha256 = "1rbcdgr73916wvzfgqjs1jhgzk8qs1yw2iiqy7ifrkjafhi37w6b";
+  src = fetchFromGitHub {
+    owner = "astrand";
+    repo = "xclip";
+    rev = version;
+    sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs";
   };
 
-  buildInputs = [ xlibsWrapper libXmu autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ libXmu ];
 
   meta = {
     description = "Tool to access the X clipboard from a console application";
-    homepage = http://sourceforge.net/projects/xclip/;
+    homepage = https://github.com/astrand/xclip;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index a4f837bf8330..750443ace3ac 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 = "2016.07.16";
+  version = "2016.09.19";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "017x2hqc2bacypjmn9ac9f91y9y6afydl0z7dich5l627494hvfg";
+    sha256 = "276637e83525778a83d0457f6b9fbc29d6109bc8366d43125432ce835d28545e";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix
index b565b35a929b..42b0c37411c8 100644
--- a/pkgs/tools/networking/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman-notify/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Desktop notification integration for connman";
     homepage = https://github.com/wavexx/connman-notify;
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };
 }
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index c9380761f9fa..4c1fd1b5bbad 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.32";
+  version = "1.33";
   src = fetchurl {
     url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
-    sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i";
+    sha256 = "187mknq2i907gf8dz0i79359gn1qc9mryvqkcgb280d7dw1ld2dw";
   };
 
   buildInputs = [ openconnect polkit
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 1963454f142c..4f9e8b045b0d 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,23 +1,18 @@
-{ stdenv, fetchurl, gnutls33, autoreconfHook }:
+{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }:
 
 let
-  version = "1.99.15";
+  version = "2.0";
 in
 stdenv.mkDerivation {
   name = "inadyn-${version}";
 
   src = fetchurl {
-    url = "https://github.com/troglobit/inadyn/releases/download/${version}/inadyn-${version}.tar.xz";
-    sha256 = "05f7k9wpr0fn44y0pvdrv8xyilygmq3kjhvrwlj6dgg9ackdhkmm";
+    url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz";
+    sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh";
   };
 
-  preConfigure = ''
-    export makeFlags=prefix=$out
-  '';
-
-  buildInputs = [ gnutls33 autoreconfHook ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gnutls libite libconfuse ];
 
   meta = {
     homepage = http://inadyn.sourceforge.net/;
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index b8f886566715..4dea88190d4a 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.12.1";
+  name = "nbd-3.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di";
+    sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad";
   };
 
+  patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ];
+
   buildInputs =
     [ pkgconfig glib ]
     ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
@@ -17,8 +19,7 @@ stdenv.mkDerivation rec {
     cp README.md "$out/share/doc/${name}/"
   '';
 
-  # The test suite doesn't succeed in chroot builds.
-  doCheck = false;
+  doCheck = true;
 
   # Glib calls `clock_gettime', which is in librt. Linking that library
   # here ensures that a proper rpath is added to the executable so that
diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch
new file mode 100644
index 000000000000..ad0a7a6f66de
--- /dev/null
+++ b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch
@@ -0,0 +1,12 @@
+diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in
+--- nbd-3.14-orig/Makefile.in	2016-09-19 15:37:30.904176475 +0200
++++ nbd-3.14-new/Makefile.in	2016-09-19 15:39:43.813543062 +0200
+@@ -403,7 +403,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = . man doc tests systemd gznbd
++SUBDIRS = . man doc tests gznbd
+ sbin_PROGRAMS = @NBD_CLIENT_NAME@
+ noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
+ libcliserv_la_SOURCES = cliserv.h cliserv.c
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index e666cf7f605d..3f4f1244e1b7 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig }:
+{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig
+, pkcs11Support ? false, pkcs11helper ? null,
+}:
+
+assert pkcs11Support -> (pkcs11helper != null);
 
 with stdenv.lib;
 
@@ -13,13 +17,14 @@ stdenv.mkDerivation rec {
   patches = optional stdenv.isLinux ./systemd-notify.patch;
 
   buildInputs = [ lzo openssl pkgconfig ]
-                  ++ optionals stdenv.isLinux [ pam systemd iproute ];
-
-  configureFlags = optionalString stdenv.isLinux ''
-    --enable-systemd
-    --enable-iproute2
-    IPROUTE=${iproute}/sbin/ip
-  '';
+                  ++ optionals stdenv.isLinux [ pam systemd iproute ]
+                  ++ optional pkcs11Support pkcs11helper;
+
+  configureFlags = optionals stdenv.isLinux [
+    "--enable-systemd"
+    "--enable-iproute2"
+    "IPROUTE=${iproute}/sbin/ip" ]
+    ++ optional pkcs11Support "--enable-pkcs11";
 
   postInstall = ''
     mkdir -p $out/share/doc/openvpn/examples
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index f4a7273d8cc7..dee408e1d65a 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
   };
 
+  outputs = [ "out" "dev" "man" ];
+
   buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
@@ -15,6 +17,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
 
+  configureFlags = [
+    "--with-external-db"
+    "--with-lua"
+    "--enable-python"
+    "--localstatedir=/var"
+    "--sharedstatedir=/com"
+  ];
+
   postPatch = ''
     # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
     substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable}
@@ -22,7 +32,18 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
   '';
 
-  configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com";
+  preFixup = ''
+    # Don't keep a reference to RPM headers or manpages
+    for f in $out/lib/rpm/platform/*/macros; do
+      substituteInPlace $f --replace "$dev" "/rpm-dev-path-was-here"
+      substituteInPlace $f --replace "$man" "/rpm-man-path-was-here"
+    done
+
+    # Avoid macros like '%__ld' pointing to absolute paths
+    for tool in ld nm objcopy objdump strip; do
+      sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/"
+    done
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.rpm.org/;
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 79f6a6c1c288..01d5dff4d751 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which
+, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which, procps
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
@@ -64,10 +64,11 @@ stdenv.mkDerivation rec {
 
   wrapperPath = with stdenv.lib; makeBinPath ([
     coreutils
-    gnused
     getopt
     git
     gnupg
+    gnused
+    procps
     pwgen
     tree
     which
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index 75ad15b7311d..dc5b75b0f4a2 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -1,27 +1,33 @@
-{ stdenv, fetchurl
-, withGUI ? false, gtk2 ? null, pkgconfig? null, sqlite ? null  # compile GUI
- }:
-stdenv.mkDerivation rec {
+{ stdenv, lib, fetchurl, fetchpatch
+, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI
+}:
 
-  name = "lshw-${version}";
-  version = "02.17b";
+let numVersion = "02.18"; # :(
+in
+stdenv.mkDerivation rec {
+  name = "lshw-${numVersion}b";
+  version = "B.${numVersion}";
 
   src = fetchurl {
-    url = http://ezix.org/software/files/lshw-B.02.17.tar.gz;
-    sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b";
+    url = "http://ezix.org/software/files/lshw-${version}.tar.gz";
+    sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
   };
 
-  buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk2 pkgconfig sqlite ];
+  patches = [ (fetchpatch {
+    # fix crash in scan_dmi_sysfs() when run as non-root
+    url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
+    sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
+  })];
+
+  buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  buildFlags = [ "all" ] ++ lib.optional withGUI "gui";
 
-  postBuild = if withGUI then "make gui" else "";
+  installTargets = [ "install" ] ++ lib.optional withGUI "install-gui";
 
-  installPhase = ''
-    make DESTDIR="$out" install
-    ${if withGUI then "make DESTDIR=$out install-gui" else ""}
-    mv $out/usr/* $out
-    rmdir $out/usr
-    mv $out/sbin $out/bin
-  '';
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = http://ezix.org/project/wiki/HardwareLiSter;
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
new file mode 100644
index 000000000000..59df5ee90a4e
--- /dev/null
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "SystemdJournal2Gelf-${version}";
+  version = "20160414";
+
+  goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf";
+
+  src = fetchFromGitHub {
+    rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f";
+    owner = "parse-nl";
+    repo = "SystemdJournal2Gelf";
+    sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Export entries from systemd's journal and send them to a graylog server using gelf";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fadenb fpletz globin ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/pkgs/tools/system/systemd-journal2gelf/deps.nix
new file mode 100644
index 000000000000..2e0988e81054
--- /dev/null
+++ b/pkgs/tools/system/systemd-journal2gelf/deps.nix
@@ -0,0 +1,11 @@
+[
+{
+  goPackagePath = "github.com/DECK36/go-gelf";
+  fetch = {
+    type = "git";
+    url = "https://github.com/DECK36/go-gelf";
+    rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f";
+    sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay";
+  };
+}
+]
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ee3aaa70b24e..0c93a212f802 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -26,7 +26,6 @@ doNotDisplayTwice rec {
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bridge_utils = bridge-utils;  # added 2015-02-20
   btrfsProgs = btrfs-progs; # added 2016-01-03
-  buildbotSlave = buildbot-slave;  # added 2014-12-09
   bundler_HEAD = bundler; # added 2015-11-15
   checkbashism = checkbashisms; # added 2016-08-16
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
@@ -100,6 +99,7 @@ doNotDisplayTwice rec {
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
+  sshfsFuse = sshfs-fuse; # added 2016-09
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_qt5 = qt5.telepathy;  # added 2015-12-19
   tftp_hpa = tftp-hpa; # added 2015-04-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3984f2f0cd37..da6877a7652e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -604,9 +604,7 @@ in
 
   bitbucket-cli = pythonPackages.bitbucket-cli;
 
-  blink = callPackage ../applications/networking/instant-messengers/blink {
-    gnutls = gnutls33;
-  };
+  blink = callPackage ../applications/networking/instant-messengers/blink { };
 
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
@@ -734,6 +732,8 @@ in
 
   consul-template = callPackage ../tools/system/consul-template { };
 
+  corebird = callPackage ../applications/networking/corebird { };
+
   corosync = callPackage ../servers/corosync { };
 
   cherrytree = callPackage ../applications/misc/cherrytree { };
@@ -847,8 +847,12 @@ in
 
   glide = callPackage ../development/tools/glide { };
 
+  glock = callPackage ../development/tools/glock { };
+
   gmic = callPackage ../tools/graphics/gmic { };
 
+  goa = callPackage ../development/tools/goa { };
+
   gringo = callPackage ../tools/misc/gringo { };
 
   gti = callPackage ../tools/misc/gti { };
@@ -2443,6 +2447,8 @@ in
 
   libircclient = callPackage ../development/libraries/libircclient { };
 
+  libite = callPackage ../development/libraries/libite { };
+
   liboauth = callPackage ../development/libraries/liboauth { };
 
   libsidplayfp = callPackage ../development/libraries/libsidplayfp { };
@@ -2565,6 +2571,8 @@ in
 
   man-db = callPackage ../tools/misc/man-db { };
 
+  mandoc = callPackage ../tools/misc/mandoc { };
+
   mawk = callPackage ../tools/text/mawk { };
 
   mbox = callPackage ../tools/security/mbox { };
@@ -3612,7 +3620,7 @@ in
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 
-  sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { };
+  sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
 
   sshuttle = callPackage ../tools/security/sshuttle { };
 
@@ -5567,6 +5575,7 @@ in
       };
     });
 
+  rainicorn = callPackage ../development/tools/rust/rainicorn { };
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
   rustracer = callPackage ../development/tools/rust/racer { };
   rustracerd = callPackage ../development/tools/rust/racerd { };
@@ -5809,7 +5818,7 @@ in
 
   kanif = callPackage ../applications/networking/cluster/kanif { };
 
-  lxappearance = callPackage ../applications/misc/lxappearance {};
+  lxappearance = callPackage ../desktops/lxde/core/lxappearance {};
 
   lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
 
@@ -6229,11 +6238,7 @@ in
     wxGTK = wxGTK30;
   };
 
-  buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave {
-    inherit (pythonPackages) twisted;
-  };
-
-  buildbot = callPackage ../development/tools/build-managers/buildbot/9.nix { };
+  buildbot = callPackage ../development/tools/build-managers/buildbot { };
   buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { };
   buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { };
   buildbot-ui = self.buildbot.override {
@@ -6317,7 +6322,7 @@ in
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
+  cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
     wantPS = stdenv.isDarwin;
     inherit (darwin) ps;
   };
@@ -6355,6 +6360,8 @@ in
   libcxx = llvmPackages.libcxx;
   libcxxabi = llvmPackages.libcxxabi;
 
+  libstdcxx5 = callPackage ../development/libraries/libstdc++5 { };
+
   libsigrok = callPackage ../development/tools/libsigrok { };
   # old version:
   libsigrok-0-3-0 = libsigrok.override {
@@ -8281,6 +8288,10 @@ in
   libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
   libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
 
+  libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
+    mysql = mysql57;
+  };
+
   libnatspec = callPackage ../development/libraries/libnatspec (
     stdenv.lib.optionalAttrs stdenv.isDarwin {
       inherit (darwin) libiconv;
@@ -9043,10 +9054,7 @@ in
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
   openjpeg = openjpeg_2_1;
 
-  openscenegraph = callPackage ../development/libraries/openscenegraph {
-    giflib = giflib_4_1;
-    ffmpeg = ffmpeg_0;
-  };
+  openscenegraph = callPackage ../development/libraries/openscenegraph { };
 
   openslp = callPackage ../development/libraries/openslp {};
 
@@ -9772,6 +9780,8 @@ in
 
   vrpn = callPackage ../development/libraries/vrpn { };
 
+  vsqlite = callPackage ../development/libraries/vsqlite { };
+
   vtk = callPackage ../development/libraries/vtk { };
 
   vtkWithQt4 = vtk.override { qtLib = qt4; };
@@ -9953,6 +9963,8 @@ in
 
   czmq = callPackage ../development/libraries/czmq { };
 
+  czmqpp = callPackage ../development/libraries/czmqpp { };
+
   zimlib = callPackage ../development/libraries/zimlib { };
 
   zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
@@ -10548,8 +10560,6 @@ in
 
   rpcbind = callPackage ../servers/rpcbind { };
 
-  #monetdb = callPackage ../servers/sql/monetdb { };
-
   mariadb = callPackage ../servers/sql/mariadb {
     inherit (darwin) cctools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
@@ -10573,6 +10583,12 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
+  mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+    boost = boost159;
+  };
+
   mysql = mariadb;
   libmysql = mysql.client; # `libmysql` is a slight misnomer ATM
 
@@ -10692,6 +10708,10 @@ in
       HTTPDate MailDKIM LWP IOSocketSSL;
   };
 
+  deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
+  deadpixi-sam = deadpixi-sam-unstable;
+  sam = deadpixi-sam;
+
   samba3 = callPackage ../servers/samba/3.x.nix { };
 
   samba4 = callPackage ../servers/samba/4.x.nix {
@@ -10762,6 +10782,8 @@ in
 
   slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { });
 
+  systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
+
   inherit (callPackages ../servers/http/tomcat { })
     tomcat6
     tomcat7
@@ -10903,6 +10925,10 @@ in
 
   cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
 
+  cockroachdb = callPackage ../servers/sql/cockroachdb {
+    gcc = gcc6; # needs gcc 6.0 and above
+  };
+
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_1; # conky can use 5.2, but toluapp can not
   } // config.conky or {});
@@ -10931,7 +10957,10 @@ in
       xctoolchain = xcode.toolchain;
     };
 
-    cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native;
+    cctools = (callPackage ../os-specific/darwin/cctools/port.nix {
+      inherit libobjc;
+      stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
+    }).native;
 
     cf-private = callPackage ../os-specific/darwin/cf-private {
       inherit (apple-source-releases) CF;
@@ -11214,15 +11243,6 @@ in
       ];
   };
 
-  linux_3_14 = callPackage ../os-specific/linux/kernel/linux-3.14.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -11443,7 +11463,6 @@ in
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
-  linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4);
@@ -11666,6 +11685,8 @@ in
 
   policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
 
+  powerdns = callPackage ../servers/dns/powerdns { };
+
   powertop = callPackage ../os-specific/linux/powertop { };
 
   prayer = callPackage ../servers/prayer { };
@@ -12678,7 +12699,7 @@ in
   cinepaint = callPackage ../applications/graphics/cinepaint {
     fltk = fltk13;
     libpng = libpng12;
-    cmake = cmake-2_8;
+    cmake = cmake_2_8;
   };
 
   codeblocks = callPackage ../applications/editors/codeblocks { };
@@ -12798,6 +12819,8 @@ in
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
 
+  docker-machine = callPackage ../applications/networking/cluster/docker-machine { };
+
   doodle = callPackage ../applications/search/doodle { };
 
   drumgizmo = callPackage ../applications/audio/drumgizmo { };
@@ -12845,12 +12868,12 @@ in
 
   elvis = callPackage ../applications/editors/elvis { };
 
-  emacs = emacs24;
-  emacsPackages = emacs24Packages;
-  emacsPackagesNg = emacs24PackagesNg;
-  emacsMelpa = emacs24PackagesNg; # for backward compatibility
+  emacs = emacs25;
+  emacsPackages = emacs25Packages;
+  emacsPackagesNg = emacs25PackagesNg;
+  emacsMelpa = emacs25PackagesNg; # for backward compatibility
 
-  emacs24 = callPackage ../applications/editors/emacs-24 {
+  emacs25 = callPackage ../applications/editors/emacs {
     # use override to enable additional features
     libXaw = xorg.libXaw;
     Xaw3d = null;
@@ -12862,31 +12885,19 @@ in
     inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
   };
 
-  emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
+  emacs25-nox = lowPrio (appendToName "nox" (emacs25.override {
     withX = false;
     withGTK2 = false;
     withGTK3 = false;
   }));
 
-  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
+  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix {
     inherit (darwin.apple_sdk.frameworks)
       AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
       ImageCaptureCore GSS ImageIO;
   });
   emacs24Macport = self.emacs24Macport_24_5;
 
-  emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 {
-    # use override to enable additional features
-    libXaw = xorg.libXaw;
-    Xaw3d = null;
-    gconf = null;
-    alsaLib = null;
-    imagemagick = null;
-    acl = null;
-    gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
-  });
-
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 
@@ -13040,7 +13051,7 @@ in
     cask = callPackage ../applications/editors/emacs-modes/cask { };
   };
 
-  emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages;
+  emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages;
 
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
@@ -13065,9 +13076,9 @@ in
     };
   };
 
-  emacs24PackagesNg = emacsPackagesNgGen emacs24;
+  emacs25PackagesNg = emacsPackagesNgGen emacs25;
 
-  emacs24WithPackages = emacs24PackagesNg.emacsWithPackages;
+  emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
   emacsWithPackages = emacsPackagesNg.emacsWithPackages;
 
   # inherit (gnome3) empathy;
@@ -13318,7 +13329,7 @@ in
 
   freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix {
     ffmpeg = ffmpeg_2;
-    cmake = cmake-2_8;
+    cmake = cmake_2_8;
   };
 
   freicoin = callPackage ../applications/misc/freicoin {
@@ -13500,9 +13511,9 @@ in
 
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
 
-  google-chrome-beta = google-chrome.override { channel = "beta"; };
+  google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
 
-  google-chrome-dev = google-chrome.override { channel = "dev"; };
+  google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
@@ -14287,7 +14298,7 @@ in
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     # No need to build Emacs - notmuch.el works just fine without
-    # byte-compilation. Use emacs24Packages.notmuch if you want to
+    # byte-compilation. Use emacsPackages.notmuch if you want to
     # byte-compiled files
     emacs = null;
     sphinx = pythonPackages.sphinx;
@@ -14630,7 +14641,7 @@ in
 
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
-    cmake = cmake-2_8; # problems after 3.4 -> 3.6.0
+    cmake = cmake_2_8; # problems after 3.4 -> 3.6.0
   };
 
   rcs = callPackage ../applications/version-management/rcs { };
@@ -15801,6 +15812,8 @@ in
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
+  digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {};
+
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
   duckmarines = callPackage ../games/duckmarines { love = love_0_9; };
@@ -16102,7 +16115,7 @@ in
 
   spring = callPackage ../games/spring {
     boost = boost155;
-    cmake = cmake-2_8;
+    cmake = cmake_2_8;
   };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };
@@ -16200,7 +16213,9 @@ in
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
-  ut2004demo = callPackage_i686 ../games/ut2004demo { };
+  ut2004Packages = callPackage ../games/ut2004 { };
+
+  ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ];
 
   vapor = callPackage ../games/vapor { love = love_0_8; };
 
@@ -16270,7 +16285,7 @@ in
 
   zandronum = callPackage ../games/zandronum {
     fmod = fmod42416;
-    cmake = cmake-2_8;
+    cmake = cmake_2_8;
   };
 
   zandronum-server = zandronum.override {
@@ -17088,7 +17103,7 @@ in
   stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { };
 
   tulip = callPackage ../applications/science/misc/tulip {
-    cmake = cmake-2_8;
+    cmake = cmake_2_8;
   };
 
   vite = callPackage ../applications/science/misc/vite { };
@@ -17376,10 +17391,12 @@ in
 
   mnemonicode = callPackage ../misc/mnemonicode { };
 
-  mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench {
-    lua = lua5_1;
-    libctemplate = libctemplate_2_2;
-  };
+  mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in {
+    automake = automake113x;
+    gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
+    mysql = mysql;
+    pcre = pcre-cpp;
+  });
 
   redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e5a8b770fdef..e56cce4b81e1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2733,15 +2733,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.038";
+    name = "CryptX-0.040";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "f98d4ee3bfd0a985077912501b32777c551f0782aa050b4dfbcb3d654e303eb8";
+      sha256 = "0e1e44811e951fa04971912a8b03cf41de540d8cf8d464c5655aaf3bf976db50";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {
       description = "Crypto toolkit";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -3578,11 +3579,11 @@ let self = _self // overrides; _self = with self; {
 
   DBIxClass = buildPerlPackage rec {
     name = "DBIx-Class-0.082840";
-    # UPGRADE Note: Please remove workaround in DBDSQLite above
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
       sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef";
     };
+    patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release
     buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ];
     propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ];
     meta = {
@@ -12841,10 +12842,10 @@ let self = _self // overrides; _self = with self; {
   TestSimple = null;
 
   TestSimple13 = buildPerlPackage rec {
-    name = "Test-Simple-1.302037";
+    name = "Test-Simple-1.302056";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
-      sha256 = "fbeba16906ef534e2334acad2020941b6705ab98543536900e588e93409f23b8";
+      sha256 = "7ba4d821545051f3bc2a6a3308cc43a45f242eec0121a6c85394601785f2e2e8";
     };
     meta = {
       description = "Basic utilities for writing tests";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3bbf8a0e0e04..caa38a04e832 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1812,11 +1812,11 @@ in modules // {
   });
 
   beautifulsoup4 = buildPythonPackage (rec {
-    name = "beautifulsoup4-4.4.1";
+    name = "beautifulsoup4-4.5.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz";
-      sha256 = "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47";
+      sha256 = "1qgmhw65ncsgccjhslgkkszif47q6gvxwqv4mim17agxd81p951w";
     };
 
     buildInputs = [ self.nose ];
@@ -3198,18 +3198,26 @@ in modules // {
       sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704";
     };
 
-    propagatedBuildInputs = with self; [
-      futures
-      nose
-      six
-      sure
-      pytz
-      pyyaml
-    ];
+    buildInputs = with self; [ pkgs.libev cython ] ++ optionals doCheck [ scales eventlet twisted mock gevent nose pytz pyyaml sure ];
+
+    propagatedBuildInputs = with self; [ futures six ];
+
+    postPatch = ''
+      sed -i "s/<=1.0.1//" setup.py
+    '';
+
+    checkPhase = ''
+      ${python.interpreter} setup.py gevent_nosetests
+      ${python.interpreter} setup.py eventlet_nosetests
+    '';
+
+    # Could not get tests running
+    doCheck = false;
 
     meta = {
       homepage = http://datastax.github.io/python-driver/;
       description = "A Python client driver for Apache Cassandra";
+      license = licenses.asl20;
     };
   };
 
@@ -4393,15 +4401,23 @@ in modules // {
 
 
   detox = self.buildPythonPackage rec {
-    name = "detox-0.9.3";
+    name = "detox-0.10.0";
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ tox py eventlet ];
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/d/detox/detox-0.9.3.tar.gz";
-      sha256 = "39d48b6758c43ba579f694507d54da96931195eb1b72ad79b46f50af9520b2f3";
+      url = "mirror://pypi/d/detox/${name}.tar.gz";
+      sha256 = "33b704c2a5657366850072fb2aa839df14dd2e692c0c1c2642c3ac30d5c0baec";
     };
 
+    checkPhase = ''
+      py.test
+    '';
+
+    # eventlet timeout, and broken invokation 3.5
+    doCheck = false;
+
     meta = {
       description = "What is detox?";
       homepage = http://bitbucket.org/hpk42/detox;
@@ -6720,7 +6736,7 @@ in modules // {
 
     propagatedBuildInputs = with self; [ pkgs.gnutls ];
     patchPhase = ''
-      substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls33.out}/lib"
+      substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib"
     '';
   };
 
@@ -10778,27 +10794,20 @@ in modules // {
   };
 
   falcon = buildPythonPackage (rec {
-    name = "falcon-0.3.0";
+    name = "falcon-1.0.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/f/falcon/${name}.tar.gz";
-      sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj";
+      sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63";
     };
 
-    propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ];
+    buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools];
+    propagatedBuildInputs = with self; [ six python_mimeparse ];
 
     # The travis build fails since the migration from multiprocessing to threading for hosting the API under test.
     # OSError: [Errno 98] Address already in use
     doCheck = false;
 
-    # This patch is required if the tests are enabled
-    # See https://github.com/falconry/falcon/issues/572
-    #patches = singleton (pkgs.fetchurl {
-    #  name = "falcon-572.patch";
-    #  url = "https://github.com/desiderius/falcon/commit/088bd3f2204eb6368acb3a1bf6c6b54c415225c2.patch";
-    #  sha256 = "19102dlzc4890skmam2v20va2vk5xr56fi4nzibzfvl7vyq68060";
-    #});
-
     meta = {
       description = "An unladen web framework for building APIs and app backends";
       homepage = http://falconframework.org;
@@ -10806,7 +10815,24 @@ in modules // {
       maintainers = with maintainers; [ desiderius ];
     };
   });
+  hug = buildPythonPackage rec {
+    name = "hug-2.1.2";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hug/${name}.tar.gz";
+      sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c";
+    };
+
+    propagatedBuildInputs = with self; [ falcon requests2 ];
 
+    # tests are not shipped in the tarball
+    doCheck = false;
+
+    meta = {
+      description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
+      homepage = https://github.com/timothycrosley/hug;
+      license = licenses.mit;
+    };
+  };
   flup = buildPythonPackage (rec {
     name = "flup-1.0.2";
     disabled = isPy3k;
@@ -11128,22 +11154,30 @@ in modules // {
   };
 
   gevent = buildPythonPackage rec {
-    name = "gevent-1.0.2";
-    disabled = isPy3k || isPyPy;  # see https://github.com/surfly/gevent/issues/248
+    name = "gevent-1.1.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/gevent/${name}.tar.gz";
-      sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s";
+      sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
     };
 
-    patchPhase = ''
+    # Why do we have this patch?
+    postPatch = ''
       substituteInPlace libev/ev.c --replace \
         "ecb_inline void ecb_unreachable (void) ecb_noreturn" \
         "ecb_inline ecb_noreturn void ecb_unreachable (void)"
     '';
 
     buildInputs = with self; [ pkgs.libev ];
-    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
+    propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ];
+
+    checkPhase = ''
+      cd greentest
+      ${python.interpreter} testrunner.py
+    '';
+
+    # Bunch of failures.
+    doCheck = false;
 
     meta = {
       description = "Coroutine-based networking library";
@@ -11411,14 +11445,16 @@ in modules // {
 
   greenlet = buildPythonPackage rec {
     name = "greenlet-${version}";
-    version = "0.4.7";
+    version = "0.4.10";
     disabled = isPyPy;  # builtin for pypy
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/g/greenlet/${name}.zip";
-      sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k";
+      url = "mirror://pypi/g/greenlet/${name}.tar.gz";
+      sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62";
     };
 
+    propagatedBuildInputs = with self; [ six ];
+
     # see https://github.com/python-greenlet/greenlet/issues/85
     preCheck = ''
       rm tests/test_leaks.py
@@ -16333,12 +16369,11 @@ in modules // {
       sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s";
     };
 
-    propagatedBuildInputs = with self; [
-      kazoo six
-    ];
-    buildInputs = with self; [
-
-    ];
+    propagatedBuildInputs = with self; [ kazoo six ];
+    buildInputs = with self; [ testtools ];
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover zake/tests
+    '';
 
     meta = with stdenv.lib; {
       homepage = "https://github.com/yahoo/Zake";
@@ -17041,6 +17076,29 @@ in modules // {
     };
   };
 
+  parsel = buildPythonPackage rec {
+    name = "parsel-${version}";
+    version = "1.0.3";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/parsel/${name}.tar.gz";
+      sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431";
+    };
+
+    buildInputs = with self; [ pytest pytestrunner ];
+    propagatedBuildInputs = with self; [ six w3lib lxml cssselect ];
+
+    checkPhase = ''
+      py.test
+    '';
+
+    meta = {
+      homepage = "https://github.com/scrapy/parsel";
+      description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
+      license = licenses.bsd3;
+    };
+  };
+
   partd = buildPythonPackage rec {
     name = "partd-${version}";
     version = "0.3.3";
@@ -18752,13 +18810,18 @@ in modules // {
 
   pydispatcher = buildPythonPackage (rec {
     version = "2.0.5";
-    disabled = isPy35;
     name = "pydispatcher-${version}";
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz";
       sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m";
     };
 
+    buildInputs = with self; [ pytest ];
+
+    checkPhase = ''
+      py.test
+    '';
+
     meta = {
       homepage = http://pydispatcher.sourceforge.net/;
       description = "Signal-registration and routing infrastructure for use in multiple contexts";
@@ -20279,8 +20342,8 @@ in modules // {
 
     preConfigure = ''
       cd Source
-      python setup.py backport
-      python setup.py configure \
+      ${python.interpreter} setup.py backport
+      ${python.interpreter} setup.py configure \
         --apr-inc-dir=${pkgs.apr.dev}/include \
         --apu-inc-dir=${pkgs.aprutil.dev}/include \
         --apr-lib-dir=${pkgs.apr.out}/lib \
@@ -20293,6 +20356,8 @@ in modules // {
 
     checkPhase = "make -C ../Tests";
 
+    disabled = isPy3k;
+
     installPhase = ''
       dest=$(toPythonPath $out)/pysvn
       mkdir -p $dest
@@ -21325,6 +21390,25 @@ in modules // {
     };
   };
 
+  rootpy = buildPythonPackage rec {
+    version = "0.8.3";
+    name = "rootpy-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz";
+      sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z";
+    };
+
+    disabled = isPy3k;
+
+    propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ];
+
+    meta = {
+      homepage = "http://www.rootpy.org";
+      license = licenses.gpl3;
+      description = "Pythonic interface to the ROOT framework";
+    };
+  };
 
   rope = buildPythonPackage rec {
     version = "0.10.2";
@@ -22696,6 +22780,28 @@ in modules // {
     };
   };
 
+  scales = buildPythonPackage rec {
+    name = "scales-${version}";
+    version = "1.0.9";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/scales/${name}.tar.gz";
+      sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753";
+    };
+
+    buildInputs = with self; optionals doCheck [ nose ];
+    # No tests included
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "Stats for Python processes";
+      homepage = https://www.github.com/Cue/scales;
+      license = licenses.asl20;
+    };
+  };
+
   secp256k1 = buildPythonPackage rec {
     name = "secp256k1-${version}";
     version = "0.12.1";
@@ -22947,10 +23053,10 @@ in modules // {
   sphinx = buildPythonPackage (rec {
     name = "${pname}-${version}";
     pname = "Sphinx";
-    version = "1.3.6";
+    version = "1.4.6";
     src = pkgs.fetchurl {
       url = "mirror://pypi/S/${pname}/${name}.tar.gz";
-      sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb";
+      sha256 = "1lvr39ab5sjp894jshk39xidlxw9vc735882cgcfr4dlm4546hwy";
     };
     LC_ALL = "en_US.UTF-8";
     buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales ];
@@ -24382,10 +24488,10 @@ in modules // {
   twisted = buildPythonPackage rec {
 
     name = "Twisted-${version}";
-    version = "16.4.0";
+    version = "16.4.1";
     src = pkgs.fetchurl {
       url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-      sha256 = "cd8820901900542d21fb1dee2cd4d4d334fff130e3fc30b777f81dd7d7f2836e";
+      sha256 = "1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816";
     };
 
     propagatedBuildInputs = with self; [ zope_interface ];
@@ -25143,14 +25249,19 @@ in modules // {
   };
 
   willie = buildPythonPackage rec {
-    name = "willie-5.2.0";
+    name = "willie-${version}";
+    version = "5.5.1";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/w/willie/willie-5.2.0.tar.gz";
-      sha256 = "2da2e91b65c471b4c8e5e5e11471b25887635258d24aaf76b5354147b3ab577d";
+      url = "mirror://pypi/w/willie/${name}.tar.gz";
+      sha256 = "e03dd26ea694b877a2b3b7b4dcca8e79420e7f346abab34292bff43d992a8cc5";
     };
 
-    propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ];
+    buildInputs = with self; [ pytest modules.sqlite3 ];
+    propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname ];
+    checkPhase = ''
+      py.test test
+    '';
 
     meta = {
       description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python";
@@ -26097,7 +26208,7 @@ in modules // {
     name = "tornado-${version}";
     version = "4.4.1";
 
-    propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname_3_4_0_2 certifi singledispatch ];
+    propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
 
     # We specify the name of the test files to prevent
     # https://github.com/NixOS/nixpkgs/issues/14634
@@ -26207,7 +26318,8 @@ in modules // {
   };
 
 
-  libarchive = buildPythonPackage rec {
+  libarchive = self.python-libarchive; # The latter is the name upstream uses
+  python-libarchive = buildPythonPackage rec {
     version = "3.1.2-1";
     name = "libarchive-${version}";
     disabled = isPy3k;
@@ -26217,23 +26329,30 @@ in modules // {
       sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x";
     };
 
-    propagatedBuildInputs = with self; [ pkgs.libarchive ];
+    propagatedBuildInputs = with self; [ pkgs.libarchive.lib ];
+    meta.broken = true;
   };
 
   libarchive-c = buildPythonPackage rec {
-    name = "libarchive-c-2.1";
+    name = "libarchive-c-${version}";
+    version = "2.5";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/libarchive-c/${name}.tar.gz";
-      sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n";
+      sha256 = "98660daa2501d2da51ab6f39893dc24e88916e72b2d80c205641faa5bce66859";
     };
 
-    patchPhase = ''
+    LC_ALL="en_US.UTF-8";
+
+    postPatch = ''
       substituteInPlace libarchive/ffi.py --replace \
-        "find_library('archive')" "'${pkgs.libarchive}/lib/libarchive.so'"
+        "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'"
+    '';
+    checkPhase = ''
+      py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip'
     '';
 
-    buildInputs = [ pkgs.libarchive ];
+    buildInputs = with self; [ pytest pkgs.glibcLocales ];
   };
 
   pybrowserid = buildPythonPackage rec {
@@ -28410,11 +28529,11 @@ in modules // {
 
   pafy = buildPythonPackage rec {
     name = "pafy-${version}";
-    version = "0.5.0";
+    version = "0.5.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pafy/${name}.tar.gz";
-      sha256 = "1q699dcnq34nfgm0bg8mp5krhzk9cyirqdcadhs9al4fa5410igw";
+      sha256 = "1ckvrypyvb7jbqlgwdz0y337ajagjv7dgxyns326nqwypn1wpq0i";
     };
 
     # No tests included in archive
@@ -29109,16 +29228,23 @@ in modules // {
 
   scrapy = buildPythonPackage rec {
     name = "Scrapy-${version}";
-    version = "1.0.5";
+    version = "1.1.2";
 
-    disabled = isPy3k;
+    buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ];
+    propagatedBuildInputs = with self; [
+      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
+    ];
 
-    buildInputs = with self ; [ pytest ];
-    propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ];
+    LC_ALL="en_US.UTF-8";
+
+    checkPhase = ''
+      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
+      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+    '';
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
-      sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96";
+      sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4";
     };
 
     meta = {
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 430c03f51909..ad7d07f44cce 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -39,7 +39,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   dhcp = linux;
   diffutils = all;
   e2fsprogs = linux;
-  emacs24 = gtkSupported;
+  emacs25 = gtkSupported;
   enscript = all;
   file = all;
   findutils = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 160c19b1d859..d3fb4e646c3b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -90,7 +90,7 @@ let
 
       # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
-      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+      #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg;
       #rPackages = packagePlatforms pkgs.rPackages;
       ocamlPackages = { };
       perlPackages = { };
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 815ad81dc1e7..f564c67e0d2c 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-08-23";
-  rev = "e98ce679ed90bb5b8a64ad9f5bd82f87fd6b641f";
-  sha256 = "0dpl071ic3ddknsy98dxm99mznlblhmgjqi9ha6rlbldbjp3gf8j";
+  version = "2016-09-20";
+  rev = "cf9c8ccb2c7d753491fc26c64b717bb895d0b4ef";
+  sha256 = "02fq0f2zc9qhxs7h110g9ndrvmys26kp9hi93gq9vqhcizq2ici3";
 
   src = fetchFromGitHub {
       inherit rev;
author	Eelco Dolstra <eelco.dolstra@logicblox.com>	2016-09-20 17:46:09 +0200
committer	Eelco Dolstra <eelco.dolstra@logicblox.com>	2016-09-20 17:46:09 +0200
commit	7a4209c3561213cfb182ce93707a14f9715238eb (patch)
tree	e78812ee0449d9e4a32d190a701e2e90849f0d42 /pkgs
parent	5f8a330d40008ec6457f96a07cdebe95deb1bdaf (diff)
parent	ea1afcd9f468f9f8813dba93d167bf2e558c797a (diff)
download	nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.gz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.bz2 nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.lz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.xz nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.tar.zst nixlib-7a4209c3561213cfb182ce93707a14f9715238eb.zip