From 6c9cc6339fed835c3817616f37f476414b08ad8e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Wed, 16 Nov 2016 16:32:13 -0700
Subject: [PATCH 001/295] gromit-mpx: init at 1.2

---
 pkgs/tools/graphics/gromit-mpx/default.nix | 37 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  6 ++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/graphics/gromit-mpx/default.nix

diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
new file mode 100644
index 00000000000..376d1bc134d
--- /dev/null
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig
+, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
+, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib
+}:
+
+stdenv.mkDerivation rec {
+  name = "gromit-mpx-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "gromit-mpx";
+    rev = "${version}";
+    sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs";
+  };
+
+  buildInputs = [
+    autoconf automake autoreconfHook pkgconfig
+    gtk glib pcre libappindicator libpthreadstubs
+    libXdmcp libxkbcommon epoxy at_spi2_core
+    dbus libdbusmenu-glib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop annotation tool";
+
+    longDescription = ''
+      Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
+      to make annotations on the screen.
+    '';
+
+    homepage = https://github.com/bk138/gromit-mpx;
+    maintainers = with maintainers; [ pjones ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35eee630c28..6032d0c7879 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1963,6 +1963,12 @@ in
     netpbm = null;
   };
 
+  gromit-mpx = callPackage ../tools/graphics/gromit-mpx {
+    gtk = gtk3;
+    libappindicator = libappindicator-gtk3;
+    inherit (xorg) libXdmcp;
+  };
+
   groonga = callPackage ../servers/search/groonga { };
 
   grub = callPackage_i686 ../tools/misc/grub {

From 6cfb3b636418526d1c49d14316a127133cf09c9d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 17 Nov 2016 17:06:17 +0100
Subject: [PATCH 002/295] nixos/tests: Use a patched QEMU for testing

The reason to patch QEMU is that with latest Nix, tests like "printing"
or "misc" fail because they expect the store paths to be owned by uid 0
and gid 0.

Starting with NixOS/nix@5e51ffb1c265e16486fcdd888ce4a04db9e5552b, Nix
builds inside of a new user namespace. Unfortunately this also means
that bind-mounted store paths that are part of the derivation's inputs
are no longer owned by uid 0 and gid 0 but by uid 65534 and gid 65534.

This in turn causes things like sudo or cups to fail with errors about
insecure file permissions.

So in order to avoid that, let's make sure the VM always gets files
owned by uid 0 and gid 0 and does a no-op when doing a chmod on a store
path.

In addition, this adds a virtualisation.qemu.program option so that we
can make sure that we only use the patched version if we're *really*
running NixOS VM tests (that is, whenever we have imported
test-instrumentation.nix).

Tested against the "misc" and "printing" tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../modules/testing/test-instrumentation.nix  |  3 ++
 nixos/modules/virtualisation/qemu-vm.nix      | 10 +++-
 .../virtualization/qemu/default.nix           |  3 +-
 .../qemu/force-uid0-on-9p.patch               | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 5 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index e216351b434..373bf766524 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -110,6 +110,9 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     networking.usePredictableInterfaceNames = false;
 
+    # Make sure we use a patched QEMU that ignores file ownership.
+    virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm";
+
     # Make it easy to log in as root when running the test interactively.
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 777ee31e4dc..263bbf78583 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -70,7 +70,7 @@ let
       '')}
 
       # Start QEMU.
-      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
+      exec ${cfg.qemu.program} \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
@@ -299,6 +299,14 @@ in
       };
 
     virtualisation.qemu = {
+      program = mkOption {
+        type = types.path;
+        default = "${pkgs.qemu_kvm}/bin/qemu-kvm";
+        defaultText = "\${pkgs.qemu_kvm}/bin/qemu-kvm";
+        example = literalExample "\${pkgs.qemu_test}/bin/qemu-kvm";
+        description = "The QEMU variant used to start the VM.";
+      };
+
       options =
         mkOption {
           type = types.listOf types.unspecified;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f81781987cc..513eedc3438 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -11,6 +11,7 @@
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
 , x86Only ? false
+, nixosTestRunner ? false
 }:
 
 with stdenv.lib;
@@ -118,7 +119,7 @@ stdenv.mkDerivation rec {
 
     # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
     ./CVE-2016-9102.patch
-  ];
+  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];
 
   configureFlags =
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
new file mode 100644
index 00000000000..90269961fdf
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -0,0 +1,48 @@
+diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
+index 845675e..43fa036 100644
+--- a/hw/9pfs/9p-local.c
++++ b/hw/9pfs/9p-local.c
+@@ -128,6 +128,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
+     if (err) {
+         goto err_out;
+     }
++    stbuf->st_uid = 0;
++    stbuf->st_gid = 0;
+     if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+         /* Actual credentials are part of extended attrs */
+         uid_t tmp_uid;
+@@ -462,6 +464,16 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
+     return ret;
+ }
+ 
++static int maybe_chmod(const char *path, mode_t mode)
++{
++    static char *store_path = NULL;
++    if (store_path == NULL)
++        store_path = getenv("NIX_STORE");
++    if (strncmp(path, store_path, strlen(store_path)) != 0)
++        return chmod(path, mode);
++    return 0;
++}
++
+ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+ {
+     char *buffer;
+@@ -477,7 +489,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+     } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
+                (fs_ctx->export_flags & V9FS_SM_NONE)) {
+         buffer = rpath(fs_ctx, path);
+-        ret = chmod(buffer, credp->fc_mode);
++        ret = maybe_chmod(buffer, credp->fc_mode);
+         g_free(buffer);
+     }
+     return ret;
+@@ -621,6 +633,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
+     if (err) {
+         return err;
+     }
++    stbuf->st_uid = 0;
++    stbuf->st_gid = 0;
+     if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+         /* Actual credentials are part of extended attrs */
+         uid_t tmp_uid;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33dd7572e4c..6b98d78e455 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11358,6 +11358,7 @@ in
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
   qemu_kvm = lowPrio (qemu.override { x86Only = true; });
+  qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
 

From f4c96de8f9a871ae6a70956d6efb3bd6fe18354b Mon Sep 17 00:00:00 2001
From: Tikhon Jelvis <tikhon.jelvis@target.com>
Date: Fri, 18 Nov 2016 11:03:44 -0800
Subject: [PATCH 003/295] Fixed the emacs24 macport package by adding automake
 and autoconf build tools.

---
 pkgs/applications/editors/emacs/macport-24.5.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix
index 885538dc883..4a07bd2a0c8 100644
--- a/pkgs/applications/editors/emacs/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs/macport-24.5.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext
 , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
+, autoconf, automake
 , ImageCaptureCore, GSS, ImageIO # These may be optional
 }:
 
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ];
+  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ];
 
   propagatedBuildInputs = [
     AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit

From 25cfafdf5bf7fe2fdae3771d3d817df114987384 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 25 Nov 2016 00:00:49 -0600
Subject: [PATCH 004/295] emacs-macport: fix "Carbon.h" present but cannot be
 compiled

Previously, emacs-macport was giving the error:

- AppKit/AppKit.h: present but cannot be compiled
- Carbon/Carbon.h: present but cannot be compiled

This add "MAC_OS_X_VERSION_MIN_REQUIRED=1090" to CFLAGS to allow them
to compile with the new 10.10 headers.

Fixes #20682.
---
 pkgs/applications/editors/emacs/macport-24.5.nix | 2 +-
 pkgs/applications/editors/emacs/macport-25.1.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix
index 885538dc883..8a33155d62b 100644
--- a/pkgs/applications/editors/emacs/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs/macport-24.5.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     "--enable-mac-app=$$out/Applications"
   ];
 
-  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
+  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
   LDFLAGS = "-O3 -L${ncurses.out}/lib";
 
   postInstall = ''
diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix
index 81e77c725d9..0f947a1f46a 100644
--- a/pkgs/applications/editors/emacs/macport-25.1.nix
+++ b/pkgs/applications/editors/emacs/macport-25.1.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     "--enable-mac-app=$$out/Applications"
   ];
 
-  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
+  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
   LDFLAGS = "-O3 -L${ncurses.out}/lib";
 
   postInstall = ''

From 558551399df9760d3183c919d0295d177a533a78 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 25 Nov 2016 00:29:55 -0600
Subject: [PATCH 005/295] emacs-macport: 6.0 -> 6.1

---
 pkgs/applications/editors/emacs/macport-25.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix
index 0f947a1f46a..84d1950b865 100644
--- a/pkgs/applications/editors/emacs/macport-25.1.nix
+++ b/pkgs/applications/editors/emacs/macport-25.1.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-25.1";
-  name = "${emacsName}-mac-6.0";
+  name = "${emacsName}-mac-6.1";
 
   builder = ./builder.sh;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34";
+    sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
   };
 
   enableParallelBuilding = true;

From dcc2bfddfe3dbac5eeebf38b6202c5182700bcff Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sat, 26 Nov 2016 21:27:44 +0100
Subject: [PATCH 006/295] autorandr: 59f6aec0b -> 53d29f9

---
 pkgs/tools/misc/autorandr/default.nix | 57 ++++++++++++---------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 1fab8a493bb..da9a599714c 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -1,48 +1,41 @@
 { fetchgit
 , stdenv
-, enableXRandr ? true, xrandr ? null
-, enableDisper ? true, disper ? null
-, python
-, xdpyinfo }:
-
-assert enableXRandr -> xrandr != null;
-assert enableDisper -> disper != null;
+, python3Packages
+, fetchFromGitHub }:
 
 let
-  # Revision and date taken from the legacy tree, which still
-  # supports disper:
-  # https://github.com/phillipberndt/autorandr/tree/legacy
-  rev = "59f6aec0bb72e26751ce285d079e085b7178e45d";
-  date = "20150127";
+  python = python3Packages.python;
+  wrapPython = python3Packages.wrapPython;
+  date = "2016-11-23";
 in
   stdenv.mkDerivation {
-    name = "autorandr-${date}";
+    name = "autorandr-unstable-${date}";
 
-    src = fetchgit {
-      inherit rev;
-      url = "https://github.com/phillipberndt/autorandr.git";
-      sha256 = "0mnggsp42477kbzwwn65gi8y0rydk10my9iahikvs6n43lphfa1f";
-    };
+    buildInputs = [ python wrapPython ];
 
-    patchPhase = ''
-      substituteInPlace "autorandr" \
-        --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \
-        --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \
-        --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" \
-        --replace "which xxd" "false" \
-        --replace "python" "${python}/bin/python"
-    '';
+    phases = [ "unpackPhase" "installPhase" ];
 
     installPhase = ''
-      mkdir -p "$out/etc/bash_completion.d"
-      cp -v bash_completion/autorandr "$out/etc/bash_completion.d"
-      mkdir -p "$out/bin"
-      cp -v autorandr auto-disper $out/bin
+      # install bash completions
+      mkdir -p $out/bin $out/libexec $out/etc/bash_completion.d
+      cp -v contrib/bash_completion/autorandr $out/etc/bash_completion.d
+
+      # install autorandr bin
+      cp autorandr.py $out/bin/autorandr
+      wrapPythonProgramsIn $out/bin/autorandr $out
     '';
 
+    src = fetchFromGitHub {
+      owner = "phillipberndt";
+      repo = "autorandr";
+      rev = "53d29f99275aebf14240ea95f2d7022b305738d5";
+      sha256 = "0pza4wfkzv7mmg2m4pf3n8wk0p7cy6bfqknn8ywz51r8ja16cqfj";
+    };
+
     meta = {
-      description = "Automatic display configuration selector based on connected devices";
-      homepage = https://github.com/wertarbyte/autorandr;
+      homepage = "http://github.com/phillipberndt/autorandr/";
+      description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
+      license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ stdenv.lib.maintainers.coroa ];
       platforms = stdenv.lib.platforms.unix;
     };

From d78b890178ce5c497c396ce181c1a055b2fda515 Mon Sep 17 00:00:00 2001
From: Dejan Lukan <dejan@proteansec.com>
Date: Fri, 2 Dec 2016 11:47:35 +0100
Subject: [PATCH 007/295] mail-notification: init at 5.4

---
 lib/maintainers.nix                           |    1 +
 .../desktop/mail-notification/default.nix     |   87 +
 ...ation-5.4-remove-ubuntu-special-case.patch |   33 +
 .../patches/mail-notification-aarch64.patch   | 1629 +++++++++++++++++
 ...ication-dont-link-against-bsd-compat.patch |   10 +
 .../mail-notification-jb-gcc-format.patch     |   15 +
 pkgs/top-level/all-packages.nix               |    2 +
 7 files changed, 1777 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
 create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
 create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
 create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
 create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2a3b1090553..b56dce79820 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -141,6 +141,7 @@
   ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
+  eleanor = "Dejan Lukan <dejan@proteansec.com>";
   elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
new file mode 100644
index 00000000000..e8abc47c2d0
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }:
+
+stdenv.mkDerivation rec {
+  rev = "9ae8768";
+  version = "5.4";
+  name = "mail-notification-${version}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "epienbroek";
+    repo = "mail-notification";
+    sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
+  };
+
+   buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
+
+  prePatch = ''
+    sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die
+
+    # Ensure we never append -Werror
+    sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+  '';
+
+  patches = [
+    ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch
+  #  ./patches/mail-notification-aarch64.patch
+    ./patches/mail-notification-dont-link-against-bsd-compat.patch
+  #  ./patches/mail-notification-jb-gcc-format.patch
+  ];
+
+  patchFlags = "-p0";
+
+  configurePhase = ''
+    ./jb configure
+    runHook postConfigure
+  '';
+
+  postConfigure = ''
+    sed -i -e "/^prefix/c prefix|string|1|$out" \
+           -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \
+           build/config
+
+    # currently disable the check for missing sheme until a better solution
+    # is found; needed, because otherwise the application doesn't even start
+    # and fails saying it unable to find gconf scheme values.
+    sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
+  '';
+
+
+  buildPhase = ''
+    ./jb build
+  '';
+
+  # the "./jb install" tries to install directly to nix store, which is not
+  # writable, so we have to copy the files ourselves
+  installPhase = ''
+    #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install
+
+    # create directories
+    mkdir -p $out/{bin,lib,libexec,share,etc,var}
+
+    # copy executable
+    cp ./build/src/mail-notification $out/bin/
+
+    # copy icons
+    #mkdir -p $out/share/icons/hicolor
+    cp -r art/* $out/share/
+
+    # copy schemas
+    mkdir -p $out/etc/gconf/schemas/
+    #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in
+    cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/
+
+    # copy properties dialogs
+    cp ui/* $out/share/
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Tray status icon, which notifies us when new email arrives";
+    homepage = "http://www.nongnu.org/mailnotify/";
+    license = "GPL-3";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.eleanor ];
+  };
+}
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
new file mode 100644
index 00000000000..4516f32c6f5
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
@@ -0,0 +1,33 @@
+--- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
++++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
+@@ -164,8 +164,6 @@
+ static void
+ gconf_configure (void)
+ {
+-  JBVariable *variable;
+-
+   jb_require_program("gconftool-2");
+ 
+   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
+@@ -178,21 +176,6 @@
+       jb_variable_set_string("gconf-config-source", config_source);
+       g_free(config_source);
+     }
+-
+-  /* fix the default schemas dir on Ubuntu */
+-  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
+-  if (! variable->user_set)
+-    {
+-      static const char *ubuntu_dir = "$datadir/gconf/schemas";
+-      char *expanded;
+-
+-      expanded = jb_variable_expand(ubuntu_dir, NULL);
+-
+-      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
+-	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
+-
+-      g_free(expanded);
+-    }
+ }
+ 
+ static void
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
new file mode 100644
index 00000000000..e0957715b4b
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
@@ -0,0 +1,1629 @@
+diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess
+--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess	2012-11-21 12:57:35.000000000 -0600
++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess	2013-03-08 02:14:30.621645440 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2007-07-22'
++timestamp='2012-09-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -27,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,7 +54,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -144,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -170,7 +169,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -180,7 +179,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -201,6 +200,10 @@
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -223,7 +226,7 @@
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -269,7 +272,10 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -295,12 +301,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -324,14 +330,33 @@
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -375,23 +400,23 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+@@ -461,8 +486,8 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -475,7 +500,7 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -532,7 +557,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -575,52 +600,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
++
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -640,7 +665,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -711,22 +736,22 @@
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+@@ -750,14 +775,14 @@
+ 	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -769,40 +794,51 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
+ 	    amd64)
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
+-    	case ${UNAME_MACHINE} in
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
+ 	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -832,20 +868,68 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+-    arm*:Linux:*:*)
++    aarch64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
++    arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
++	fi
++	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -856,74 +940,33 @@
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips
+-	#undef mipsel
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
+ 	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+@@ -933,14 +976,17 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -948,78 +994,18 @@
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     vax:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-dec-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    xtensa:Linux:*:*)
+-    	echo xtensa-unknown-linux-gnu
++    xtensa*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1027,11 +1013,11 @@
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+@@ -1048,7 +1034,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1063,7 +1049,7 @@
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+@@ -1091,10 +1077,13 @@
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit ;;
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+@@ -1129,8 +1118,18 @@
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+@@ -1143,7 +1142,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1163,10 +1162,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -1192,11 +1191,11 @@
+ 	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1206,6 +1205,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1233,6 +1238,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1248,7 +1263,10 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1293,13 +1311,13 @@
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+@@ -1314,11 +1332,14 @@
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
+ 	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1336,11 +1357,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
+ #endif
+ 
+@@ -1474,9 +1495,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub
+--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub	2012-11-21 12:57:35.000000000 -0600
++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub	2013-03-08 02:14:30.629644517 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2007-06-28'
++timestamp='2012-10-10'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -32,13 +30,16 @@
+ 
+ 
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,7 +73,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -120,12 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -148,10 +156,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze*)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++	-bluegene*)
++		os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -166,10 +177,10 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -214,6 +225,12 @@
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+@@ -238,24 +255,32 @@
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
++	| epiphany \
+ 	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| le32 | le64 \
++	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore | mep \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+@@ -268,29 +293,42 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| moxie \
+ 	| mt \
+ 	| msp430 \
++	| nds32 | nds32le | nds32be \
+ 	| nios | nios2 \
+ 	| ns16k | ns32k \
++	| open8 \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
++	| rl78 | rx \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+-	| spu | strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| ubicom32 \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| we32k \
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| x86 | xc16x | xstormy16 | xtensa \
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -300,6 +338,21 @@
+ 		basic_machine=mt-unknown
+ 		;;
+ 
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+@@ -314,29 +367,37 @@
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| le32-* | le64-* \
++	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+@@ -351,27 +412,36 @@
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
++	| nds32-* | nds32le-* | nds32be-* \
+ 	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile*-* \
+ 	| tron-* \
+-	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
++		;;
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -389,7 +459,7 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
++	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+@@ -435,6 +505,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -443,10 +517,35 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
++	cegcc)
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -475,7 +574,7 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16)
++	cr16 | cr16-*)
+ 		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+@@ -514,6 +613,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -629,7 +732,6 @@
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+@@ -668,6 +770,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -679,6 +789,13 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	microblaze*)
++		basic_machine=microblaze-xilinx
++		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -715,10 +832,18 @@
+ 	ms1-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
++	msys)
++		basic_machine=i386-pc
++		os=-msys
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+@@ -783,6 +908,12 @@
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+@@ -813,6 +944,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -857,9 +996,10 @@
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+@@ -953,6 +1093,9 @@
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -1009,17 +1152,9 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
++	tile*)
++		basic_machine=$basic_machine-unknown
++		os=-linux-gnu
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+@@ -1088,6 +1223,9 @@
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1096,6 +1234,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1134,7 +1276,7 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1181,9 +1323,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++	-auroraux)
++		os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1204,21 +1349,23 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1226,7 +1373,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1265,7 +1412,7 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+-        -os400*)
++	-os400*)
+ 		os=-os400
+ 		;;
+ 	-wince*)
+@@ -1314,7 +1461,7 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
++	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+@@ -1356,6 +1503,11 @@
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
++	-dicos*)
++		os=-dicos
++		;;
++	-nacl*)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1378,10 +1530,10 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+-        score-*)
++	score-*)
+ 		os=-elf
+ 		;;
+-        spu-*)
++	spu-*)
+ 		os=-elf
+ 		;;
+ 	*-acorn)
+@@ -1393,8 +1545,20 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        c4x-* | tic4x-*)
+-        	os=-coff
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+@@ -1414,14 +1578,11 @@
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+-        mep-*)
++	mep-*)
+ 		os=-elf
+ 		;;
+ 	mips*-cisco)
+@@ -1448,7 +1609,7 @@
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+-    	*-knuth)
++	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
+@@ -1553,7 +1714,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
new file mode 100644
index 00000000000..e246a8cc938
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ jbsrc/jb.c	2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+        */
+       jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+       jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+-      jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+     }
+ 
+   jb_compile_options_add_string_defines(object->compile_options,
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch
new file mode 100644
index 00000000000..c99b01eda48
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch
@@ -0,0 +1,15 @@
+Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+===================================================================
+--- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c
++++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+@@ -208,6 +208,10 @@ jb_message_result_string_format (const c
+   g_free(message);
+ }
+ 
++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
++static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0)));
++#endif
++
+ static void
+ print_warning_or_error (const char *prefix, const char *format, va_list args)
+ {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84923c56642..329924c515a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13732,6 +13732,8 @@ in
 
   lyx = callPackage ../applications/misc/lyx { };
 
+  mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
+
   magnetophonDSP = {
     CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
     CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };

From 6295d387d09b71d9ecf00c2a3ff1c1821f7522ff Mon Sep 17 00:00:00 2001
From: Dejan Lukan <dejan@proteansec.com>
Date: Sun, 4 Dec 2016 22:25:09 +0100
Subject: [PATCH 008/295] mail-notification: remove unneeded patches, fix die,
 fix license

---
 .../desktop/mail-notification/default.nix     |   66 +-
 ...ation-5.4-remove-ubuntu-special-case.patch |   33 -
 .../patches/mail-notification-aarch64.patch   | 1629 -----------------
 .../mail-notification-jb-gcc-format.patch     |   15 -
 4 files changed, 16 insertions(+), 1727 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
 delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
 delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch

diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index e8abc47c2d0..36608f4294b 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -15,30 +15,7 @@ stdenv.mkDerivation rec {
    buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
 
   prePatch = ''
-    sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die
-
-    # Ensure we never append -Werror
-    sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
-  '';
-
-  patches = [
-    ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch
-  #  ./patches/mail-notification-aarch64.patch
-    ./patches/mail-notification-dont-link-against-bsd-compat.patch
-  #  ./patches/mail-notification-jb-gcc-format.patch
-  ];
-
-  patchFlags = "-p0";
-
-  configurePhase = ''
-    ./jb configure
-    runHook postConfigure
-  '';
-
-  postConfigure = ''
-    sed -i -e "/^prefix/c prefix|string|1|$out" \
-           -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \
-           build/config
+    sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
 
     # currently disable the check for missing sheme until a better solution
     # is found; needed, because otherwise the application doesn't even start
@@ -46,41 +23,30 @@ stdenv.mkDerivation rec {
     sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
   '';
 
+  patches = [
+    ./patches/mail-notification-dont-link-against-bsd-compat.patch
+  ];
 
-  buildPhase = ''
-    ./jb build
+  patchFlags = "-p0";
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
+  preConfigure = "./jb configure prefix=$out";
+
+  postConfigure = ''
+    substituteInPlace build/config \
+      --replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \
+      --replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \
   '';
 
-  # the "./jb install" tries to install directly to nix store, which is not
-  # writable, so we have to copy the files ourselves
-  installPhase = ''
-    #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install
-
-    # create directories
-    mkdir -p $out/{bin,lib,libexec,share,etc,var}
-
-    # copy executable
-    cp ./build/src/mail-notification $out/bin/
-
-    # copy icons
-    #mkdir -p $out/share/icons/hicolor
-    cp -r art/* $out/share/
-
-    # copy schemas
-    mkdir -p $out/etc/gconf/schemas/
-    #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in
-    cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/
-
-    # copy properties dialogs
-    cp ui/* $out/share/
-  '';
+  buildPhase = "./jb build";
+  installPhase = "./jb install";
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Tray status icon, which notifies us when new email arrives";
     homepage = "http://www.nongnu.org/mailnotify/";
-    license = "GPL-3";
+    license = with licenses; [ gpl3 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.eleanor ];
   };
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
deleted file mode 100644
index 4516f32c6f5..00000000000
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
-+++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
-@@ -164,8 +164,6 @@
- static void
- gconf_configure (void)
- {
--  JBVariable *variable;
--
-   jb_require_program("gconftool-2");
- 
-   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
-@@ -178,21 +176,6 @@
-       jb_variable_set_string("gconf-config-source", config_source);
-       g_free(config_source);
-     }
--
--  /* fix the default schemas dir on Ubuntu */
--  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
--  if (! variable->user_set)
--    {
--      static const char *ubuntu_dir = "$datadir/gconf/schemas";
--      char *expanded;
--
--      expanded = jb_variable_expand(ubuntu_dir, NULL);
--
--      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
--	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
--
--      g_free(expanded);
--    }
- }
- 
- static void
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
deleted file mode 100644
index e0957715b4b..00000000000
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch
+++ /dev/null
@@ -1,1629 +0,0 @@
-diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess
---- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess	2012-11-21 12:57:35.000000000 -0600
-+++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess	2013-03-08 02:14:30.621645440 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--#   Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2007-07-22'
-+timestamp='2012-09-25'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -27,16 +25,16 @@
- # the same distribution terms that you use for the rest of that program.
- 
- 
--# Originally written by Per Bothner <per@bothner.com>.
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -56,7 +54,8 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -144,7 +143,7 @@
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     *:NetBSD:*:*)
- 	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
-@@ -170,7 +169,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -180,7 +179,7 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
- 		;;
- 	esac
- 	# The OS release
-@@ -201,6 +200,10 @@
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit ;;
-+    *:Bitrig:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	exit ;;
-     *:OpenBSD:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -223,7 +226,7 @@
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- 		;;
- 	*5.*)
--	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- 		;;
- 	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -269,7 +272,10 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit ;;
-+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+	exitcode=$?
-+	trap '' 0
-+	exit $exitcode ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -295,12 +301,12 @@
- 	echo s390-ibm-zvmoe
- 	exit ;;
-     *:OS400:*:*)
--        echo powerpc-ibm-os400
-+	echo powerpc-ibm-os400
- 	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
- 	exit ;;
--    arm:riscos:*:*|arm:RISCOS:*:*)
-+    arm*:riscos:*:*|arm*:RISCOS:*:*)
- 	echo arm-unknown-riscos
- 	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -324,14 +330,33 @@
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
-@@ -375,23 +400,23 @@
-     # MiNT.  But MiNT is downward compatible to TOS, so this should
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit ;;
-+	exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-milan-mint${UNAME_RELEASE}
-+	exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-hades-mint${UNAME_RELEASE}
-+	exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-unknown-mint${UNAME_RELEASE}
-+	exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
- 	exit ;;
-@@ -461,8 +486,8 @@
- 	echo m88k-motorola-sysv3
- 	exit ;;
-     AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	# DG/UX returns AViiON for all architectures
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
- 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -475,7 +500,7 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit ;;
-+	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
- 	exit ;;
-@@ -532,7 +557,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[45])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -575,52 +600,52 @@
- 	    9000/[678][0-9][0-9])
- 		if [ -x /usr/bin/getconf ]; then
- 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
--                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
--                    case "${sc_cpu_version}" in
--                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
--                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
--                      532)                      # CPU_PA_RISC2_0
--                        case "${sc_kernel_bits}" in
--                          32) HP_ARCH="hppa2.0n" ;;
--                          64) HP_ARCH="hppa2.0w" ;;
-+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+		    case "${sc_cpu_version}" in
-+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+		      532)                      # CPU_PA_RISC2_0
-+			case "${sc_kernel_bits}" in
-+			  32) HP_ARCH="hppa2.0n" ;;
-+			  64) HP_ARCH="hppa2.0w" ;;
- 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
--                        esac ;;
--                    esac
-+			esac ;;
-+		    esac
- 		fi
- 		if [ "${HP_ARCH}" = "" ]; then
- 		    eval $set_cc_for_build
--		    sed 's/^              //' << EOF >$dummy.c
-+		    sed 's/^		//' << EOF >$dummy.c
- 
--              #define _HPUX_SOURCE
--              #include <stdlib.h>
--              #include <unistd.h>
--
--              int main ()
--              {
--              #if defined(_SC_KERNEL_BITS)
--                  long bits = sysconf(_SC_KERNEL_BITS);
--              #endif
--                  long cpu  = sysconf (_SC_CPU_VERSION);
--
--                  switch (cpu)
--              	{
--              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
--              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
--              	case CPU_PA_RISC2_0:
--              #if defined(_SC_KERNEL_BITS)
--              	    switch (bits)
--              		{
--              		case 64: puts ("hppa2.0w"); break;
--              		case 32: puts ("hppa2.0n"); break;
--              		default: puts ("hppa2.0"); break;
--              		} break;
--              #else  /* !defined(_SC_KERNEL_BITS) */
--              	    puts ("hppa2.0"); break;
--              #endif
--              	default: puts ("hppa1.0"); break;
--              	}
--                  exit (0);
--              }
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
-+
-+		int main ()
-+		{
-+		#if defined(_SC_KERNEL_BITS)
-+		    long bits = sysconf(_SC_KERNEL_BITS);
-+		#endif
-+		    long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+		    switch (cpu)
-+			{
-+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+			case CPU_PA_RISC2_0:
-+		#if defined(_SC_KERNEL_BITS)
-+			    switch (bits)
-+				{
-+				case 64: puts ("hppa2.0w"); break;
-+				case 32: puts ("hppa2.0n"); break;
-+				default: puts ("hppa2.0"); break;
-+				} break;
-+		#else  /* !defined(_SC_KERNEL_BITS) */
-+			    puts ("hppa2.0"); break;
-+		#endif
-+			default: puts ("hppa1.0"); break;
-+			}
-+		    exit (0);
-+		}
- EOF
- 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- 		    test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -640,7 +665,7 @@
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -711,22 +736,22 @@
- 	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit ;;
-+	exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit ;;
-+	exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit ;;
-+	exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit ;;
-+	exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit ;;
-+	exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-@@ -750,14 +775,14 @@
- 	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit ;;
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     5000:UNIX_System_V:4.*:*)
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
--        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -769,40 +794,51 @@
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 	exit ;;
-     *:FreeBSD:*:*)
--	case ${UNAME_MACHINE} in
--	    pc98)
--		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	case ${UNAME_PROCESSOR} in
- 	    amd64)
- 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- 	    *)
--		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- 	esac
- 	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    *:MINGW64*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw64
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     i*:windows32*:*)
--    	# uname -m includes "-pc" on this system.
--    	echo ${UNAME_MACHINE}-mingw32
-+	# uname -m includes "-pc" on this system.
-+	echo ${UNAME_MACHINE}-mingw32
- 	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    *:Interix*:[3456]*)
--    	case ${UNAME_MACHINE} in
-+    *:Interix*:*)
-+	case ${UNAME_MACHINE} in
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
--	    EM64T | authenticamd)
-+	    authenticamd | genuineintel | EM64T)
- 		echo x86_64-unknown-interix${UNAME_RELEASE}
- 		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
- 	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -832,20 +868,68 @@
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
--    arm*:Linux:*:*)
-+    aarch64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+	esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep -q __ARM_PCS_VFP
-+	    then
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+	    fi
-+	fi
-+	exit ;;
-     avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     cris:Linux:*:*)
--	echo cris-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     crisv32:Linux:*:*)
--	echo crisv32-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    hexagon:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -856,74 +940,33 @@
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    mips:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips
--	#undef mipsel
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
--	;;
--    mips64:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips64
--	#undef mips64el
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
--	exit ;;
--    ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
- 	exit ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
- 	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
-@@ -933,14 +976,17 @@
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
- 	exit ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -948,78 +994,18 @@
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-+    tile*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    xtensa:Linux:*:*)
--    	echo xtensa-unknown-linux-gnu
-+    xtensa*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit ;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--	#ifdef __dietlibc__
--	LIBC=dietlibc
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^LIBC/{
--		s: ::g
--		p
--	    }'`"
--	test x"${LIBC}" != x && {
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
--		exit
--	}
--	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
--	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
-@@ -1027,11 +1013,11 @@
- 	echo i386-sequent-sysv4
- 	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
-+	# Unixware is an offshoot of SVR4, but it has its own version
-+	# number series starting with 2...
-+	# I am not positive that other SVR4 systems won't match this,
- 	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
-+	# Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit ;;
-     i*86:OS/2:*:*)
-@@ -1048,7 +1034,7 @@
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1063,7 +1049,7 @@
- 	fi
- 	exit ;;
-     i*86:*:5:[678]*)
--    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
-@@ -1091,10 +1077,13 @@
- 	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
--        exit ;;
-+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-+	# the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+	exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
- 	exit ;;
-@@ -1129,8 +1118,18 @@
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && { echo i486-ncr-sysv4; exit; } ;;
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-@@ -1143,7 +1142,7 @@
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
-@@ -1163,10 +1162,10 @@
- 		echo ns32k-sni-sysv
- 	fi
- 	exit ;;
--    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel@ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit ;;
-+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+			# says <Richard.M.Bartel@ccMail.Census.GOV>
-+	echo i586-unisys-sysv4
-+	exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
-@@ -1192,11 +1191,11 @@
- 	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
--	        echo mips-nec-sysv${UNAME_RELEASE}
-+		echo mips-nec-sysv${UNAME_RELEASE}
- 	else
--	        echo mips-unknown-sysv${UNAME_RELEASE}
-+		echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit ;;
-+	exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
- 	exit ;;
-@@ -1206,6 +1205,12 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-+    x86_64:Haiku:*:*)
-+	echo x86_64-unknown-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1233,6 +1238,16 @@
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1248,7 +1263,10 @@
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
- 	exit ;;
--    NSE-?:NONSTOP_KERNEL:*:*)
-+    NEO-?:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSE-*:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
- 	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1293,13 +1311,13 @@
- 	echo pdp10-unknown-its
- 	exit ;;
-     SEI:*:*:SEIUX)
--        echo mips-sei-seiux${UNAME_RELEASE}
-+	echo mips-sei-seiux${UNAME_RELEASE}
- 	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit ;;
-     *:*VMS:*:*)
--    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
- 	    A*) echo alpha-dec-vms ; exit ;;
- 	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1314,11 +1332,14 @@
-     i*86:rdos:*:*)
- 	echo ${UNAME_MACHINE}-pc-rdos
- 	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
-+    x86_64:VMkernel:*:*)
-+	echo ${UNAME_MACHINE}-unknown-esx
-+	exit ;;
- esac
- 
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
-@@ -1336,11 +1357,11 @@
- #include <sys/param.h>
-   printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
--          "4"
-+	"4"
- #else
--	  ""
-+	""
- #endif
--         ); exit (0);
-+	); exit (0);
- #endif
- #endif
- 
-@@ -1474,9 +1495,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub
---- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub	2012-11-21 12:57:35.000000000 -0600
-+++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub	2013-03-08 02:14:30.629644517 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--#   Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2007-06-28'
-+timestamp='2012-10-10'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,9 +21,7 @@
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -32,13 +30,16 @@
- 
- 
- # Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,7 +73,8 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -120,12 +122,18 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
--  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-+  android-linux)
-+    os=-linux-android
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+    ;;
-   *)
-     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-     if [ $basic_machine != $1 ]
-@@ -148,10 +156,13 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis | -knuth | -cray)
-+	-apple | -axis | -knuth | -cray | -microblaze*)
- 		os=
- 		basic_machine=$1
- 		;;
-+	-bluegene*)
-+		os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -166,10 +177,10 @@
- 		os=-chorusos
- 		basic_machine=$1
- 		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
-+	-chorusrdb)
-+		os=-chorusrdb
- 		basic_machine=$1
-- 		;;
-+		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -214,6 +225,12 @@
- 	-isc*)
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-lynx*178)
-+		os=-lynxos178
-+		;;
-+	-lynx*5)
-+		os=-lynxos5
-+		;;
- 	-lynx*)
- 		os=-lynxos
- 		;;
-@@ -238,24 +255,32 @@
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
-+	| aarch64 | aarch64_be \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+        | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
-+	| epiphany \
- 	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| hexagon \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
-+	| le32 | le64 \
-+	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore | mep \
-+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-@@ -268,29 +293,42 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
- 	| mt \
- 	| msp430 \
-+	| nds32 | nds32le | nds32be \
- 	| nios | nios2 \
- 	| ns16k | ns32k \
-+	| open8 \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle \
- 	| pyramid \
-+	| rl78 | rx \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
--	| spu | strongarm \
--	| tahoe | thumb | tic4x | tic80 | tron \
--	| v850 | v850e \
-+	| spu \
-+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+	| ubicom32 \
-+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- 	| we32k \
--	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
--	| z8k)
-+	| x86 | xc16x | xstormy16 | xtensa \
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
--		# Motorola 68HC11/12.
-+	c54x)
-+		basic_machine=tic54x-unknown
-+		;;
-+	c55x)
-+		basic_machine=tic55x-unknown
-+		;;
-+	c6x)
-+		basic_machine=tic6x-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
-@@ -300,6 +338,21 @@
- 		basic_machine=mt-unknown
- 		;;
- 
-+	strongarm | thumb | xscale)
-+		basic_machine=arm-unknown
-+		;;
-+	xgate)
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	xscaleeb)
-+		basic_machine=armeb-unknown
-+		;;
-+
-+	xscaleel)
-+		basic_machine=armel-unknown
-+		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
-@@ -314,29 +367,37 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+	| aarch64-* | aarch64_be-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
-+	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
- 	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
- 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| hexagon-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
-+	| le32-* | le64-* \
-+	| lm32-* \
- 	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| microblaze-* | microblazeel-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-@@ -351,27 +412,36 @@
- 	| mmix-* \
- 	| mt-* \
- 	| msp430-* \
-+	| nds32-* | nds32le-* | nds32be-* \
- 	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| open8-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| rl78-* | romp-* | rs6000-* | rx-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| tahoe-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile*-* \
- 	| tron-* \
--	| v850-* | v850e-* | vax-* \
-+	| ubicom32-* \
-+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+	| vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
--	| xstormy16-* | xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -389,7 +459,7 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
--    	abacus)
-+	abacus)
- 		basic_machine=abacus-unknown
- 		;;
- 	adobe68k)
-@@ -435,6 +505,10 @@
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -443,10 +517,35 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
-+	c54x-*)
-+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	c55x-*)
-+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	c6x-*)
-+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+	cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -475,7 +574,7 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16)
-+	cr16 | cr16-*)
- 		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
-@@ -514,6 +613,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
- 	djgpp)
- 		basic_machine=i586-pc
- 		os=-msdosdjgpp
-@@ -629,7 +732,6 @@
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
- 		;;
--# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
- 	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
-@@ -668,6 +770,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -679,6 +789,13 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	microblaze*)
-+		basic_machine=microblaze-xilinx
-+		;;
-+	mingw64)
-+		basic_machine=x86_64-pc
-+		os=-mingw64
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
-@@ -715,10 +832,18 @@
- 	ms1-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- 		;;
-+	msys)
-+		basic_machine=i386-pc
-+		os=-msys
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
- 		;;
-+	nacl)
-+		basic_machine=le32-unknown
-+		os=-nacl
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
-@@ -783,6 +908,12 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
-+	neo-tandem)
-+		basic_machine=neo-tandem
-+		;;
-+	nse-tandem)
-+		basic_machine=nse-tandem
-+		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -813,6 +944,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -857,9 +996,10 @@
- 		;;
- 	power)	basic_machine=power-ibm
- 		;;
--	ppc)	basic_machine=powerpc-unknown
-+	ppc | ppcbe)	basic_machine=powerpc-unknown
- 		;;
--	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
-@@ -953,6 +1093,9 @@
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -1009,17 +1152,9 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--	tic54x | c54x*)
--		basic_machine=tic54x-unknown
--		os=-coff
--		;;
--	tic55x | c55x*)
--		basic_machine=tic55x-unknown
--		os=-coff
--		;;
--	tic6x | c6x*)
--		basic_machine=tic6x-unknown
--		os=-coff
-+	tile*)
-+		basic_machine=$basic_machine-unknown
-+		os=-linux-gnu
- 		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
-@@ -1088,6 +1223,9 @@
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
-@@ -1096,6 +1234,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1134,7 +1276,7 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1181,9 +1323,12 @@
- if [ x"$os" != x"" ]
- then
- case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
-+	# First match some system type aliases
-+	# that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
-+	-auroraux)
-+		os=-auroraux
-+		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
- 		;;
-@@ -1204,21 +1349,23 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
--	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* \
-+	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
--	      | -openbsd* | -solidbsd* \
-+	      | -bitrig* | -openbsd* | -solidbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1226,7 +1373,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1265,7 +1412,7 @@
- 	-opened*)
- 		os=-openedition
- 		;;
--        -os400*)
-+	-os400*)
- 		os=-os400
- 		;;
- 	-wince*)
-@@ -1314,7 +1461,7 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
--        -tpf*)
-+	-tpf*)
- 		os=-tpf
- 		;;
- 	-triton*)
-@@ -1356,6 +1503,11 @@
- 	-zvmoe)
- 		os=-zvmoe
- 		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+	-nacl*)
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1378,10 +1530,10 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
--        score-*)
-+	score-*)
- 		os=-elf
- 		;;
--        spu-*)
-+	spu-*)
- 		os=-elf
- 		;;
- 	*-acorn)
-@@ -1393,8 +1545,20 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        c4x-* | tic4x-*)
--        	os=-coff
-+	c4x-* | tic4x-*)
-+		os=-coff
-+		;;
-+	hexagon-*)
-+		os=-elf
-+		;;
-+	tic54x-*)
-+		os=-coff
-+		;;
-+	tic55x-*)
-+		os=-coff
-+		;;
-+	tic6x-*)
-+		os=-coff
- 		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
-@@ -1414,14 +1578,11 @@
- 		;;
- 	m68000-sun)
- 		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
- 		;;
- 	m68*-cisco)
- 		os=-aout
- 		;;
--        mep-*)
-+	mep-*)
- 		os=-elf
- 		;;
- 	mips*-cisco)
-@@ -1448,7 +1609,7 @@
- 	*-ibm)
- 		os=-aix
- 		;;
--    	*-knuth)
-+	*-knuth)
- 		os=-mmixware
- 		;;
- 	*-wec)
-@@ -1553,7 +1714,7 @@
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch
deleted file mode 100644
index c99b01eda48..00000000000
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
-===================================================================
---- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c
-+++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
-@@ -208,6 +208,10 @@ jb_message_result_string_format (const c
-   g_free(message);
- }
- 
-+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-+static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0)));
-+#endif
-+
- static void
- print_warning_or_error (const char *prefix, const char *format, va_list args)
- {

From 8d926260ef93e20fe66b6e3743a410151a067d4a Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Sun, 4 Dec 2016 17:22:54 -0600
Subject: [PATCH 009/295] inform7: init at 6M62

---
 lib/maintainers.nix                           |  1 +
 .../development/compilers/inform7/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/compilers/inform7/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b908a261b1f..76c27f30f07 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -272,6 +272,7 @@
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <mbakke@fastmail.com>";
+  mbbx6spp = "Susan Potter <me@susanpotter.net>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
new file mode 100644
index 00000000000..7f1830430c4
--- /dev/null
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }:
+let
+  version = "6M62";
+in stdenv.mkDerivation {
+  name = "inform7-${version}";
+  buildInputs = [ perl coreutils gnutar gzip ];
+  src = fetchzip {
+    url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz";
+    sha256 = "0bk0pfymvsn1g8ci0pfdw7dgrlzb232a8pc67y2xk6zgpf3m41vj";
+  };
+  preConfigure = "touch Makefile.PL";
+  buildPhase = "";
+  installPhase = ''
+    mkdir -p $out
+    pushd $src
+    ./install-inform7.sh --prefix $out
+    popd
+
+    substituteInPlace "$out/bin/i7" \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A design system for interactive fiction.";
+    homepage = http://inform7.com/;
+    license = licenses.artistic2;
+    maintainers = with maintainers; [ mbbx6spp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45c01bd821..75bec95318b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2230,6 +2230,8 @@ in
 
   inetutils = callPackage ../tools/networking/inetutils { };
 
+  inform7 = callPackage ../development/compilers/inform7 { };
+
   innoextract = callPackage ../tools/archivers/innoextract { };
 
   ioping = callPackage ../tools/system/ioping { };

From 954d9953941d6c94abb5d2d549bd18486d0b27ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 8 Oct 2016 19:07:20 +0200
Subject: [PATCH 010/295] nix-prefetch-git: escape string fields properly

json requires certain characters to be escaped in strings.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 32 +++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 705d84c648b..54945d203af 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -322,6 +322,18 @@ clone_user_rev() {
     fi
 }
 
+json_escape() {
+    local s="$1"
+    s="${s//\\/\\\\}" # \
+    s="${s//\"/\\\"}" # "
+    s="${s//^H/\\\b}" # \b (backspace)
+    s="${s//^L/\\\f}" # \f (form feed)
+    s="${s//
+/\\\n}" # \n (newline)
+    s="${s//^M/\\\r}" # \r (carriage return)
+    s="${s//   /\\t}" # \t (tab)
+    echo "$s"
+}
 
 print_results() {
     hash="$1"
@@ -338,17 +350,15 @@ print_results() {
         fi
     fi
     if test -n "$hash"; then
-        echo "{"
-        echo "  \"url\": \"$url\","
-        echo "  \"rev\": \"$fullRev\","
-        echo "  \"date\": \"$commitDateStrict8601\","
-        echo -n "  \"$hashType\": \"$hash\""
-        if test -n "$fetchSubmodules"; then
-            echo ","
-            echo -n "  \"fetchSubmodules\": true"
-        fi
-        echo ""
-        echo "}"
+        cat <<EOF
+{
+  "url": "$(json_escape "$url")",
+  "rev": "$(json_escape "$fullRev")",
+  "date": "$(json_escape "$commitDateStrict8601")",
+  "$(json_escape "$hashType")": "$(json_escape "$hash")",
+  "fetchSubmodules": $([[ -n "fetchSubmodules" ]] && echo true || echo false)
+}
+EOF
     fi
 }
 

From 47d0d3d46f5520fba39c5376ea5449d51f44635d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 8 Oct 2016 19:05:45 +0200
Subject: [PATCH 011/295] nix-prefetch-git: fix date field

in some cases `git show` include tag information in the output
this is suppressed by the parameter '-1'
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 54945d203af..f71d9ac55bc 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -291,8 +291,8 @@ _clone_user_rev() {
     pushd "$dir" >/dev/null
     fullRev=$( (git rev-parse "$rev" 2>/dev/null || git rev-parse "refs/heads/$branchName") | tail -n1)
     humanReadableRev=$(git describe "$fullRev" 2> /dev/null || git describe --tags "$fullRev" 2> /dev/null || echo -- none --)
-    commitDate=$(git show --no-patch --pretty=%ci "$fullRev")
-    commitDateStrict8601=$(git show --no-patch --pretty=%cI "$fullRev")
+    commitDate=$(git show -1 --no-patch --pretty=%ci "$fullRev")
+    commitDateStrict8601=$(git show -1 --no-patch --pretty=%cI "$fullRev")
     popd >/dev/null
 
     # Allow doing additional processing before .git removal

From 61e9862bc0fa2013267ec076a1c414ffe3b27aca Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 7 Dec 2016 15:25:31 +0100
Subject: [PATCH 012/295] nodejs: 7.1.0 -> 7.2.1

---
 pkgs/development/web/nodejs/v7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 544f438cf86..659aa47985a 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "7.1.0";
+    version = "7.2.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm";
+      sha256 = "03fqv6k8y42ldnrz4iirhwg6wdyw8z95h9h40igiriicbnm072y0";
     };
 
   })

From 29941231610f3d93c8e99adf6cae51a990057654 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Wed, 7 Dec 2016 10:46:06 +0000
Subject: [PATCH 013/295] boinc service: add to module list

The module itself was added in 811c39c6a4156af42558f95945add2795083d1a7,
but it looks like I forgot to reference it to module-list.nix.
---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 155d7a5ef92..c89bbcc71ac 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -133,6 +133,7 @@
   ./services/cluster/fleet.nix
   ./services/cluster/kubernetes.nix
   ./services/cluster/panamax.nix
+  ./services/computing/boinc/client.nix
   ./services/computing/torque/server.nix
   ./services/computing/torque/mom.nix
   ./services/computing/slurm/slurm.nix

From 2606994cc6cbf2392dcb556873c03d01658637c1 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 8 Dec 2016 15:50:52 +0000
Subject: [PATCH 014/295] boinc service: use <link> instead of <ulink>

---
 nixos/modules/services/computing/boinc/client.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 5e73638913d..91bd463732d 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -48,7 +48,7 @@ in
           only the hosts listed in <varname>dataDir</varname>/remote_hosts.cfg will be allowed to
           connect.
 
-          See also: <ulink url="http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access"/>
+          See also: <link xlink:href="http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access"/>
         '';
       };
     };

From 76125722f0cd445cbce0fb183ae127aeb28796d0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 8 Dec 2016 21:12:27 +0100
Subject: [PATCH 015/295] darwin.libunwind: fix install phase

---
 .../darwin/apple-source-releases/libunwind/default.nix     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
index 81a45d99a86..9fed57ed64a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
@@ -1,15 +1,16 @@
 { stdenv, appleDerivation, dyld, osx_private_sdk }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
+  buildPhase = ":";
 
+  # install headers only
   installPhase = ''
     mkdir -p $out/lib
-    cp -R include $out/include
+    make install-data-am
   '';
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = with maintainers; [ copumpkin lnl7 ];
     platforms   = platforms.darwin;
     license     = licenses.apsl20;
   };

From 8bdf8b7b51e8a5eef0bb1e1df6419d129fe48f76 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 9 Dec 2016 18:51:47 -0200
Subject: [PATCH 016/295] flat-plat-gtk-theme: eba3be5 -> 2016-12-03

---
 pkgs/misc/themes/flat-plat/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index 342fc1277c9..c9c0812d7a2 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -1,29 +1,33 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  name = "flat-plat-gtk-theme-eba3be5";
+  name = "flat-plat-gtk-theme-${version}";
+  version = "2016-12-03";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "Flat-Plat";
-    rev = "eba3be5eafd1140e1edb8b02411edb2f6c78b0ca";
-    sha256 = "0vfdnrxspdwg4jr025dwjmdcrqnblhlw666v5b7qhkxymibp5j7h";
+    rev = "49a5a51ec1a5835ff04ba2c62c9bccbd3f49bbe6";
+    sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb";
   };
 
+  nativeBuildInputs = [ gnome3.gnome_shell libxml2 ];
+
+  buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ];
+
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/share/themes/Flat-Plat
-    rm .gitignore COPYING README.md
-    cp -r . $out/share/themes/Flat-Plat
+    substituteInPlace install.sh --replace /usr ""
+    destdir="$out" ./install.sh
+    rm $out/share/themes/*/COPYING
   '';
 
   meta = with stdenv.lib; {
-    description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell";
+    description = "A Material Design-like theme for GTK+ based desktop environments";
     homepage = https://github.com/nana-4/Flat-Plat;
     license = licenses.gpl2;
-    maintainers = [ maintainers.mounium ];
     platforms = platforms.all;
+    maintainers = [ maintainers.mounium ];
   };
 }
-

From eaadb89fedddb42705a41847177fd367c8366603 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 9 Dec 2016 21:52:36 -0200
Subject: [PATCH 017/295] efl: 1.18.3 -> 1.18.4

---
 pkgs/desktops/enlightenment/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index c4b8ba8cd05..45e547f4a22 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.3";
+  version = "1.18.4";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "1h347sfxajyb5s931m9qga14wwiqci7aicww2imxjhzm8w4fqj07";
+    sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6a8c9ad798e19008617bc399a074f583ae3a6a01 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 9 Dec 2016 22:14:02 -0200
Subject: [PATCH 018/295] enlightenment: 0.21.4 -> 0.21.5

---
 pkgs/desktops/enlightenment/enlightenment.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index d2091eeb8e9..b16b10952a2 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.21.4";
+  version = "0.21.5";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "085zn6vdy904fxa9krx7ljv61yg96b2xk56g0bx2lyq1d33sgl8f";
+    sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6bc52926fe0355255507f1cd534f87fc9dbffba5 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 9 Dec 2016 15:58:23 -0500
Subject: [PATCH 019/295] ignition-math: 2.3.0 -> 2.6.0

---
 pkgs/development/libraries/ignition-math/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index f71def55583..66b21b6fae6 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl, cmake }:
 
 let
-  version = "2.3.0";
+  version = "2.6.0";
 in
 stdenv.mkDerivation rec {
   name = "ign-math2-${version}";
 
   src = fetchurl {
     url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
-    sha256 = "1a2jgq6allcxg62y0r61iv4hgxkfr1whpsxy75hg7k85s7da8dpl";
+    sha256 = "1d4naq0zp704c7ckj2wwmhplxmwkvcs1jib8bklnnd09lhg9j92j";
   };
 
   buildInputs = [ cmake ];
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://ignitionrobotics.org/libraries/math;

From 500816150fb973287401bf4ca28142d1cc49857b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 10 Dec 2016 07:11:30 -0200
Subject: [PATCH 020/295] flat-plat-gtk-theme: remove build dependency on
 gnome-shell

---
 pkgs/misc/themes/flat-plat/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index c9c0812d7a2..1b8f4f2d110 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -11,14 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb";
   };
 
-  nativeBuildInputs = [ gnome3.gnome_shell libxml2 ];
+  nativeBuildInputs = [ gnome3.glib libxml2 ];
 
   buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ];
 
   dontBuild = true;
 
   installPhase = ''
-    substituteInPlace install.sh --replace /usr ""
+    sed -i install.sh \
+      -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \
+      -e "s|/usr||"
     destdir="$out" ./install.sh
     rm $out/share/themes/*/COPYING
   '';

From edaac2c3ff41a12383e85557746b6097bfbefccc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 10 Dec 2016 12:13:31 +0300
Subject: [PATCH 021/295] wesnoth: disable input frameworks

---
 pkgs/games/wesnoth/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index a7352f0a75c..7e5cdae57fa 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
 , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
-, enableTools ? false
+, makeWrapper, enableTools ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
                   libvorbis fribidi dbus libpng pcre ];
@@ -23,6 +23,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled.
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram "$i" --unset XMODIFIERS
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
     longDescription = ''

From cbcdfdb576338081efff9c920428acc2b05fc5a3 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 10 Dec 2016 19:51:55 +0900
Subject: [PATCH 022/295] android-sdk: 25.2.2 -> 25.2.3

---
 pkgs/development/mobile/androidenv/addon.xml  |  38 +-
 pkgs/development/mobile/androidenv/addons.nix |   4 +-
 .../mobile/androidenv/androidsdk.nix          |   6 +-
 .../mobile/androidenv/build-tools.nix         |   6 +-
 .../mobile/androidenv/platform-tools.nix      |   6 +-
 .../mobile/androidenv/platforms-linux.nix     |  12 +
 .../mobile/androidenv/platforms-macosx.nix    |  12 +
 .../mobile/androidenv/repository-11.xml       | 248 ++++++++-----
 .../mobile/androidenv/support-repository.nix  |   4 +-
 .../development/mobile/androidenv/sys-img.xml | 334 ++++++++++--------
 .../mobile/androidenv/sysimages.nix           | 101 ++++--
 pkgs/top-level/all-packages.nix               |   4 +-
 12 files changed, 479 insertions(+), 296 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index aef61bb2fc2..538b7622df7 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-09-13 10:48:39.682447 with ADRT.-->
+	<!--Generated on 2016-11-23 16:51:44.011243 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -1262,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:libs/>
 	</sdk:add-on>
 	<sdk:extra>
-		<!--Generated from bid:3256427, branch:git_nyc-support-release-->
+		<!--Generated from bid:3453458, branch:git_nyc-support-release-->
 		<sdk:revision>
-			<sdk:major>37</sdk:major>
+			<sdk:major>40</sdk:major>
 			<sdk:minor>0</sdk:minor>
 			<sdk:micro>0</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Sep 12 10:14:44 2016.-->
-				<sdk:size>281268000</sdk:size>
-				<sdk:checksum type="sha1">2f862a5d66d5526cd5b7655c3e9678f493e485f7</sdk:checksum>
-				<sdk:url>android_m2repository_r37.zip</sdk:url>
+				<!--Built on: Wed Nov  9 14:52:17 2016.-->
+				<sdk:size>305545706</sdk:size>
+				<sdk:checksum type="sha1">782e7233f18c890463e8602571d304e680ce354c</sdk:checksum>
+				<sdk:url>android_m2repository_r40.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1308,16 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:old-paths>compatibility</sdk:old-paths>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:128809501, branch:perforce-->
+		<!--Generated from bid:140037564, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>32</sdk:major>
+			<sdk:major>40</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jul 29 09:01:13 2016.-->
-				<sdk:size>113922721</sdk:size>
-				<sdk:checksum type="sha1">ae24bde9c8f732f4d13b72e70802be8c97dcfddf</sdk:checksum>
-				<sdk:url>google_m2repository_r32.zip</sdk:url>
+				<!--Built on: Wed Nov 23 09:14:40 2016.-->
+				<sdk:size>152633821</sdk:size>
+				<sdk:checksum type="sha1">0f599f7f35fba49b9277ef9e1394c5c82d8bd369</sdk:checksum>
+				<sdk:url>google_m2repository_gms_v8_rc42_wear_2a3.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1392,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:128810771, branch:perforce-->
+		<!--Generated from bid:139489718, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>32</sdk:major>
+			<sdk:major>38</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jul 29 09:01:17 2016.-->
-				<sdk:size>11820632</sdk:size>
-				<sdk:checksum type="sha1">bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f</sdk:checksum>
-				<sdk:url>google_play_services_945200_r32.zip</sdk:url>
+				<!--Built on: Fri Nov 18 10:26:20 2016.-->
+				<sdk:size>12351978</sdk:size>
+				<sdk:checksum type="sha1">7a50dec81ba9c9b51d7778c19ca05002498209e8</sdk:checksum>
+				<sdk:url>google_play_services_v8_rc41.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index f999f603b8f..7ddd203d4bf 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -283,8 +283,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip;
-      sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f";
+      url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip;
+      sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8";
     };
     meta = {
       description = "Google Play services client library and sample code";
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index a742386920b..52a2ab8f36a 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -11,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; };
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "25.2.2";
+  version = "25.2.3";
 
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip";
-      sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h";
+      sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip";
-      sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl";
+      sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar";
     }
     else throw "platform not ${stdenv.system} supported!";
 
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 945cc0bedd5..c09d643146b 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,16 +1,16 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  version = "24.0.2";
+  version = "25.0.1";
   name = "android-build-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
-      sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj";
+      sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8";
+      sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 517167b0d55..6205b98eee1 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,16 +1,16 @@
 {stdenv, zlib, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "24.0.2";
+  version = "25.0.1";
   name = "android-platform-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
-      sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6";
+      sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
-      sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4";
+      sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index e0c77ad294e..4f3f45f4cc9 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -292,4 +292,16 @@ in
     };
   };
 
+  platform_25 = buildPlatform {
+    name = "android-platform-7.1.1";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/platform-25_r02.zip;
+      sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+    };
+    meta = {
+      description = "Android SDK Platform 25";
+      url = http://developer.android.com/sdk/;
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 60fae208ae1..d8619b7c0f5 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -292,4 +292,16 @@ in
     };
   };
 
+  platform_25 = buildPlatform {
+    name = "android-platform-7.1.1";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/platform-25_r02.zip;
+      sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+    };
+    meta = {
+      description = "Android SDK Platform 25";
+      url = http://developer.android.com/sdk/;
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index a0ef9bc4485..e115f674790 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-09-13 11:44:58.246002 with ADRT.-->
+	<!--Generated on 2016-11-23 16:51:35.129300 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -296,85 +296,69 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:2977051, branch:aosp-ndk-r12-release-->
+		<!--Generated from bid:3345770, branch:aosp-ndk-r13-release-->
 		<sdk:description>NDK</sdk:description>
-		<sdk:revision>12</sdk:revision>
+		<sdk:revision>13</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun 15 13:55:11 2016.-->
-				<sdk:size>734135279</sdk:size>
-				<sdk:checksum type="sha1">e257fe12f8947be9f79c10c3fffe87fb9406118a</sdk:checksum>
-				<sdk:url>android-ndk-r12b-darwin-x86_64.zip</sdk:url>
+				<!--Built on: Wed Oct 12 22:27:26 2016.-->
+				<sdk:size>665967997</sdk:size>
+				<sdk:checksum type="sha1">71fe653a7bf5db08c3af154735b6ccbc12f0add5</sdk:checksum>
+				<sdk:url>android-ndk-r13b-darwin-x86_64.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 15 13:55:32 2016.-->
-				<sdk:size>755551010</sdk:size>
-				<sdk:checksum type="sha1">170a119bfa0f0ce5dc932405eaa3a7cc61b27694</sdk:checksum>
-				<sdk:url>android-ndk-r12b-linux-x86_64.zip</sdk:url>
+				<!--Built on: Wed Oct 12 22:27:48 2016.-->
+				<sdk:size>687311866</sdk:size>
+				<sdk:checksum type="sha1">0600157c4ddf50ec15b8a037cfc474143f718fd0</sdk:checksum>
+				<sdk:url>android-ndk-r13b-linux-x86_64.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 15 13:54:32 2016.-->
-				<sdk:size>706453972</sdk:size>
-				<sdk:checksum type="sha1">8e6eef0091dac2f3c7a1ecbb7070d4fa22212c04</sdk:checksum>
-				<sdk:url>android-ndk-r12b-windows-x86.zip</sdk:url>
+				<!--Built on: Wed Oct 12 22:26:38 2016.-->
+				<sdk:size>620461544</sdk:size>
+				<sdk:checksum type="sha1">4eb1288b1d4134a9d6474eb247f0448808d52408</sdk:checksum>
+				<sdk:url>android-ndk-r13b-windows-x86.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>32</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun 15 13:54:50 2016.-->
-				<sdk:size>749567353</sdk:size>
-				<sdk:checksum type="sha1">337746d8579a1c65e8a69bf9cbdc9849bcacf7f5</sdk:checksum>
-				<sdk:url>android-ndk-r12b-windows-x86_64.zip</sdk:url>
+				<!--Built on: Wed Oct 12 22:27:04 2016.-->
+				<sdk:size>681320123</sdk:size>
+				<sdk:checksum type="sha1">649d306559435c244cec5881b880318bb3dee53a</sdk:checksum>
+				<sdk:url>android-ndk-r13b-windows-x86_64.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:ndk>
-	<sdk:ndk>
-		<!--Generated from bid:3214847, branch:aosp-ndk-r13-release-->
-		<sdk:description>NDK</sdk:description>
-		<sdk:revision>13</sdk:revision>
+	<sdk:platform>
+		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:version>7.1.1</sdk:version>
+		<sdk:api-level>25</sdk:api-level>
+		<sdk:description>Android SDK Platform 25</sdk:description>
+		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Aug 23 15:40:55 2016.-->
-				<sdk:size>665405792</sdk:size>
-				<sdk:checksum type="sha1">0cbdb271b103a7e4237b34b73f0e56381e4632aa</sdk:checksum>
-				<sdk:url>android-ndk-r13-beta2-darwin-x86_64.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Aug 23 15:41:13 2016.-->
-				<sdk:size>686843165</sdk:size>
-				<sdk:checksum type="sha1">ea1a76d9ebdc82fe742d32798aaee7c980afd2f6</sdk:checksum>
-				<sdk:url>android-ndk-r13-beta2-linux-x86_64.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Aug 23 15:40:19 2016.-->
-				<sdk:size>619981813</sdk:size>
-				<sdk:checksum type="sha1">a5f6edceb3afa4ecd47071822ea32ba6bd6ac002</sdk:checksum>
-				<sdk:url>android-ndk-r13-beta2-windows-x86.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-				<sdk:host-bits>32</sdk:host-bits>
-			</sdk:archive>
-			<sdk:archive>
-				<!--Built on: Tue Aug 23 15:40:37 2016.-->
-				<sdk:size>680836961</sdk:size>
-				<sdk:checksum type="sha1">a0b6a0ed271b0a99cdca28ce8fd405f89defc539</sdk:checksum>
-				<sdk:url>android-ndk-r13-beta2-windows-x86_64.zip</sdk:url>
-				<sdk:host-os>windows</sdk:host-os>
-				<sdk:host-bits>64</sdk:host-bits>
+				<!--Built on: Mon Nov 14 23:49:40 2016.-->
+				<sdk:size>85434042</sdk:size>
+				<sdk:checksum type="sha1">6057e54a04f1d141f36a2c8d20f2962b41a3183f</sdk:checksum>
+				<sdk:url>platform-25_r02.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-	</sdk:ndk>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:min-tools-rev>
+			<sdk:major>22</sdk:major>
+		</sdk:min-tools-rev>
+		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+		<sdk:layoutlib>
+			<sdk:api>16</sdk:api>
+			<sdk:revision>2</sdk:revision>
+		</sdk:layoutlib>
+	</sdk:platform>
 	<sdk:platform>
 		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
 		<sdk:version>7.0</sdk:version>
@@ -1147,6 +1131,102 @@ June 2014.</sdk:license>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:source>
+	<sdk:build-tool>
+		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:revision>
+			<sdk:major>25</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>1</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Nov 14 23:49:02 2016.-->
+				<sdk:size>49880178</sdk:size>
+				<sdk:checksum type="sha1">ff063d252ab750d339f5947d06ff782836f22bac</sdk:checksum>
+				<sdk:url>build-tools_r25.0.1-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Nov 14 23:49:00 2016.-->
+				<sdk:size>49667353</sdk:size>
+				<sdk:checksum type="sha1">7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f</sdk:checksum>
+				<sdk:url>build-tools_r25.0.1-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Nov 14 23:48:57 2016.-->
+				<sdk:size>50458759</sdk:size>
+				<sdk:checksum type="sha1">c6c61393565ccf46349e7f44511e5db7c1c6169d</sdk:checksum>
+				<sdk:url>build-tools_r25.0.1-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:3359293, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:revision>
+			<sdk:major>25</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>0</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Oct 17 14:57:00 2016.-->
+				<sdk:size>49872921</sdk:size>
+				<sdk:checksum type="sha1">f2bbda60403e75cabd0f238598c3b4dfca56ea44</sdk:checksum>
+				<sdk:url>build-tools_r25-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Oct 17 14:56:58 2016.-->
+				<sdk:size>49659466</sdk:size>
+				<sdk:checksum type="sha1">273c5c29a65cbed00e44f3aa470bbd7dce556606</sdk:checksum>
+				<sdk:url>build-tools_r25-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Oct 17 14:56:56 2016.-->
+				<sdk:size>50451378</sdk:size>
+				<sdk:checksum type="sha1">f9258f2308ff8b62cfc4513d40cb961612d07b6a</sdk:checksum>
+				<sdk:url>build-tools_r25-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:3303571, branch:git_nyc-sdk-dev-->
+		<sdk:revision>
+			<sdk:major>24</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>3</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Tue Sep 27 10:00:17 2016.-->
+				<sdk:size>49779151</sdk:size>
+				<sdk:checksum type="sha1">9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304</sdk:checksum>
+				<sdk:url>build-tools_r24.0.3-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Sep 27 10:00:14 2016.-->
+				<sdk:size>49568967</sdk:size>
+				<sdk:checksum type="sha1">a01c15f1b105c34595681075e1895d58b3fff48c</sdk:checksum>
+				<sdk:url>build-tools_r24.0.3-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Sep 27 10:00:12 2016.-->
+				<sdk:size>50354788</sdk:size>
+				<sdk:checksum type="sha1">8b960d693fd4163caeb8dc5f5f5f80b10987089c</sdk:checksum>
+				<sdk:url>build-tools_r24.0.3-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
 	<sdk:build-tool>
 		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
 		<sdk:revision>
@@ -1963,64 +2043,64 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:build-tool>
 	<sdk:platform-tool>
-		<!--Generated from bid:3264814, branch:git_nyc-sdk-dev-->
+		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
 		<sdk:revision>
-			<sdk:major>24</sdk:major>
+			<sdk:major>25</sdk:major>
 			<sdk:minor>0</sdk:minor>
-			<sdk:micro>2</sdk:micro>
+			<sdk:micro>1</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Sep 12 16:08:48 2016.-->
-				<sdk:size>3341647</sdk:size>
-				<sdk:checksum type="sha1">a268850d31973d32de5c1515853f81924a4068cf</sdk:checksum>
-				<sdk:url>platform-tools_r24.0.2-linux.zip</sdk:url>
+				<!--Built on: Mon Nov 14 23:49:26 2016.-->
+				<sdk:size>3916151</sdk:size>
+				<sdk:checksum type="sha1">8e461a2c76717824d1d8e91af68216c9f230a373</sdk:checksum>
+				<sdk:url>platform-tools_r25.0.1-linux.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Mon Sep 12 16:08:48 2016.-->
-				<sdk:size>3157182</sdk:size>
-				<sdk:checksum type="sha1">16053da716cbc6ef31c32a0d2f1437b22089c88c</sdk:checksum>
-				<sdk:url>platform-tools_r24.0.2-macosx.zip</sdk:url>
+				<!--Built on: Mon Nov 14 23:49:25 2016.-->
+				<sdk:size>3732924</sdk:size>
+				<sdk:checksum type="sha1">96abc8638bf9f65435bc0ab641cc4a3ff753eed5</sdk:checksum>
+				<sdk:url>platform-tools_r25.0.1-macosx.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Mon Sep 12 16:08:47 2016.-->
-				<sdk:size>2997417</sdk:size>
-				<sdk:checksum type="sha1">ce09a7351d5c50865691554ed56325f6e5cd733c</sdk:checksum>
-				<sdk:url>platform-tools_r24.0.2-windows.zip</sdk:url>
+				<!--Built on: Mon Nov 14 23:49:25 2016.-->
+				<sdk:size>3573485</sdk:size>
+				<sdk:checksum type="sha1">75249224c12528329a151dfbc591509168ef6efd</sdk:checksum>
+				<sdk:url>platform-tools_r25.0.1-windows.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:platform-tool>
 	<sdk:tool>
-		<!--Generated from bid:3098464, branch:aosp-emu-2.2-release-->
+		<!--Generated from bid:3470232, branch:aosp-emu-2.2-release-->
 		<sdk:revision>
 			<sdk:major>25</sdk:major>
 			<sdk:minor>2</sdk:minor>
-			<sdk:micro>2</sdk:micro>
+			<sdk:micro>3</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jul 29 11:26:26 2016.-->
-				<sdk:size>273491448</sdk:size>
-				<sdk:checksum type="sha1">99257925a3d8b46fee948a7520d7b7e3e3e1890e</sdk:checksum>
-				<sdk:url>tools_r25.2.2-linux.zip</sdk:url>
+				<!--Built on: Fri Nov 11 08:51:34 2016.-->
+				<sdk:size>277861433</sdk:size>
+				<sdk:checksum type="sha1">aafe7f28ac51549784efc2f3bdfc620be8a08213</sdk:checksum>
+				<sdk:url>tools_r25.2.3-linux.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Fri Jul 29 11:26:16 2016.-->
-				<sdk:size>195856788</sdk:size>
-				<sdk:checksum type="sha1">bbaa3929696ce523ea62b58cc8032d7964a154c5</sdk:checksum>
-				<sdk:url>tools_r25.2.2-macosx.zip</sdk:url>
+				<!--Built on: Fri Nov 11 08:51:29 2016.-->
+				<sdk:size>200496727</sdk:size>
+				<sdk:checksum type="sha1">0e88c0bdb8f8ee85cce248580173e033a1bbc9cb</sdk:checksum>
+				<sdk:url>tools_r25.2.3-macosx.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Fri Jul 29 11:26:07 2016.-->
-				<sdk:size>301642481</sdk:size>
-				<sdk:checksum type="sha1">ef898dff805c4b9e39f6e77fd9ec397fb1b1f809</sdk:checksum>
-				<sdk:url>tools_r25.2.2-windows.zip</sdk:url>
+				<!--Built on: Fri Nov 11 08:51:26 2016.-->
+				<sdk:size>306745639</sdk:size>
+				<sdk:checksum type="sha1">b965decb234ed793eb9574bad8791c50ca574173</sdk:checksum>
+				<sdk:url>tools_r25.2.3-windows.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 			</sdk:archive>
 		</sdk:archives>
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index 182fdded2bd..84ebee5a75f 100644
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "35";
+  version = "40";
   name = "android-support-repository-r${version}";
   src = fetchurl {
     url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
-    sha1 = "2wi1b38n3dmnikpwbwcbyy2xfws1683s";
+    sha1 = "782e7233f18c890463e8602571d304e680ce354c";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 237f1348232..807d4976296 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-09-12 21:35:04.795787 with ADRT.-->
+	<!--Generated on 2016-11-23 16:51:35.431708 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -404,6 +404,23 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 
 10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
 </sdk:license>
+	<sdk:system-image>
+		<!--Generated from bid:3093079, branch:git_gb-emu-release-->
+		<sdk:api-level>10</sdk:api-level>
+		<sdk:description>ARM EABI v7a System Image</sdk:description>
+		<sdk:revision>4</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Fri Sep 16 16:38:16 2016.-->
+				<sdk:size>67918042</sdk:size>
+				<sdk:checksum type="sha1">54680383118eb5c95a11e1cc2a14aa572c86ee69</sdk:checksum>
+				<sdk:url>armv7-10_r04.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>armeabi-v7a</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
 	<sdk:system-image>
 		<!--Generated from bid:229537, branch:git_ics-mr0-->
 		<sdk:api-level>14</sdk:api-level>
@@ -422,16 +439,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1741834, branch:git_ics-mr1-->
+		<!--Generated from bid:3462039, branch:git_ics-mr1-emu-release-->
 		<sdk:api-level>15</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:24:59 2016.-->
-				<sdk:size>96240395</sdk:size>
-				<sdk:checksum type="sha1">0a47f586e172b1cf3db2ada857a70c2bdec24ef8</sdk:checksum>
-				<sdk:url>sysimg_armv7a-15_r03.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:19:27 2016.-->
+				<sdk:size>102079727</sdk:size>
+				<sdk:checksum type="sha1">363223bd62f5afc0b2bd760b54ce9d26b31eacf1</sdk:checksum>
+				<sdk:url>armeabi-v7a-15_r04.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -456,16 +473,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1742939, branch:git_jb-mr1.1-dev-->
+		<!--Generated from bid:3453820, branch:git_jb-mr1.1-emu-release-->
 		<sdk:api-level>17</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:00 2016.-->
-				<sdk:size>118663847</sdk:size>
-				<sdk:checksum type="sha1">97cfad22b51c8475e228b207dd36dbef1c18fa38</sdk:checksum>
-				<sdk:url>sysimg_armv7a-17_r03.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:19:54 2016.-->
+				<sdk:size>124238679</sdk:size>
+				<sdk:checksum type="sha1">7460e8110f4a87f9644f1bdb5511a66872d50fd9</sdk:checksum>
+				<sdk:url>armeabi-v7a-17_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -473,16 +490,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1743067, branch:git_jb-mr2-dev-->
+		<!--Generated from bid:3462034, branch:git_jb-mr2-emu-release-->
 		<sdk:api-level>18</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:01 2016.-->
-				<sdk:size>125503391</sdk:size>
-				<sdk:checksum type="sha1">2d7d51f4d2742744766511e5d6b491bd49161c51</sdk:checksum>
-				<sdk:url>sysimg_armv7a-18_r03.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:20:07 2016.-->
+				<sdk:size>130394401</sdk:size>
+				<sdk:checksum type="sha1">0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642</sdk:checksum>
+				<sdk:url>armeabi-v7a-18_r04.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -490,16 +507,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1743154, branch:git_klp-dev-->
+		<!--Generated from bid:3462041, branch:git_klp-emu-release-->
 		<sdk:api-level>19</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:02 2016.-->
-				<sdk:size>159399028</sdk:size>
-				<sdk:checksum type="sha1">5daf7718e3ab03d9bd8792b492dd305f386ef12f</sdk:checksum>
-				<sdk:url>sysimg_armv7a-19_r03.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:20:23 2016.-->
+				<sdk:size>159871567</sdk:size>
+				<sdk:checksum type="sha1">d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa</sdk:checksum>
+				<sdk:url>armeabi-v7a-19_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -507,16 +524,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1772600, branch:git_lmp-sdk-release-->
+		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:03 2016.-->
-				<sdk:size>186521381</sdk:size>
-				<sdk:checksum type="sha1">0b2e21421d29f48211b5289ca4addfa7f4c7ae5a</sdk:checksum>
-				<sdk:url>sysimg_arm-21_r03.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:35:34 2016.-->
+				<sdk:size>187163871</sdk:size>
+				<sdk:checksum type="sha1">8c606f81306564b65e41303d2603e4c42ded0d10</sdk:checksum>
+				<sdk:url>armeabi-v7a-21_r04.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -524,16 +541,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1737576, branch:git_lmp-mr1-sdk-release-->
+		<!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release-->
 		<sdk:api-level>22</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
+		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:24:58 2016.-->
-				<sdk:size>193687339</sdk:size>
-				<sdk:checksum type="sha1">2aa6a887ee75dcf3ac34627853d561997792fcb8</sdk:checksum>
-				<sdk:url>sysimg_arm-22_r01.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:35:50 2016.-->
+				<sdk:size>194596267</sdk:size>
+				<sdk:checksum type="sha1">2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1</sdk:checksum>
+				<sdk:url>armeabi-v7a-22_r02.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -541,16 +558,17 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2166767, branch:git_mnc-release-->
+		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>ARM EABI v7a System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:04 2016.-->
-				<sdk:size>226879660</sdk:size>
-				<sdk:checksum type="sha1">7bb8768ec4333500192fd9627d4234f505fa98dc</sdk:checksum>
-				<sdk:url>sysimg_arm-23_r03.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:41:26 2016.-->
+				<sdk:size>238333358</sdk:size>
+				<sdk:checksum type="sha1">7cf2ad756e54a3acfd81064b63cb0cb9dff2798d</sdk:checksum>
+				<sdk:url>armeabi-v7a-23_r06.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -643,16 +661,67 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:1, branch:-->
+		<!--Generated from bid:3093079, branch:git_gb-emu-release-->
 		<sdk:api-level>10</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
+		<sdk:revision>4</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Fri Sep 16 16:10:43 2016.-->
+				<sdk:size>75382637</sdk:size>
+				<sdk:checksum type="sha1">655ffc5cc89dd45a3aca154b254009016e473aeb</sdk:checksum>
+				<sdk:url>x86-10_r04.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>x86</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:3462039, branch:git_ics-mr1-emu-release-->
+		<sdk:api-level>15</sdk:api-level>
+		<sdk:description>Intel x86 Atom System Image</sdk:description>
+		<sdk:revision>4</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu Nov 10 17:20:36 2016.-->
+				<sdk:size>115324561</sdk:size>
+				<sdk:checksum type="sha1">e45c728b64881c0e86529a8f7ea9c103a3cd14c1</sdk:checksum>
+				<sdk:url>x86-15_r04.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>x86</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:3462064, branch:git_jb-emu-release-->
+		<sdk:api-level>16</sdk:api-level>
+		<sdk:description>Intel x86 Atom System Image</sdk:description>
+		<sdk:revision>5</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu Nov 10 17:20:52 2016.-->
+				<sdk:size>134339698</sdk:size>
+				<sdk:checksum type="sha1">7ea16da3a8fdb880b1b290190fcc1bde2821c1e0</sdk:checksum>
+				<sdk:url>x86-16_r05.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>x86</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:3453820, branch:git_jb-mr1.1-emu-release-->
+		<sdk:api-level>17</sdk:api-level>
+		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:24:58 2016.-->
-				<sdk:size>66997702</sdk:size>
-				<sdk:checksum type="sha1">6b8539eaca9685d2d3289bf8e6d21d366d791326</sdk:checksum>
-				<sdk:url>sysimg_x86-10_r03.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:21:06 2016.-->
+				<sdk:size>142951842</sdk:size>
+				<sdk:checksum type="sha1">eb30274460ff0d61f3ed37862b567811bebd8270</sdk:checksum>
+				<sdk:url>x86-17_r03.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -660,67 +729,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2, branch:-->
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:04 2016.-->
-				<sdk:size>109019058</sdk:size>
-				<sdk:checksum type="sha1">56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f</sdk:checksum>
-				<sdk:url>sysimg_x86-15_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3, branch:unknown-->
-		<sdk:api-level>16</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:12 2016.-->
-				<sdk:size>135252264</sdk:size>
-				<sdk:checksum type="sha1">36c2a2e394bcb3290583ce09815eae7711d0b2c2</sdk:checksum>
-				<sdk:url>sysimg_x86-16_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1742939, branch:git_jb-mr1.1-dev-->
-		<sdk:api-level>17</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:01 2016.-->
-				<sdk:size>136075512</sdk:size>
-				<sdk:checksum type="sha1">bd8c7c5411431af7e051cbe961be430fc31e773d</sdk:checksum>
-				<sdk:url>sysimg_x86-17_r02.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1743067, branch:git_jb-mr2-dev-->
+		<!--Generated from bid:3462034, branch:git_jb-mr2-emu-release-->
 		<sdk:api-level>18</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>2</sdk:revision>
+		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:02 2016.-->
-				<sdk:size>143899902</sdk:size>
-				<sdk:checksum type="sha1">ab3de121a44fca43ac3aa83f7d68cc47fc643ee8</sdk:checksum>
-				<sdk:url>sysimg_x86-18_r02.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:21:19 2016.-->
+				<sdk:size>149657535</sdk:size>
+				<sdk:checksum type="sha1">03a0cb23465c3de15215934a1dbc9715b56e9458</sdk:checksum>
+				<sdk:url>x86-18_r03.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -728,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2872501, branch:git_klp-emu-release-->
+		<!--Generated from bid:3462041, branch:git_klp-emu-release-->
 		<sdk:api-level>19</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon May 16 16:26:22 2016.-->
-				<sdk:size>183946064</sdk:size>
-				<sdk:checksum type="sha1">c9298a8eafceed3b8fa11071ba63a3d18e17fd8e</sdk:checksum>
-				<sdk:url>sysimg_x86-19_r05.zip</sdk:url>
+				<!--Built on: Thu Nov 10 17:21:38 2016.-->
+				<sdk:size>183968605</sdk:size>
+				<sdk:checksum type="sha1">1d98426467580abfd03c724c5344450f5d0df379</sdk:checksum>
+				<sdk:url>x86-19_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -745,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2781484, branch:git_lmp-emu-release-->
+		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Apr 21 08:05:21 2016.-->
-				<sdk:size>206323409</sdk:size>
-				<sdk:checksum type="sha1">3b78ad294aa1cdefa4be663d4af6c80d920ec49e</sdk:checksum>
-				<sdk:url>sysimg_x86-21_r04.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:12:20 2016.-->
+				<sdk:size>206305926</sdk:size>
+				<sdk:checksum type="sha1">c7732f45c931c0eaa064e57e8c054bce86c30e54</sdk:checksum>
+				<sdk:url>x86-21_r04.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -762,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2780077, branch:git_lmp-mr1-emu-release-->
+		<!--Generated from bid:3079158, branch:git_lmp-mr1-emu-release-->
 		<sdk:api-level>22</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Apr 20 08:41:31 2016.-->
-				<sdk:size>212301282</sdk:size>
-				<sdk:checksum type="sha1">909e0ad91ed43381597e82f65ec93d41f049dd53</sdk:checksum>
-				<sdk:url>sysimg_x86-22_r05.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:12:40 2016.-->
+				<sdk:size>212327460</sdk:size>
+				<sdk:checksum type="sha1">7e2c93891ea9efec07dccccf6b9ab051a014dbdf</sdk:checksum>
+				<sdk:url>x86-22_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -779,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2780065, branch:git_mnc-emu-release-->
+		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>9</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Apr 20 08:41:52 2016.-->
-				<sdk:size>252059065</sdk:size>
-				<sdk:checksum type="sha1">0ce9229974818179833899dce93f228a895ec6a2</sdk:checksum>
-				<sdk:url>sysimg_x86-23_r09.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:13:52 2016.-->
+				<sdk:size>260241399</sdk:size>
+				<sdk:checksum type="sha1">d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1</sdk:checksum>
+				<sdk:url>x86-23_r09.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -813,16 +831,34 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2781484, branch:git_lmp-emu-release-->
+		<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
+		<sdk:api-level>25</sdk:api-level>
+		<sdk:description>Google APIs Intel x86 Atom System Image</sdk:description>
+		<sdk:revision>3</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Nov 14 16:41:48 2016.-->
+				<sdk:size>703131759</sdk:size>
+				<sdk:checksum type="sha1">7dd19cfee4e43a1f60e0f5f058404d92d9544b33</sdk:checksum>
+				<sdk:url>x86-25_r03.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-preview-license"/>
+		<sdk:abi>x86</sdk:abi>
+		<sdk:tag-id>google_apis</sdk:tag-id>
+		<sdk:tag-display>Google APIs</sdk:tag-display>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Apr 21 08:05:44 2016.-->
-				<sdk:size>290590059</sdk:size>
-				<sdk:checksum type="sha1">eb14ba9c14615d5e5a21c854be29aa903d9bb63d</sdk:checksum>
-				<sdk:url>sysimg_x86_64-21_r04.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:08:22 2016.-->
+				<sdk:size>290608820</sdk:size>
+				<sdk:checksum type="sha1">9b2d64a69a72fa596c386899a742a404308f2c92</sdk:checksum>
+				<sdk:url>x86_64-21_r04.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -830,16 +866,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2780077, branch:git_lmp_mr1-emu-release-->
+		<!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release-->
 		<sdk:api-level>22</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Apr 20 08:44:05 2016.-->
-				<sdk:size>297851141</sdk:size>
-				<sdk:checksum type="sha1">8a04ff4fb30f70414e6ec7b3b06285f316e93d08</sdk:checksum>
-				<sdk:url>sysimg_x86_64-22_r05.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:08:46 2016.-->
+				<sdk:size>297850561</sdk:size>
+				<sdk:checksum type="sha1">99d1d6c77e92284b4210640edf6c81eceb28520d</sdk:checksum>
+				<sdk:url>x86_64-22_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -847,16 +883,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:2780065, branch:git_mnc-emu-release-->
+		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
 		<sdk:revision>9</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Apr 20 08:44:42 2016.-->
-				<sdk:size>349443901</sdk:size>
-				<sdk:checksum type="sha1">571f5078a3d337a9144e2af13bd23ca46845a979</sdk:checksum>
-				<sdk:url>sysimg_x86_64-23_r09.zip</sdk:url>
+				<!--Built on: Fri Sep 16 16:09:15 2016.-->
+				<sdk:size>363794271</sdk:size>
+				<sdk:checksum type="sha1">84cc076eacec043c8e88382c6ab391b0cd5c0695</sdk:checksum>
+				<sdk:url>x86_64-23_r09.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -880,4 +916,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:abi>x86_64</sdk:abi>
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
+		<sdk:api-level>25</sdk:api-level>
+		<sdk:description>Google APIs Intel x86 Atom_64 System Image</sdk:description>
+		<sdk:revision>3</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Nov 14 16:42:52 2016.-->
+				<sdk:size>912938750</sdk:size>
+				<sdk:checksum type="sha1">4593ee04811df21c339f3374fc5917843db06f8d</sdk:checksum>
+				<sdk:url>x86_64-25_r03.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-preview-license"/>
+		<sdk:abi>x86_64</sdk:abi>
+		<sdk:tag-id>google_apis</sdk:tag-id>
+		<sdk:tag-display>Google APIs</sdk:tag-display>
+	</sdk:system-image>
 </sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 2c8e1b33a46..89c48e5fb59 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -15,11 +15,19 @@ let
 in
 {
 
+  sysimg_armeabi-v7a_10 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-10";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip;
+      sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69";
+    };
+  };
+
   sysimg_x86_10 = buildSystemImage {
     name = "sysimg-x86-10";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip;
-      sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip;
+      sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb";
     };
   };
 
@@ -34,8 +42,8 @@ in
   sysimg_armeabi-v7a_15 = buildSystemImage {
     name = "sysimg-armeabi-v7a-15";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip;
-      sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip;
+      sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1";
     };
   };
 
@@ -50,8 +58,8 @@ in
   sysimg_x86_15 = buildSystemImage {
     name = "sysimg-x86-15";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip;
-      sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip;
+      sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1";
     };
   };
 
@@ -74,16 +82,16 @@ in
   sysimg_x86_16 = buildSystemImage {
     name = "sysimg-x86-16";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip;
-      sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip;
+      sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0";
     };
   };
 
   sysimg_armeabi-v7a_17 = buildSystemImage {
     name = "sysimg-armeabi-v7a-17";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip;
-      sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip;
+      sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9";
     };
   };
 
@@ -98,112 +106,112 @@ in
   sysimg_x86_17 = buildSystemImage {
     name = "sysimg-x86-17";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip;
-      sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip;
+      sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270";
     };
   };
 
   sysimg_armeabi-v7a_18 = buildSystemImage {
     name = "sysimg-armeabi-v7a-18";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip;
-      sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip;
+      sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642";
     };
   };
 
   sysimg_x86_18 = buildSystemImage {
     name = "sysimg-x86-18";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip;
-      sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip;
+      sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458";
     };
   };
 
   sysimg_armeabi-v7a_19 = buildSystemImage {
     name = "sysimg-armeabi-v7a-19";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip;
-      sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip;
+      sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
     };
   };
 
   sysimg_x86_19 = buildSystemImage {
     name = "sysimg-x86-19";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r05.zip;
-      sha1 = "c9298a8eafceed3b8fa11071ba63a3d18e17fd8e";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip;
+      sha1 = "1d98426467580abfd03c724c5344450f5d0df379";
     };
   };
 
   sysimg_armeabi-v7a_21 = buildSystemImage {
     name = "sysimg-armeabi-v7a-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
-      sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip;
+      sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
     };
   };
 
   sysimg_x86_21 = buildSystemImage {
     name = "sysimg-x86-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r04.zip;
-      sha1 = "3b78ad294aa1cdefa4be663d4af6c80d920ec49e";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip;
+      sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54";
     };
   };
 
   sysimg_x86_64_21 = buildSystemImage {
     name = "sysimg-x86_64-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r04.zip;
-      sha1 = "eb14ba9c14615d5e5a21c854be29aa903d9bb63d";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip;
+      sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92";
     };
   };
 
   sysimg_armeabi-v7a_22 = buildSystemImage {
     name = "sysimg-armeabi-v7a-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip;
-      sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip;
+      sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
     };
   };
 
   sysimg_x86_22 = buildSystemImage {
     name = "sysimg-x86-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r05.zip;
-      sha1 = "909e0ad91ed43381597e82f65ec93d41f049dd53";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip;
+      sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf";
     };
   };
 
   sysimg_x86_64_22 = buildSystemImage {
     name = "sysimg-x86_64-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r05.zip;
-      sha1 = "8a04ff4fb30f70414e6ec7b3b06285f316e93d08";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip;
+      sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d";
     };
   };
 
   sysimg_armeabi-v7a_23 = buildSystemImage {
     name = "sysimg-armeabi-v7a-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip;
-      sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc";
+      url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip;
+      sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
     };
   };
 
   sysimg_x86_23 = buildSystemImage {
     name = "sysimg-x86-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r09.zip;
-      sha1 = "0ce9229974818179833899dce93f228a895ec6a2";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip;
+      sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1";
     };
   };
 
   sysimg_x86_64_23 = buildSystemImage {
     name = "sysimg-x86_64-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r09.zip;
-      sha1 = "571f5078a3d337a9144e2af13bd23ca46845a979";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip;
+      sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695";
     };
   };
 
@@ -238,4 +246,21 @@ in
       sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba";
     };
   };
+
+  sysimg_x86_25 = buildSystemImage {
+    name = "sysimg-x86-25";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip;
+      sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33";
+    };
+  };
+
+  sysimg_x86_64_25 = buildSystemImage {
+    name = "sysimg-x86_64-25";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip;
+      sha1 = "4593ee04811df21c339f3374fc5917843db06f8d";
+    };
+  };
 }
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3804014a1df..a5a4309ce77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -551,9 +551,9 @@ in
 
   inherit (androidenv) androidsdk_4_4 androidndk;
 
-  androidsdk = androidenv.androidsdk_6_0;
+  androidsdk = androidenv.androidsdk_7_0;
 
-  androidsdk_extras = self.androidenv.androidsdk_6_0_extras;
+  androidsdk_extras = self.androidenv.androidsdk_7_0_extras;
 
   arc-theme = callPackage ../misc/themes/arc { };
 

From 8b8df71b8763ca0e5fa29b3940412c48dda1bbca Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 10 Dec 2016 13:09:47 +0100
Subject: [PATCH 023/295] strace: 4.13 -> 4.14

---
 pkgs/development/tools/misc/strace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 5eafbf68fb7..5152067efa1 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.13";
+  version = "4.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7";
+    sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav";
   };
 
   nativeBuildInputs = [ perl ];

From a1d9d7efc0cf106462228ce397a106d3b0d36a9d Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Wed, 7 Dec 2016 19:22:26 +0100
Subject: [PATCH 024/295] btrbk: 0.22.2 -> 0.24.0

---
 pkgs/tools/backup/btrbk/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 5faeb926c06..ff542e781a6 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, coreutils, bash, btrfs-progs, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.22.2";
+  version = "0.24.0";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "1gbgi0dp62wlw7y72pgxjs6byxkrk73g35kqxzw0gjf32r5i4sb8";
+    sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3";
   };
 
   patches = [
     # https://github.com/digint/btrbk/pull/74
     ./btrbk-Prefix-PATH-instead-of-resetting-it.patch
-    # https://github.com/digint/btrbk/pull/73
-    ./btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch
   ];
 
   buildInputs = with perlPackages; [ makeWrapper perl DateCalc ];
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/sbin/btrbk \
       --set PERL5LIB $PERL5LIB \
-      --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}"
+      --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}"
   '';
 
   meta = with stdenv.lib; {

From 033525c6b85ae01bbe717a3a585126f15abf86f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Dec 2016 14:21:34 +0100
Subject: [PATCH 025/295] dstat: fix bad interpreter: No such file

---
 pkgs/os-specific/linux/dstat/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index c8e40a4c7ac..ccedc381504 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python2Packages }:
 
-stdenv.mkDerivation rec {
+python2Packages.mkPythonDerivation rec {
   name = "dstat-${version}";
   version = "0.7.3";
 
@@ -9,21 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
   };
 
-  buildInputs = with python2Packages; [ python-wifi wrapPython ];
-
-  pythonPath = with python2Packages; [ python-wifi ];
-
-  patchPhase = ''
-    sed -i -e 's|/usr/bin/env python|${python2Packages.python.interpreter}|' \
-           -e "s|/usr/share/dstat|$out/share/dstat|" dstat
-  '';
+  propagatedBuildInputs = with python2Packages; [ python-wifi ];
 
   makeFlags = [ "prefix=$(out)" ];
 
-  postInstall = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://dag.wieers.com/home-made/dstat/;
     description = "Versatile resource statistics tool";

From 9074d9859e44390ee1deec2c27cef6c9780b0c8c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 10 Dec 2016 17:08:42 +0100
Subject: [PATCH 026/295] linux: add patch to fix CVE-2016-8655

See https://lwn.net/Articles/708319/ for more information.
---
 pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++-
 pkgs/top-level/all-packages.nix           | 26 +++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 3fab12b64a6..66f03edbdf2 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -149,6 +149,14 @@ rec {
         url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git"
             + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52";
         sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc";
+      };
+    };
+
+  packet_fix_race_condition_CVE_2016_8655 =
+    { name = "packet_fix_race_condition_CVE_2016_8655.patch";
+      patch = fetchpatch {
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c";
+        sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";
+      };
     };
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1959cbe4645..07b5f4d021a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10927,6 +10927,7 @@ in
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -10936,11 +10937,18 @@ in
   };
 
   linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ];
+    kernelPatches = with kernelPatches; [
+      bridge_stp_helper
+      packet_fix_race_condition_CVE_2016_8655
+    ];
   };
 
   linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
-    kernelPatches = with kernelPatches; [ bridge_stp_helper lguest_entry-linkage ]
+    kernelPatches = with kernelPatches;
+      [ bridge_stp_helper
+        lguest_entry-linkage
+        packet_fix_race_condition_CVE_2016_8655
+      ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
@@ -10949,7 +10957,11 @@ in
   };
 
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
-    kernelPatches = with kernelPatches; [ bridge_stp_helper crc_regression ]
+    kernelPatches = with kernelPatches;
+      [ bridge_stp_helper
+        crc_regression
+        packet_fix_race_condition_CVE_2016_8655
+      ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
@@ -10958,7 +10970,10 @@ in
   };
 
   linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.packet_fix_race_condition_CVE_2016_8655
+      ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
@@ -10969,6 +10984,7 @@ in
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -10981,6 +10997,7 @@ in
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -10997,6 +11014,7 @@ in
         # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 9243703c5cc9c9e48aa3f07d91b9384253c9d9ed Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei@boronine.com>
Date: Sun, 11 Dec 2016 00:29:50 +0800
Subject: [PATCH 027/295] mbedtls: fix build for Darwin (#20940)

mbedtls: fix build for darwin
---
 .../development/libraries/mbedtls/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index b7d6fb25ecc..fab18516168 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace library/Makefile --replace "-soname" "-install_name"
+    substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
+    # Necessary for install_name_tool below
+    echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile
+  '';
+
   postPatch = ''
     patchShebangs .
   '';
@@ -22,6 +29,18 @@ stdenv.mkDerivation rec {
     "DESTDIR=\${out}"
   ];
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedtls.so.10
+      install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedx509.so.0
+      install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $out/lib/libmbedtls.so.10
+
+      for exe in $out/bin/*; do
+          install_name_tool -change libmbedtls.so.10 $out/lib/libmbedtls.so.10 $exe
+          install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $exe
+          install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $exe
+      done
+  '';
+
   doCheck = true;
 
   meta = with stdenv.lib; {

From 2698757095337426d8fd72119bebacce038e91cf Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Sat, 10 Dec 2016 17:50:24 +0100
Subject: [PATCH 028/295] steam: added documentation to nixpkgs manual

---
 doc/package-notes.xml | 137 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index f0015a7f9ac..de148ec5739 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -382,4 +382,141 @@ it. Place the resulting <filename>package.nix</filename> file into
 
 </section>
 
+<section xml:id="sec-steam">
+
+<title>Steam</title>
+
+<section xml:id="sec-steam-nix">
+
+<title>Steam in Nix</title>
+
+<para>
+  Steam is distributed as a <filename>.deb</filename> file, for now only 
+  as an i686 package (the amd64 package only has documentation). 
+  When unpacked, it has a script called <filename>steam</filename> that 
+  in ubuntu (their target distro) would go to <filename>/usr/bin
+  </filename>. When run for the first time, this script copies some 
+  files to the user's home, which include another script that is the 
+  ultimate responsible for launching the steam binary, which is also 
+  in $HOME.
+</para>
+<para>
+  Nix problems and constraints:
+<itemizedlist>
+  <listitem><para>We don't have <filename>/bin/bash</filename> and many 
+  scripts point there. Similarly for <filename>/usr/bin/python</filename>
+  .</para></listitem>
+  <listitem><para>We don't have the dynamic loader in <filename>/lib
+  </filename>.</para></listitem>
+  <listitem><para>The <filename>steam.sh</filename> script in $HOME can 
+  not be patched, as it is checked and rewritten by steam.</para></listitem>
+  <listitem><para>The steam binary cannot be patched, it's also checked.</para></listitem>
+</itemizedlist>
+</para>
+<para>
+  The current approach to deploy Steam in NixOS is composing a FHS-compatible
+  chroot environment, as documented
+  <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>.
+  This allows us to have binaries in the expected paths without disrupting the system,
+  and to avoid patching them.
+</para>
+
+</section>
+
+<section xml:id="sec-steam-play">
+
+<title>How to play</title>
+
+<para>
+  For 64-bit systems it's important to have 
+  <programlisting>hardware.opengl.driSupport32Bit = true;</programlisting> 
+  in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need 
+  <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting> 
+  if you are using PulseAudio - this will enable 32bit ALSA apps integration.
+  To use the Steam controller, you need to add
+  <programlisting>services.udev.extraRules = ''
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
+    KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput"
+  '';</programlisting>
+  to your configuration.
+</para>
+
+</section>
+
+<section xml:id="sec-steam-troub">
+
+<title>Troubleshooting</title>
+
+<para>
+<variablelist>
+
+  <varlistentry>
+    <term>Steam fails to start. What do I do?</term>
+    <listitem><para>Try to run 
+    <programlisting>strace steam</programlisting>
+    to see what is causing steam to fail.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Game X fails to start</term>
+    <listitem><para>Games may fail to start because they lack 
+    dependencies (this should be added to the script, for now), 
+    or because they cannot be patched.The steps to launch a game 
+    directly are: 
+    <orderedlist>
+    <listitem><para>Patch the script/binary if you can.</para></listitem>
+    <listitem><para>Add a file named <filename>steam_appid.txt</filename> in 
+    the binary folder, with the appid as contents (it can be found in the 
+    stdout from steam).</para></listitem>
+    <listitem><para>Using the LD_LIBRARY_PATH from the nix/store steam script, 
+    with some additions, launch the game binary:
+    <programlisting>LD_LIBRARY_PATH=~/.steam/bin32:$LD_LIBRARY_PATH:/nix/store/pfsa... blabla ...curl-7.29.0/lib:. ./Osmos.bin3
+    </programlisting> (if you could not patchelf the game, call ld.so directly 
+    with the binary as param). With this technique, I can play many games
+    directly from steam. Others, like Team Fortress, cannot be patched
+    so I only managed to run them from the cmd line.
+    </para></listitem>
+    </orderedlist>
+    </para>
+    </listitem>
+  </varlistentry>
+  
+  <varlistentry>
+  <term>Using the FOSS Radeon drivers</term>
+  <listitem><itemizedlist><listitem><para>
+  The open source radeon drivers need a newer libc++ than is provided 
+  by the default runtime, which leads to a crash on launch. Use
+  <programlisting>environment.systemPackages = [(pkgs.steam.override { newStdcpp = true; })];</programlisting>
+  in your config if you get an error like
+  <programlisting>
+libGL error: unable to load driver: radeonsi_dri.so
+libGL error: driver pointer missing
+libGL error: failed to load driver: radeonsi
+libGL error: unable to load driver: swrast_dri.so
+libGL error: failed to load driver: swrast</programlisting></para></listitem>
+  <listitem><para>
+  Steam ships statically linked with a version of libcrypto that
+  conflics with the one dynamically loaded by radeonsi_dri.so.
+  If you get the error
+  <programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting>
+  have a look at <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this pull request</link>.
+  </para></listitem>
+  </itemizedlist></listitem></varlistentry>
+
+  <varlistentry>
+  <term>Known issues</term>
+  <listitem><orderedlist>
+  <listitem><para>
+  No java in steam chrootenv. Games affected: Towns:
+  <programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting>
+  </para></listitem>
+  </orderedlist></listitem></varlistentry>
+
+</variablelist>
+</para>
+
+</section>
+
+</section>
+
 </chapter>

From e942ed29b3c6778dc4d31d328b15aa8d63116dbe Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Sat, 10 Dec 2016 09:30:39 -0800
Subject: [PATCH 029/295] rubygems: 2.6.6 -> 2.6.8 (#21028)

---
 pkgs/development/interpreters/ruby/rubygems-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index 59b2becdc6e..7ea52185d77 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,6 +1,6 @@
 { fetchurl
-, version ? "2.6.6"
-, sha256 ? "0x0ldlwr627d0brw96jdbscib6d2nk19izvnh8lzsasszi1k5rkq"
+, version ? "2.6.8"
+, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1"
 }:
 fetchurl {
   url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";

From ec7cdd95a7f0b323c11ad3ae054f812607e6d784 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@users.noreply.github.com>
Date: Sat, 10 Dec 2016 17:42:52 +0000
Subject: [PATCH 030/295] direnv: 2.9.0 -> 2.10.0

---
 pkgs/tools/misc/direnv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index d8b5a1e9591..596df416743 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "direnv-${version}";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "1zi4i2ds8xkbhfcpi52hca4lcwan9gf93bdmd2vwdsry16kn3f6k";
+    sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3";
   };
 
   buildInputs = [ go ];

From bdab6fe5a16680adafdda6ab728065a740de177b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 10 Dec 2016 20:19:35 +0200
Subject: [PATCH 031/295] kernel: Use built-in dtbs_install target instead of
 rolling our own

In particular, on aarch64 all the .dtb files will be in subdirectories
and *.dtb won't match anything.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 4ab688c26af..5f890b9b9fe 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -129,9 +129,7 @@ let
       '' + (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
       '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
-        make $makeFlags "''${makeFlagsArray[@]}" dtbs
-        mkdir -p $out/dtbs
-        cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
+        make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
       '' else "") + (if isModular then ''
         if [ -z "$dontStrip" ]; then
           installFlagsArray+=("INSTALL_MOD_STRIP=1")

From 19b96176b46a0c5a6ef0bc4ad56e5233ca32e1c9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 13:11:36 +0100
Subject: [PATCH 032/295] couchdb service: fix test in preStart

Otherwise you'd get errors like "-f no such command".
---
 nixos/modules/services/databases/couchdb.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index ae0589b399e..d4d231456c5 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -162,7 +162,7 @@ in {
 
         if [ "$(id -u)" = 0 ]; then
           chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`;
-          (-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true
+          (test -f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true
           chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
           chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
           chown ${cfg.user}:${cfg.group} ${cfg.configFile}

From fafb6657c138d725948412481b4720aff0e13863 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 13:12:20 +0100
Subject: [PATCH 033/295] syslogd service: assert conflict with rsyslogd

Enabling both these at the same time fails because they implement the
same interface.
---
 nixos/modules/services/logging/syslogd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index a0f8e89fa69..fe0b0490811 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
@@ -100,6 +100,12 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions =
+      [ { assertion = !config.services.rsyslogd.enable;
+          message = "rsyslogd conflicts with syslogd";
+        }
+      ];
+
     environment.systemPackages = [ pkgs.sysklogd ];
 
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";

From 2a4902dd802fee13c662d4b801f4e76fd353811c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 15:32:17 +0100
Subject: [PATCH 034/295] dante service: fix config option type

The type was simply str but the default is null, thus resulting in a
conversion error if the user fails to declare a value.
---
 nixos/modules/services/networking/dante.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix
index 8f4e15223ab..a9a77f3412a 100644
--- a/nixos/modules/services/networking/dante.nix
+++ b/nixos/modules/services/networking/dante.nix
@@ -22,7 +22,7 @@ in
 
       config = mkOption {
         default     = null;
-        type        = types.str;
+        type        = types.nullOr types.str;
         description = ''
           Contents of Dante's configuration file
           NOTE: user.privileged/user.unprivileged are set by the service

From 4697f83984f0f1e3b58267fcef3b15b7ce60901b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 15:39:25 +0100
Subject: [PATCH 035/295] openfire service: more informative assertion failure
 message

Explain why the assertion fails; the user already knows that it *has*
failed.
---
 nixos/modules/services/networking/openfire.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index 454b504eda2..4059eb3db83 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -34,7 +34,7 @@ with lib;
 
     assertions = singleton
       { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
-        message = "OpenFire assertion failed.";
+        message = "OpenFire configured to use PostgreSQL but services.postgresql.enable is not enabled.";
       };
 
     systemd.services.openfire = {

From 230994a30a33ff131d3e39c8f2deccb1919119f9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 16:38:33 +0100
Subject: [PATCH 036/295] psd service: assert that at least one user must be
 configured

Using the default config, a user will experience a run-time failure.
This is poor UX, assert the requirement up-front.
---
 nixos/modules/services/desktops/profile-sync-daemon.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index d66ecef2385..e3f74df3e57 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -86,6 +86,12 @@ in {
   };
 
   config = mkIf cfg.enable {
+    assertions = [
+      { assertion = cfg.users != [];
+        message = "services.psd.users must contain at least one user";
+      }
+    ];
+
     systemd = {
       services = {
         psd = {

From b69822c505e58110d3c5325776e30a1500d734e4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 10 Dec 2016 15:15:44 -0500
Subject: [PATCH 037/295] linux: 4.8.13 -> 4.8.14

---
 pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index 786589ca534..b6121fbd1b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.13";
+  version = "4.8.14";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d";
+    sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07b5f4d021a..68740ede464 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11014,7 +11014,6 @@ in
         # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From f576c490e369b0cc785e789f15523267d98667d2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 10 Dec 2016 15:18:52 -0500
Subject: [PATCH 038/295] linux: 4.4.37 -> 4.4.38

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 184e420373a..baf011a1b8e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.37";
+  version = "4.4.38";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pyfva1ld4yfzc0gyz3q4m7j6k88l813akp5hhszfg8m69bzn27d";
+    sha256 = "19hn51cpyvq3igilm0xw4ivbmdah5ryah6rpkwgqly351djrxvbp";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68740ede464..4667c90de09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10997,7 +10997,6 @@ in
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From e8cd9ce8da6582b6a5ad9f527f85d1e2766d8fc1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 10 Dec 2016 15:51:06 -0500
Subject: [PATCH 039/295] ammonite-repl: 0.8.0 -> 0.8.1

---
 pkgs/development/tools/ammonite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index f9d3b3bfb20..74c15adc483 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-repl-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}";
-    sha256 = "1427p90nyizds8799nih527vixnw8qrwdih60bnd1aywz703yr7v";
+    sha256 = "0xwy05yfqr1dfypka9wnm60wm0q60kmckzxfp5x79aib94f5ds51";
   };
 
   propagatedBuildInputs = [ jre ] ;

From bed668c051bbaba083e4c57a14fd7c2a45cda949 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 10 Dec 2016 16:49:45 -0600
Subject: [PATCH 040/295] openblas: refactor and set TARGET always

---
 .../science/math/openblas/default.nix         | 91 +++++++++++++------
 1 file changed, 61 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e0e8c268629..fbe11db165f 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, gfortran, perl, which, config, coreutils
-# Most packages depending on openblas expect integer width to match pointer width,
-# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+# Most packages depending on openblas expect integer width to match
+# pointer width, but some expect to use 32-bit integers always
+# (for compatibility with reference BLAS).
 , blas64 ? null
 }:
 
@@ -8,22 +9,59 @@ with stdenv.lib;
 
 let blas64_ = blas64; in
 
-let local = config.openblas.preferLocalBuild or false;
-    binary =
-      { i686-linux = "32";
-        armv7l-linux = "32";
-        x86_64-linux = "64";
-        x86_64-darwin = "64";
-      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
-    genericFlags =
-      [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}"
-        "NUM_THREADS=64"
-      ];
-    localFlags = config.openblas.flags or
-      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
-    blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system;
+let
+  # To add support for a new platform, add an element to this set.
+  configs = {
+    armv7l-linux = {
+      BINARY = "32";
+      TARGET = "ARMV7";
+      DYNAMIC_ARCH = "0";
+      CC = "gcc";
+      USE_OPENMP = "1";
+    };
 
-    version = "0.2.19";
+    i686-linux = {
+      BINARY = "32";
+      TARGET = "P2";
+      DYNAMIC_ARCH = "1";
+      CC = "gcc";
+      USE_OPENMP = "1";
+    };
+
+    x86_64-darwin = {
+      BINARY = "64";
+      TARGET = "ATHLON";
+      DYNAMIC_ARCH = "1";
+      # Note that clang is available through the stdenv on OSX and
+      # thus is not an explicit dependency.
+      CC = "clang";
+      USE_OPENMP = "0";
+      MACOSX_DEPLOYMENT_TARGET = "10.7";
+    };
+
+    x86_64-linux = {
+      BINARY = "64";
+      TARGET = "ATHLON";
+      DYNAMIC_ARCH = "1";
+      CC = "gcc";
+      USE_OPENMP = "1";
+    };
+  };
+in
+
+let
+  config =
+    configs.${stdenv.system}
+    or (throw "unsupported system: ${stdenv.system}");
+in
+
+let
+  blas64 =
+    if blas64_ != null
+      then blas64_
+      else hasPrefix "x86_64" stdenv.system;
+
+  version = "0.2.19";
 in
 stdenv.mkDerivation {
   name = "openblas-${version}";
@@ -46,29 +84,22 @@ stdenv.mkDerivation {
     "stackprotector" "pic"
     # don't alter index arithmetic
     "strictoverflow"
-    # don't interfere with dynamic target detection.
+    # don't interfere with dynamic target detection
     "relro" "bindnow"
   ];
 
-  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which];
+  nativeBuildInputs =
+    [gfortran perl which]
+    ++ optionals stdenv.isDarwin [coreutils];
 
   makeFlags =
-    (if local then localFlags else genericFlags)
-    ++
-    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.7"]
-    ++
     [
       "FC=gfortran"
-      # Note that clang is available through the stdenv on OSX and
-      # thus is not an explicit dependency.
-      "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
-      "BINARY=${binary}"
-      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
+      "NUM_THREADS=64"
       "INTERFACE64=${if blas64 then "1" else "0"}"
     ]
-    ++
-    optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"];
+    ++ mapAttrsToList (var: val: var + "=" + val) config;
 
   doCheck = true;
   checkTarget = "tests";

From f9281609aef096cac905cd1081aacc9193ad273f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@users.noreply.github.com>
Date: Sun, 11 Dec 2016 00:22:25 +0000
Subject: [PATCH 041/295] afl: 2.23b -> 2.35b

---
 pkgs/tools/security/afl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index eac593e0076..d07396319d8 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.23b";
+  version = "2.35b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "152pqrc0py6jk1i3pwn2k928bsgax0d4yavpa3ca29bmrbzpnadh";
+    sha256 = "1smwc3j0mrpnhqq7li2ry42fxcmq3q2kl568dpq9r9npg996fqar";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 63dbcdbdb9e0d6826bc54757867e1e957023c3e7 Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei.boronine@gmail.com>
Date: Fri, 9 Dec 2016 17:12:03 +0800
Subject: [PATCH 042/295] mbedtls: 2.3.0 -> 2.4.0

---
 pkgs/development/libraries/mbedtls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index fab18516168..ebab4850be4 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.3.0";
+  name = "mbedtls-2.4.0";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "0jfb20crlcp67shp9p8cy6vmwdjkxb0rqfbi5l5yggbrywa708r1";
+    sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0";
   };
 
   nativeBuildInputs = [ perl ];

From 9aca55e79d62468ef230350026b41947d0472309 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 9 Dec 2016 00:02:44 +0000
Subject: [PATCH 043/295] endless sky: init at 0.9.4

---
 lib/maintainers.nix                |  1 +
 pkgs/games/endless-sky/default.nix | 46 ++++++++++++++++++++++++++++++
 pkgs/games/endless-sky/fixes.patch | 45 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  3 +-
 4 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/endless-sky/default.nix
 create mode 100644 pkgs/games/endless-sky/fixes.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b56dce79820..8a3584b0b8d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -242,6 +242,7 @@
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lewo = "Antoine Eiche <lewo@abesis.fr>";
+  lheckemann = "Linus Heckemann <git@sphalerite.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   lihop = "Leroy Hopson <nixos@leroy.geek.nz>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
new file mode 100644
index 00000000000..f993ad1b8e0
--- /dev/null
+++ b/pkgs/games/endless-sky/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub
+, SDL2, libpng, libjpeg, glew, openal, scons
+}:
+
+let
+  version = "0.9.4";
+
+in
+stdenv.mkDerivation rec {
+  name = "endless-sky-${version}";
+
+  src = fetchFromGitHub {
+    owner = "endless-sky";
+    repo = "endless-sky";
+    rev = "v${version}";
+    sha256 = "1mirdcpap0a280j472lhmhqg605b7glvdr4l93qcapk8an8d46m7";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    SDL2 libpng libjpeg glew openal scons
+  ];
+
+  patches = [
+    ./fixes.patch
+  ];
+
+  buildPhase = ''
+    scons -j$NIX_BUILD_CORES PREFIX="$out"
+  '';
+
+  installPhase = ''
+    scons -j$NIX_BUILD_CORES install PREFIX="$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
+    homepage = "https://endless-sky.github.io/";
+    license = with licenses; [
+      gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
+    ];
+    maintainers = with maintainers; [ lheckemann ];
+    platforms = with platforms; allBut darwin;
+  };
+}
diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch
new file mode 100644
index 00000000000..cad7a6acaed
--- /dev/null
+++ b/pkgs/games/endless-sky/fixes.patch
@@ -0,0 +1,45 @@
+diff --git a/SConstruct b/SConstruct
+index 48fd080..419b40d 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1,7 +1,7 @@
+ import os
+ 
+ # Load any environment variables that alter the build.
+-env = Environment()
++env = Environment(ENV = os.environ)
+ if 'CCFLAGS' in os.environ:
+ 	env.Append(CCFLAGS = os.environ['CCFLAGS'])
+ if 'CXXFLAGS' in os.environ:
+@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
+ 
+ 
+ # Install the binary:
+-env.Install("$DESTDIR$PREFIX/games", sky)
++env.Install("$DESTDIR$PREFIX/bin", sky)
+ 
+ # Install the desktop file:
+ env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
+diff --git a/source/Files.cpp b/source/Files.cpp
+index c8c8957..d196459 100644
+--- a/source/Files.cpp
++++ b/source/Files.cpp
+@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv)
+ 	if(resources.back() != '/')
+ 		resources += '/';
+ #if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__
+-	// Special case, for Linux: the resource files are not in the same place as
+-	// the executable, but are under the same prefix (/usr or /usr/local).
+-	static const string LOCAL_PATH = "/usr/local/";
+-	static const string STANDARD_PATH = "/usr/";
+-	static const string RESOURCE_PATH = "share/games/endless-sky/";
+-	if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
+-		resources = LOCAL_PATH + RESOURCE_PATH;
+-	else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
+-		resources = STANDARD_PATH + RESOURCE_PATH;
++	// Workaround for NixOS. Not sure how to proceed with other OSes, feedback
++	// is welcome.
++	resources += "../share/games/endless-sky/";
+ #elif defined __APPLE__
+ 	// Special case for Mac OS X: the resources are in ../Resources relative to
+ 	// the folder the binary is in.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 910df7d74af..1aab12d2288 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1550,7 +1550,6 @@ in
 
   emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; };
 
-
   efibootmgr = callPackage ../tools/system/efibootmgr { };
 
   efivar = callPackage ../tools/system/efivar { };
@@ -15662,6 +15661,8 @@ in
 
   egoboo = callPackage ../games/egoboo { };
 
+  endless-sky = callPackage ../games/endless-sky { };
+
   eternity = callPackage ../games/eternity-engine { };
 
   extremetuxracer = callPackage ../games/extremetuxracer {

From 21449c23cbbaadfcc0066d5dc320b4bd3f06bc14 Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Sun, 11 Dec 2016 12:47:48 +0100
Subject: [PATCH 044/295] steam: added java and steam-run to documentation,
 removed patchelf info

---
 doc/package-notes.xml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index de148ec5739..0a4c746c371 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -418,7 +418,7 @@ it. Place the resulting <filename>package.nix</filename> file into
   chroot environment, as documented
   <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>.
   This allows us to have binaries in the expected paths without disrupting the system,
-  and to avoid patching them.
+  and to avoid patching them to work in a non FHS environment.
 </para>
 
 </section>
@@ -464,7 +464,6 @@ it. Place the resulting <filename>package.nix</filename> file into
     or because they cannot be patched.The steps to launch a game 
     directly are: 
     <orderedlist>
-    <listitem><para>Patch the script/binary if you can.</para></listitem>
     <listitem><para>Add a file named <filename>steam_appid.txt</filename> in 
     the binary folder, with the appid as contents (it can be found in the 
     stdout from steam).</para></listitem>
@@ -501,14 +500,18 @@ libGL error: failed to load driver: swrast</programlisting></para></listitem>
   <programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting>
   have a look at <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this pull request</link>.
   </para></listitem>
+
   </itemizedlist></listitem></varlistentry>
 
   <varlistentry>
-  <term>Known issues</term>
+  <term>Java</term>
   <listitem><orderedlist>
   <listitem><para>
-  No java in steam chrootenv. Games affected: Towns:
+  There is no java in steam chrootenv by default. If you get a message like
   <programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting>
+  You need to add  
+  <programlisting> steam.override { withJava = true; };</programlisting>
+  to your configuration.
   </para></listitem>
   </orderedlist></listitem></varlistentry>
 
@@ -517,6 +520,23 @@ libGL error: failed to load driver: swrast</programlisting></para></listitem>
 
 </section>
 
+<section xml:id="sec-steam-run">
+
+<title>steam-run</title>
+<para>
+The FHS-compatible chroot used for steam can also be used to run 
+other linux games that expect a FHS environment.
+To do it, add 
+<programlisting>pkgs.(steam.override {
+          nativeOnly = true;
+          newStdcpp = true;
+        }).run</programlisting>
+to your configuration, rebuild, and run the game with 
+<programlisting>steam-run ./foo</programlisting>
+</para>
+
+</section>
+
 </section>
 
 </chapter>

From 915c93c69e8fa15daf9731bcde9e8534b50d7fdf Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 10 Dec 2016 19:33:19 +0100
Subject: [PATCH 045/295] nextcloud: 10.0.1 -> 10.0.2

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index bcbda0d5c09..91ecda2e8c7 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "10.0.1";
+  version = "10.0.2";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "09cbjxsr6sdjrq37rmwmg6r1x3625bqcrd37ja6cmmrgy0l2lh9r";
+    sha256 = "0g0h6yyy712mpyqzxa9azqlkgiw9hplv88xv0r7lh4w4fwcai1x6";
   };
 
   installPhase = ''

From a3e503fe0f3baa0d8cb935cac9e1c6e50aefbbef Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 11 Dec 2016 21:07:18 +0900
Subject: [PATCH 046/295] firefox-bin: fix updateScript

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index d828a5486fd..b768bfd6111 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -223,7 +223,7 @@ stdenv.mkDerivation {
                        tr " " ":"`; do
             # create an entry for every locale
             cat >> $tmpfile <<EOF
-            { url = "$url$version/$arch/`echo $line | cut -d":" -f3`";"
+            { url = "$url$version/$arch/`echo $line | cut -d":" -f3`";
               locale = "`echo $line | cut -d":" -f3 | sed "s/$arch\///" | sed "s/\/.*//"`";
               arch = "$arch";
               sha512 = "`echo $line | cut -d":" -f1`";

From b6a4876258a42bd1c733bb77b40367d016094913 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 11 Dec 2016 13:17:49 +0100
Subject: [PATCH 047/295] httpie: 0.9.6 -> 0.9.8

---
 pkgs/tools/networking/httpie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index a5c7353905b..fe30fd94967 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "httpie-0.9.6";
+  name = "httpie-0.9.8";
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/h/httpie/${name}.tar.gz";
-    sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6";
+    sha256 = "1qgn1mpkk8wxxhvgxw3fnscqg3klh42ijr11zrb0ylriaaqp0n2i";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
@@ -17,6 +17,6 @@ pythonPackages.buildPythonApplication rec {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
     homepage = http://httpie.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ antono relrod ];
+    maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ];
   };
 }

From db36c44f1b198dc971d08e91dd899c08741b899c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Sun, 11 Dec 2016 14:03:28 +0100
Subject: [PATCH 048/295] gsl: 2.2 -> 2.3 (#21058)

See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00005.html
for release announcement
---
 pkgs/development/libraries/gsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 82e41329e00..d130a328dba 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, fetchpatch, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-2.2";
+  name = "gsl-2.3";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "1pyq2c0j91z955746myn29c89jwkd435s2cbj8ks2hpag6d0mr2d";
+    sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an";
   };
 
   patches = [

From 2fb4874453ca83f0fa50f932885e82329ef198df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Deest?= <gael;deest@gmail.com>
Date: Sun, 11 Dec 2016 13:59:44 +0100
Subject: [PATCH 049/295] isl: 0.15 -> 0.17.1

Oups.
---
 pkgs/development/libraries/isl/0.17.1.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/isl/0.17.1.nix

diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix
new file mode 100644
index 00000000000..2136969c075
--- /dev/null
+++ b/pkgs/development/libraries/isl/0.17.1.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "isl-0.17.1";
+
+  src = fetchurl {
+    url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+    sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";
+  };
+
+  buildInputs = [ gmp ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.kotnet.org/~skimo/isl/;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1aab12d2288..0e55316829f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2271,11 +2271,12 @@ in
 
   ised = callPackage ../tools/misc/ised {};
 
-  isl = isl_0_15;
+  isl = isl_0_17;
   isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { };
   isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
   isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
   isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { };
+  isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { };
 
   ispike = callPackage ../development/libraries/science/robotics/ispike { };
 

From 873e81833973d9ec4e1e54a29a7155e516268704 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 14:54:23 +0100
Subject: [PATCH 050/295] docker-machine: add bash completion

---
 .../networking/cluster/docker-machine/default.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 62dbbcf2149..d714033e412 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -14,6 +14,11 @@ buildGoPackage rec {
     sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7";
   };
 
+  postInstall = ''
+    mkdir -p $bin/share/bash-completion/completions/
+    cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/
+  '';
+
   postFixup =  ''
     mv $bin/bin/cmd $bin/bin/docker-machine
   '';

From ef24c93f729c1d39b037ede858e00f9052293315 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 14:56:25 +0100
Subject: [PATCH 051/295] kubernetes: add bash completions

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 46f5d7fa50a..38458a574d5 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -40,11 +40,13 @@ stdenv.mkDerivation rec {
   postBuild = "(cd build/pause && gcc pause.c -o pause)";
 
   installPhase = ''
-    mkdir -p "$out/bin" "$man/share/man" "$pause/bin"
+    mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
 
     cp _output/local/go/bin/* "$out/bin/"
     cp build/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
+
+    $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
   '';
 
   preFixup = ''

From c316dd1cc7386a6eb8fa8dcdaf4e592214519561 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 14:57:02 +0100
Subject: [PATCH 052/295] minikube: add bash completions

---
 pkgs/applications/networking/cluster/minikube/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 857e8e72d12..2fe9db26765 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp $src $out/bin/${pname}
     chmod +x $out/bin/${pname}
+
+    mkdir -p $out/share/bash-completion/completions/
+    HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube
   '';
 
   meta = with stdenv.lib; {

From 6d15619729b4024fba39276c5046829c79fc4dcf Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:04:00 +0100
Subject: [PATCH 053/295] kubernetes: generate docs, fix empty man files

---
 .../networking/cluster/kubernetes/default.nix         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 46f5d7fa50a..964e41b70c8 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -28,16 +28,23 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper which go rsync go-bindata ];
 
-  outputs = ["out" "man""pause"];
+  outputs = ["out" "man" "pause"];
 
   postPatch = ''
     substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
+    substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
+    substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
+    substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin"
+
     patchShebangs ./hack
   '';
 
   WHAT="--use_go_build ${concatStringsSep " " components}";
 
-  postBuild = "(cd build/pause && gcc pause.c -o pause)";
+  postBuild = ''
+    ./hack/generate-docs.sh
+    (cd build/pause && gcc pause.c -o pause)
+  '';
 
   installPhase = ''
     mkdir -p "$out/bin" "$man/share/man" "$pause/bin"

From 3097782fff24aa97992a37d37645b1197ba57809 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:05:37 +0100
Subject: [PATCH 054/295] vault: 0.6.1 -> 0.6.3

---
 pkgs/tools/security/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 9118bd3c18f..acd71017a4e 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   goPackagePath = "github.com/hashicorp/vault";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx";
+    sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy";
   };
 
   buildFlagsArray = ''

From fe89c5490395797700ebc4af599340c00b06e0d0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:06:04 +0100
Subject: [PATCH 055/295] vault: add offline as maintainer

---
 pkgs/tools/security/vault/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index acd71017a4e..85c3625ad46 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -22,6 +22,6 @@ buildGoPackage rec {
     homepage = https://www.vaultproject.io;
     description = "A tool for managing secrets";
     license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = with maintainers; [ rushmorem offline ];
   };
 }

From a50fc480c3204c367049ba137f55ab5cb9029e3f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 14:57:49 +0100
Subject: [PATCH 056/295] nodejs: add bash completions for npm

---
 pkgs/development/web/nodejs/nodejs.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index eccdffab4c6..0b6ec87f00a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -58,6 +58,11 @@ in
     postInstall = ''
       paxmark m $out/bin/node
       PATH=$out/bin:$PATH patchShebangs $out
+
+      ${optionalString enableNpm '' 
+        mkdir -p $out/share/bash-completion/completions/
+        $out/bin/npm completion > $out/share/bash-completion/completions/npm
+      ''}
     '';
 
     meta = {

From a979297a9634fe05eba817fa13456ed74f56169e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 14:59:14 +0100
Subject: [PATCH 057/295] valut: add bash completions

---
 pkgs/tools/security/vault/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 9118bd3c18f..fedd3ebab2c 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,6 +1,13 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
+let
+  vaultBashCompletions = fetchFromGitHub {
+    owner = "iljaweis";
+    repo = "vault-bash-completion";
+    rev = "62c142e20929f930c893ebe3366350d735e81fbd";
+    sha256 = "0nfv10ykjq9751ijdyq728gjlgldm1lxvrar8kf6nz6rdfnnl2n5";
+  };
+in buildGoPackage rec {
   name = "vault-${version}";
   version = "0.6.1";
 
@@ -18,6 +25,11 @@ buildGoPackage rec {
       -X github.com/hashicorp/vault/version.GitCommit=${version}
   '';
 
+  postInstall = ''
+    mkdir -p $bin/share/bash-completion/completions/ 
+    cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://www.vaultproject.io;
     description = "A tool for managing secrets";

From f70e385fb601a236e33c394f6f6ec2c1f8e08cc9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:00:16 +0100
Subject: [PATCH 058/295] pythonPackages.docker-compose: add bash completions

---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31745e5380a..5956b144b0a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10948,6 +10948,11 @@ in {
       sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
     '';
 
+    postInstall = ''
+      mkdir -p $out/share/bash-completion/completions/
+      cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
+    '';
+
     meta = {
       homepage = "https://docs.docker.com/compose/";
       description = "Multi-container orchestration for Docker";

From 00befaff7e08069df13f949aa7c0210e55e607f5 Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei.boronine@gmail.com>
Date: Fri, 9 Dec 2016 17:16:27 +0800
Subject: [PATCH 059/295] neko: 2.0.0 -> 2.1.0

---
 pkgs/development/compilers/neko/default.nix | 57 +++++++++------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index a036e7e6939..198557f6fcc 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,50 +1,39 @@
-{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }:
+{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
+, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2
+}:
 
 stdenv.mkDerivation rec {
   name = "neko-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "http://nekovm.org/_media/neko-${version}.tar.gz";
-    sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
+    url = "http://nekovm.org/media/neko-${version}-src.tar.gz";
+    sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc";
   };
 
-  patches = stdenv.lib.singleton (fetchpatch {
-    url = "https://github.com/HaxeFoundation/neko/commit/"
-        + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch";
-    sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq";
-  });
+  buildInputs =
+    [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil
+      mariadb.client mbedtls openssl ]
+      ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
+                                                pkgs.darwin.apple_sdk.frameworks.Carbon]
+      ++ stdenv.lib.optional stdenv.isLinux gtk2;
 
-  prePatch = with stdenv.lib; let
-    libs = concatStringsSep "," (map (lib: "\"${lib.dev}/include\"") buildInputs);
-  in ''
-    sed -i -e '/^search_includes/,/^}/c \
-      search_includes = function(_) { return $array(${libs}) }
-    ' src/tools/install.neko
-    sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \
-      vm/load.c
-    # temporarily, fixed in 1.8.3
-    sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h
-
-    for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do
-      sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \
-        src/tools/install.neko
-    done
+  prePatch = ''
+    sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c
+  '';
+
+  checkPhase = ''
+    bin/neko bin/test.n
   '';
 
-  makeFlags = "INSTALL_PREFIX=$(out)";
-  buildInputs = [ boehmgc zlib sqlite pcre ];
   dontStrip = true;
 
-  preInstall = ''
-    install -vd "$out/lib" "$out/bin"
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high-level dynamically typed programming language";
     homepage = http://nekovm.org;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
+

From b8984954ff0e9bc7ea92891dcb0e44757004d70d Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Sun, 11 Dec 2016 16:57:28 +0100
Subject: [PATCH 060/295] steam: removed unuseful section from documentation

---
 doc/package-notes.xml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 0a4c746c371..0ba7ec4c44d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -457,29 +457,6 @@ it. Place the resulting <filename>package.nix</filename> file into
     to see what is causing steam to fail.</para></listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term>Game X fails to start</term>
-    <listitem><para>Games may fail to start because they lack 
-    dependencies (this should be added to the script, for now), 
-    or because they cannot be patched.The steps to launch a game 
-    directly are: 
-    <orderedlist>
-    <listitem><para>Add a file named <filename>steam_appid.txt</filename> in 
-    the binary folder, with the appid as contents (it can be found in the 
-    stdout from steam).</para></listitem>
-    <listitem><para>Using the LD_LIBRARY_PATH from the nix/store steam script, 
-    with some additions, launch the game binary:
-    <programlisting>LD_LIBRARY_PATH=~/.steam/bin32:$LD_LIBRARY_PATH:/nix/store/pfsa... blabla ...curl-7.29.0/lib:. ./Osmos.bin3
-    </programlisting> (if you could not patchelf the game, call ld.so directly 
-    with the binary as param). With this technique, I can play many games
-    directly from steam. Others, like Team Fortress, cannot be patched
-    so I only managed to run them from the cmd line.
-    </para></listitem>
-    </orderedlist>
-    </para>
-    </listitem>
-  </varlistentry>
-  
   <varlistentry>
   <term>Using the FOSS Radeon drivers</term>
   <listitem><itemizedlist><listitem><para>

From b2278ae3c8a7b8ef6dd976df9c0c0600b1baa038 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Sun, 11 Dec 2016 15:19:20 +0000
Subject: [PATCH 061/295] helm (kubernetes): init at v2.0.2

Added a nix expression to download and install helm; added it to top
level packages as kubernetes_helm.
---
 .../networking/cluster/helm/default.nix       | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/helm/default.nix

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
new file mode 100644
index 00000000000..6cd751f970d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, kubernetes }:
+let
+  arch = if stdenv.isLinux
+         then "linux-amd64"
+         else "darwin-amd64";
+  checksum = if stdenv.isLinux
+             then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200"
+             else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465";
+in
+stdenv.mkDerivation rec {
+  pname = "helm";
+  version = "2.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
+    sha256 = "${checksum}";
+  };
+
+  buildInputs = [ ];
+
+  propagatedBuildInputs = [ kubernetes ];
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    mkdir -p $out/bin
+  '';
+
+  installPhase = ''
+    tar -xvzf $src
+    cp ${arch}/helm $out/bin/${pname}
+    chmod +x $out/bin/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubernetes/helm;
+    description = "A package manager for kubernetes";
+    license = licenses.asl20;
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1aab12d2288..ea0457d9cb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13341,6 +13341,8 @@ in
 
   hello = callPackage ../applications/misc/hello { };
 
+  kubernetes_helm = callPackage ../applications/networking/cluster/helm { };
+
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
   heme = callPackage ../applications/editors/heme { };

From 484e5f5152109f8e8f8d5bdfd997d4364952dfbd Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Sun, 11 Dec 2016 16:58:13 +0100
Subject: [PATCH 062/295] pytun: init at 2.2.1

---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31745e5380a..7a8a9cc1cfd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9114,6 +9114,29 @@ in {
 
   };
 
+  pytun = buildPythonPackage rec {
+    name = "pytun-${version}";
+    version = "2.2.1";
+    rev = "v${version}";
+
+    src = pkgs.fetchFromGitHub {
+      inherit rev;
+      owner = "montag451";
+      repo = "pytun";
+      sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/montag451/pytun;
+      description = "Linux TUN/TAP wrapper for Python";
+      license = licenses.mit;
+      maintainers = with maintainers; [ montag451 ];
+      platforms = platforms.linux;
+    };
+  };
+
   raven = buildPythonPackage rec {
     name = "raven-3.4.1";
 

From 23064168ee1e0f24e9383f3df30661180ec31b9c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:05:37 +0100
Subject: [PATCH 063/295] vault: 0.6.1 -> 0.6.3

---
 pkgs/tools/security/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 9118bd3c18f..acd71017a4e 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   goPackagePath = "github.com/hashicorp/vault";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx";
+    sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy";
   };
 
   buildFlagsArray = ''

From af5be37ed5bcbf47deb7577895db9fd1b09173aa Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 15:06:04 +0100
Subject: [PATCH 064/295] vault: add offline as maintainer

---
 pkgs/tools/security/vault/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index acd71017a4e..85c3625ad46 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -22,6 +22,6 @@ buildGoPackage rec {
     homepage = https://www.vaultproject.io;
     description = "A tool for managing secrets";
     license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = with maintainers; [ rushmorem offline ];
   };
 }

From 6107b8932117b722eeb52c6c715f27d7132f388f Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Sun, 11 Dec 2016 16:58:13 +0100
Subject: [PATCH 065/295] pytun: init at 2.2.1

---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31745e5380a..7a8a9cc1cfd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9114,6 +9114,29 @@ in {
 
   };
 
+  pytun = buildPythonPackage rec {
+    name = "pytun-${version}";
+    version = "2.2.1";
+    rev = "v${version}";
+
+    src = pkgs.fetchFromGitHub {
+      inherit rev;
+      owner = "montag451";
+      repo = "pytun";
+      sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/montag451/pytun;
+      description = "Linux TUN/TAP wrapper for Python";
+      license = licenses.mit;
+      maintainers = with maintainers; [ montag451 ];
+      platforms = platforms.linux;
+    };
+  };
+
   raven = buildPythonPackage rec {
     name = "raven-3.4.1";
 

From 0783a7d262a929cc1e00ae9049095a17cb1dc662 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Sun, 11 Dec 2016 16:08:24 +0000
Subject: [PATCH 066/295] helm (kubernetes): init at v2.0.2

Added self as package maintainer. Set preferLocalBuild.
---
 lib/maintainers.nix                                   | 1 +
 pkgs/applications/networking/cluster/helm/default.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8a3584b0b8d..28258856917 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -384,6 +384,7 @@
   retrry = "Tadas Barzdžius <retrry@gmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
+  rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
   rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 6cd751f970d..58ac31ce49f 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "${checksum}";
   };
 
+  preferLocalBuild = true;
+
   buildInputs = [ ];
 
   propagatedBuildInputs = [ kubernetes ];
@@ -37,6 +39,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/kubernetes/helm;
     description = "A package manager for kubernetes";
     license = licenses.asl20;
+    maintainers = [ maintainers.rlupton20 ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 0a8409855558a895699dcd076604ec5e33ad578c Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Sun, 11 Dec 2016 16:20:51 +0000
Subject: [PATCH 067/295] helm (kubernetes): init at v2.0.2

Changed package name to kubernetes-helm.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea0457d9cb0..be30875f137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13341,7 +13341,7 @@ in
 
   hello = callPackage ../applications/misc/hello { };
 
-  kubernetes_helm = callPackage ../applications/networking/cluster/helm { };
+  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 

From 2d4637f96f11cd77a89275aac23c12cbb7e09fec Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 17:55:09 +0100
Subject: [PATCH 068/295] intel-gpu-tools: 1.16 -> 1.17

---
 .../tools/misc/intel-gpu-tools/default.nix           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 5ecc0421c36..e7520091d1d 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
-, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }:
+, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
+, procps }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.16";
+  name = "intel-gpu-tools-1.17";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6";
+    sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6";
   };
 
-  buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
-                  libXext libXv libXrandr glib bison libunwind python3 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
+    libXext libXv libXrandr glib bison libunwind python3 procps ];
 
   preBuild = ''
     patchShebangs debugger/system_routine/pre_cpp.py

From 729b21adbbcef5672dbffe9eef885211dd945697 Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei.boronine@gmail.com>
Date: Mon, 12 Dec 2016 01:11:24 +0800
Subject: [PATCH 069/295] neko: set cmake flag -DRUN_LDCONFIG=OFF

---
 pkgs/development/compilers/neko/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 198557f6fcc..e028436263d 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil
       mariadb.client mbedtls openssl ]
+      ++ stdenv.lib.optional stdenv.isLinux gtk2
       ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
-                                                pkgs.darwin.apple_sdk.frameworks.Carbon]
-      ++ stdenv.lib.optional stdenv.isLinux gtk2;
-
+                                                pkgs.darwin.apple_sdk.frameworks.Carbon];
+  cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
   prePatch = ''
     sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c
   '';

From 87f0ad66bf395cffaa87094e7ca0fb3e776efc5e Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei.boronine@gmail.com>
Date: Mon, 12 Dec 2016 01:33:01 +0800
Subject: [PATCH 070/295] Add patches referenced in neko issue 131

---
 pkgs/development/compilers/neko/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index e028436263d..493748d369b 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -11,6 +11,21 @@ stdenv.mkDerivation rec {
     sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc";
   };
 
+  # Patches backported with reference to https://github.com/HaxeFoundation/neko/issues/131
+  # They can probably be removed when bumping to next version
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/HaxeFoundation/neko/commit/"
+          + "a8c71ad97faaccff6c6e9e09eba2d5efd022f8dc.patch";
+      sha256 = "0mnx15cdjs8mnl01mhc9z2gpzh4d1q0ygqnjackrqxz6x235ydyp";
+    })
+    (fetchpatch {
+      url = "https://github.com/HaxeFoundation/neko/commit/"
+          + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch";
+      sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc";
+    })
+  ];
+
   buildInputs =
     [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil
       mariadb.client mbedtls openssl ]

From b871a208e57c8131b79059d4eb29413c3e14f31d Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Sat, 10 Dec 2016 17:27:55 +0100
Subject: [PATCH 071/295] aptly: add bash completion

---
 pkgs/tools/misc/aptly/default.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index a39b4247109..ccb13f2e42c 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -1,17 +1,31 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }:
 
-buildGoPackage rec {
-  name = "aptly-${version}";
+let
+
   version = "0.9.7";
   rev = "v${version}";
 
-  src = fetchFromGitHub {
+  aptlySrc = fetchFromGitHub {
     inherit rev;
     owner = "smira";
     repo = "aptly";
     sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00";
   };
 
+  aptlyCompletionSrc = fetchFromGitHub {
+    rev = version;
+    owner = "aptly-dev";
+    repo = "aptly-bash-completion";
+    sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4";
+  };
+
+in
+
+buildGoPackage {
+  name = "aptly-${version}";
+
+  src = aptlySrc;
+
   goPackagePath = "github.com/smira/aptly";
   goDeps = ./deps.nix;
 
@@ -19,6 +33,8 @@ buildGoPackage rec {
 
   postInstall = ''
     rm $bin/bin/man
+    mkdir -p $bin/share/bash-completion/completions
+    ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
     wrapProgram "$bin/bin/aptly" \
       --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}"
   '';

From 374f833dab7655b670697b3764319bf0a053d31a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 11 Dec 2016 12:53:51 -0500
Subject: [PATCH 072/295] google-chrome: Add new dep on libxcb

---
 .../networking/browsers/google-chrome/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 531c5a7cf3d..2863a595017 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -2,7 +2,7 @@
 
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
-, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite
+, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
 , dbus_libs, gtk2, gdk_pixbuf, gcc
 
@@ -42,7 +42,7 @@ let
   deps = [
     stdenv.cc.cc
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
-    libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite
+    libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
     alsaLib libXdamage libXtst libXrandr expat cups
     dbus_libs gtk2 gdk_pixbuf gcc
     systemd

From 601058e0e23322995e0ca05813247dfd8514f060 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 11 Dec 2016 19:07:26 +0100
Subject: [PATCH 073/295] grsecurity: 4.8.13-201612082118 ->
 4.8.14-201612110933

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 786589ca534..b6121fbd1b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.13";
+  version = "4.8.14";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d";
+    sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 66f03edbdf2..7e49cf17090 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -89,9 +89,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.8.13";
-      grrev  = "201612082118";
-      sha256 = "0cvw6sbinzlcxap8mf934ksgksgdd8w8pf8jfp82fbyiz53klfn1";
+    { kver   = "4.8.14";
+      grrev  = "201612110933";
+      sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 50d63e1e3f01451c34923e6ea9d67ae1a1d183c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 11 Dec 2016 18:06:40 +0100
Subject: [PATCH 074/295] libxslt: add option to enable crypto support

---
 pkgs/development/libraries/libxslt/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index ebad3fd3eb1..7798c806982 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs
-, python2, pythonSupport ? (! stdenv ? cross)
+{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2
+, cryptoSupport ? false
+, pythonSupport ? (! stdenv ? cross)
 }:
 
 assert pythonSupport -> python2 != null;
 assert pythonSupport -> libxml2.pythonSupport;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "libxslt-1.1.29";
 
@@ -21,18 +24,18 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 
-  configureFlags = [
-    "--without-crypto"
+  # TODO move cryptoSupport as last flag, when upgrading libxslt
+  configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [
     "--without-debug"
     "--without-mem-debug"
     "--without-debugger"
-  ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}";
+  ] ++ optional pythonSupport "--with-python=${python2}";
 
   postFixup = ''
     moveToOutput bin/xslt-config "$dev"
     moveToOutput lib/xsltConf.sh "$dev"
     moveToOutput share/man/man1 "$bin"
-  '' + stdenv.lib.optionalString pythonSupport ''
+  '' + optionalString pythonSupport ''
     mkdir -p $py/nix-support
     echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs
     moveToOutput lib/python2.7 "$py"

From d568cb971be3c1a9f732e2d254baf74dff84fa2a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 11 Dec 2016 18:30:17 +0000
Subject: [PATCH 075/295] google-apputils: enable for py3k (#21079)

No apparent reason for it being disabled per #21061. I guess we'll find
out if there was a reason.
---
 pkgs/top-level/python-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a8a9cc1cfd..8715824bde4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12194,7 +12194,6 @@ in {
 
   google_apputils = buildPythonPackage rec {
     name = "google-apputils-0.4.1";
-    disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/google-apputils/${name}.tar.gz";

From d6aff31f357cec658540363b93b31a5c958f9601 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sun, 11 Dec 2016 19:45:48 +0100
Subject: [PATCH 076/295] gopher: init at 3.0.11 (#21080)

---
 .../networking/gopher/gopher/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/gopher/gopher/default.nix

diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix
new file mode 100644
index 00000000000..9057fda2e60
--- /dev/null
+++ b/pkgs/applications/networking/gopher/gopher/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation rec {
+  name = "gopher-${version}";
+  version = "3.0.11";
+
+  src = fetchurl {
+    url = "http://gopher.quux.org:70/devel/gopher/Downloads/gopher_${version}.tar.gz";
+    sha256 = "15r7x518wlpfqpd6z0hbdwm8rw8ll8hbpskdqgxxhrmy00aa7w9c";
+  };
+
+  buildInputs = [ ncurses ];
+
+  preConfigure = "export LIBS=-lncurses";
+
+  meta = {
+    homepage = http://gopher.quux.org:70/devel/gopher;
+    description = "A ncurses gopher client";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1aab12d2288..67df4163562 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12966,6 +12966,8 @@ in
 
   google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
 
+  gopher = callPackage ../applications/networking/gopher/gopher { };
+
   gpa = callPackage ../applications/misc/gpa { };
 
   gpicview = callPackage ../applications/graphics/gpicview { };

From 4f2e2ce9715a6586aa9e0e75176e755853fd3ab2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 19:50:37 +0100
Subject: [PATCH 077/295] moc: 2.5.1 -> 2.5.2

---
 pkgs/applications/audio/moc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 50996b71c64..ea83a1012eb 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "moc-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
-    sha256 = "1wn4za08z64bhsgfhr9c0crfyvy8c3b6a337wx7gz19am5srqh8v";
+    sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 073cb330cacfc1a01a7224765fd1bdeab463f320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 11 Dec 2016 19:51:18 +0100
Subject: [PATCH 078/295] doc: remove last mention of <nixos>

---
 nixos/doc/manual/configuration/modularity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index d95091bd162..59a4e3b33ba 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -129,7 +129,7 @@ default; run <literal>nix-env -i nix-repl</literal> to get it.  A
 typical use:
 
 <screen>
-$ nix-repl '&lt;nixos>'
+$ nix-repl '&lt;nixpkgs/nixos>'
 
 nix-repl> config.networking.hostName
 "mandark"

From 7a538938a040a0fb05c673b058359e756ba680fd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Dec 2016 20:05:40 +0100
Subject: [PATCH 079/295] pythonPackages.yarl: init at 0.8.1

---
 .../python-modules/yarl/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/yarl/default.nix

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
new file mode 100644
index 00000000000..246b761fa53
--- /dev/null
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, multidict
+, pytestrunner
+, pytest
+}:
+
+let
+  pname = "yarl";
+  version = "0.8.1";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712";
+  };
+
+  buildInputs = [ pytest pytestrunner ];
+  propagatedBuildInputs = [ multidict ];
+
+
+  meta = {
+    description = "Yet another URL library";
+    homepage = https://github.com/aio-libs/yarl/;
+    license = lib.licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8715824bde4..928ee522e11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31438,6 +31438,8 @@ in {
     };
   };
 
+  yarl = callPackage ../development/python-modules/yarl { };
+
   stripe = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "stripe";

From 826649ddf459e35e6fa6e57ae333637977f6b235 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Dec 2016 20:05:52 +0100
Subject: [PATCH 080/295] pythonPackages.multidict: init at 2.1.4

---
 .../python-modules/multidict/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/multidict/default.nix

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
new file mode 100644
index 00000000000..9a2e13f0c59
--- /dev/null
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pytest
+, isPy3k
+}:
+
+let
+  pname = "multidict";
+  version = "2.1.4";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  disabled = !isPy3k;
+
+  meta = {
+    description = "Multidict implementation";
+    homepage = https://github.com/aio-libs/multidict/;
+    license = lib.licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 928ee522e11..ba944b66822 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14377,6 +14377,8 @@ in {
     };
   };
 
+  multidict = callPackage ../development/python-modules/multidict { };
+
   munch = buildPythonPackage rec {
     name = "munch-${version}";
     version = "2.0.4";

From c4104539e0db99e371a6b7f317d931d785c6ace8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Dec 2016 20:06:12 +0100
Subject: [PATCH 081/295] pythonPackages.async_timeout: init at 1.1.0

---
 .../python-modules/async_timeout/default.nix  | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/async_timeout/default.nix

diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
new file mode 100644
index 00000000000..d5009e9bccb
--- /dev/null
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pytestrunner
+, pythonOlder
+}:
+
+let
+  pname = "async-timeout";
+  version = "1.1.0";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081";
+  };
+
+  buildInputs = [ pytestrunner ];
+  # Circular dependency on aiohttp
+  doCheck = false;
+
+  disabled = pythonOlder "3.4";
+
+  meta = {
+    description = "Timeout context manager for asyncio programs";
+    homepage = https://github.com/aio-libs/async_timeout/;
+    license = lib.licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba944b66822..071e171dc63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1210,6 +1210,8 @@ in {
     };
   };
 
+  async-timeout = callPackage ../development/python-modules/async_timeout { };
+
  asn1ate = buildPythonPackage rec {
   pname = "asn1ate";
   date = "20160810";

From d9f494abbc5c2e27676f8f8bf25d3cf350cbd73b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Dec 2016 20:06:42 +0100
Subject: [PATCH 082/295] pythonPackages.aiohttp: 0.21.5 -> 1.1.6

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 071e171dc63..776a8716fa1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -589,11 +589,11 @@ in {
 
   aiohttp = buildPythonPackage rec {
     name = "aiohttp-${version}";
-    version = "0.21.5";
+    version = "1.1.6";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/aiohttp/${name}.tar.gz";
-      sha256 = "0n8517wc8b6yc925f7zhgl4wqf4ay1w2fzar0pj1h20yfa1wiids";
+      sha256 = "0742feb9759a5832aa4a30abf64e53055e139ed41e26f79b9558d08e05c74d60";
     };
 
     disabled = pythonOlder "3.4";
@@ -601,7 +601,7 @@ in {
     doCheck = false; # Too many tests fail.
 
     buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ];
-    propagatedBuildInputs = with self; [ chardet ];
+    propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl ];
 
     meta = {
       description = "http client/server for asyncio";

From e5c525b5a274cf94dde329794999b9166a6352df Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 20:07:42 +0100
Subject: [PATCH 083/295] homebank: 5.1.1 -> 5.1.2

simplify and add myself as maintainer
---
 pkgs/applications/office/homebank/default.nix | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 5ee14c81e94..50c80f65949 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,29 +1,21 @@
 { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme, libsoup}:
-
-let
-   download_root = "http://homebank.free.fr/public/";
-   name = "homebank-5.1.1";
-   lastrelease = download_root + name + ".tar.gz";
-   oldrelease = download_root + "old/" + name + ".tar.gz";
-in
-
-stdenv.mkDerivation {
-  inherit name;
+, hicolor_icon_theme, libsoup }:
 
+stdenv.mkDerivation rec {
+  name = "homebank-5.1.2";
   src = fetchurl {
-    urls = [ lastrelease oldrelease ];
-    sha256 = "1gd4b8fsq89w486mfrclw4r1nrgh7lxp4sncbgprbz9id7f6vlww";
+    url = "http://homebank.free.fr/public/${name}.tar.gz";
+    sha256 = "09zsq5l3s8cg4slhsyybsq8v1arnhh07i0rzka3j6ahysky15pfh";
   };
 
-  buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme
-   wrapGAppsHook libsoup ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Free, easy, personal accounting for everyone";
     homepage = http://homebank.free.fr/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric pSub ];
+    platforms = platforms.linux;
   };
 }

From daaf497c5ce917566351b6fb4d109b4a3fd1656c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 20:09:06 +0100
Subject: [PATCH 084/295] homebank: fix icons

---
 pkgs/applications/office/homebank/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 50c80f65949..5f1c721e4c4 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
-, hicolor_icon_theme, libsoup }:
+, hicolor_icon_theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "homebank-5.1.2";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-  buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup ];
+  buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
+    gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
     description = "Free, easy, personal accounting for everyone";

From a4bbf4cad5202d19bb8a0ae44d1f0b11005b5f6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Dec 2016 20:21:15 +0100
Subject: [PATCH 085/295] pythonPackages.scikitlearn: 0.18 -> 0.18.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 776a8716fa1..89971bdf05b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22952,12 +22952,12 @@ in {
 
   scikitlearn = buildPythonPackage rec {
     name = "scikit-learn-${version}";
-    version = "0.18";
+    version = "0.18.1";
     disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/scikit-learn/${name}.tar.gz";
-      sha256 = "240009789d6495240b332e059cbd2499f4d2981c93873983c9e1d5189f90315f";
+      sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];

From 7ac33a2cd2e3e68a8b7ff3132810a85ffc316804 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Dec 2016 20:40:28 +0100
Subject: [PATCH 086/295] pachyderm: init at 1.3.0

---
 .../networking/cluster/pachyderm/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/pachyderm/default.nix

diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
new file mode 100644
index 00000000000..a0df23e6f62
--- /dev/null
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "pachyderm-${version}";
+  version = "1.3.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/pachyderm/pachyderm";
+  subPackages = [ "src/server/cmd/pachctl" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "pachyderm";
+    repo = "pachyderm";
+    sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g";
+  };
+
+  meta = with lib; {
+    description = "Containerized Data Analytics";
+    homepage = https://github.com/pachyderm/pachyderm;
+    license = licenses.asl20;
+    maintainers = with maintainers; [offline];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1aab12d2288..fff3f93c45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5601,6 +5601,8 @@ in
 
   inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522;
 
+  pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
+
   php = php70;
 
   phpPackages = php70Packages;

From cf1ec8ed3348d0fd7777c450d67c288baa242559 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 21:15:14 +0100
Subject: [PATCH 087/295] pugixml: 1.7 -> 1.8.1

---
 pkgs/development/libraries/pugixml/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index ebb62459091..8c40ff2be20 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -2,22 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "pugixml-${version}";
-  version = "1.7";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv";
+    sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  sourceRoot = "${name}/scripts";
-
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
 
   preConfigure = ''
     # Enable long long support (required for filezilla)
-    sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
+    sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
   '';
 
   patches = []

From d5ec2a2c9dc7410d02c138e0f618717fe326be3e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Thu, 27 Oct 2016 19:35:02 +0200
Subject: [PATCH 088/295] postsrsd: additional configuration

fixes #19933
---
 nixos/modules/services/mail/postsrsd.nix | 36 ++++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index 68a4c101206..a1af16ec9ac 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -20,17 +20,29 @@ in {
         description = "Whether to enable the postsrsd SRS server for Postfix.";
       };
 
-      domain = mkOption {
-        type = types.str;
-        description = "Domain name for rewrite";
-      };
-
       secretsFile = mkOption {
         type = types.path;
         default = "/var/lib/postsrsd/postsrsd.secret";
         description = "Secret keys used for signing and verification";
       };
 
+      domain = mkOption {
+        type = types.str;
+        description = "Domain name for rewrite";
+      };
+
+      separator = mkOption {
+        type = types.enum ["-" "=" "+"];
+        default = "=";
+        description = "First separator character in generated addresses";
+      };
+
+      # bindAddress = mkOption { # uncomment once 1.5 is released
+      #   type = types.str;
+      #   default = "127.0.0.1";
+      #   description = "Socket listen address";
+      # };
+
       forwardPort = mkOption {
         type = types.int;
         default = 10001;
@@ -43,6 +55,18 @@ in {
         description = "Port for the reverse SRS lookup";
       };
 
+      timeout = mkOption {
+        type = types.int;
+        default = 1800;
+        description = "Timeout for idle client connections in seconds";
+      };
+
+      excludeDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Origin domains to exclude from rewriting in addition to primary domain";
+      };
+
       user = mkOption {
         type = types.str;
         default = "postsrsd";
@@ -86,7 +110,7 @@ in {
       path = [ pkgs.coreutils ];
 
       serviceConfig = {
-        ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -f${toString cfg.forwardPort} -r${toString cfg.reversePort}'';
+        ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -a${cfg.separator} -f${toString cfg.forwardPort} -r${toString cfg.reversePort} -t${toString cfg.timeout} "-X${concatStringsSep "," cfg.excludeDomains}"'';
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = true;

From 7bcc6e9c45afd9a7f69caa2ad6e75fb0051eab41 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 11 Dec 2016 23:32:39 +0100
Subject: [PATCH 089/295] riemann: provide executable and config

fixes #20821
---
 pkgs/servers/monitoring/riemann/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 132275a56e0..5d653474961 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    mkdir -p $out/share/java
+    sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann
+
+    mkdir -p $out/share/java $out/bin $out/etc
     mv lib/riemann.jar $out/share/java/
+    mv bin/riemann $out/bin/
+    mv etc/riemann.config $out/etc/
   '';
 
   meta = with stdenv.lib; {

From 2867f88781c160b2264f20a4d9af6f6f72184c36 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 12 Dec 2016 01:24:34 +0100
Subject: [PATCH 090/295] kubernetes module: fix default dns ip

---
 nixos/modules/services/cluster/kubernetes.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 4bdfa6d1ff5..fbf7412a6cd 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -484,7 +484,7 @@ in {
 
       clusterDns = mkOption {
         description = "Use alternative dns.";
-        default = "10.10.1.1";
+        default = "10.10.0.1";
         type = types.str;
       };
 

From f6daae391f170a10a7f83df12a98a462c139eb94 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 11 Dec 2016 19:33:05 -0500
Subject: [PATCH 091/295] linux: add 4.9

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 19 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.9.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
new file mode 100644
index 00000000000..f154e143e03
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.9";
+  modDirVersion = "4.9.0";
+  extraMeta.branch = "4.9";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a";
+  };
+
+  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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67df4163562..0b94668c554 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11020,6 +11020,22 @@ in
       ];
   };
 
+  linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
+        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -11181,7 +11197,7 @@ in
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_8;
+  linuxPackages_latest = linuxPackages_4_9;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -11193,6 +11209,7 @@ in
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8);
+  linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   # Don't forget to update linuxPackages_latest!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

From 4f0592680cf8845f180669fe3ee3ee2f1d29a79a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Dec 2016 21:10:28 -0500
Subject: [PATCH 092/295] rkt: 1.20.0 -> 1.21.0

---
 pkgs/applications/virtualization/rkt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index d4a10080aee..f3f5a88c0af 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.20.0";
+  version = "1.21.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "0cypksr13k0qp6qvbd6y8my1dg82s44k6qkiqkpn1vs2ynjg3i52";
+      sha256 = "0zd7f3yrnzik96a634m2qyrz25f5mi28caadghqdl9q2apxfb896";
   };
 
   stage1BaseImage = fetchurl {

From 77050a83816e11f2af2cd2115c5cd1937caa8068 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 11:49:22 +0000
Subject: [PATCH 093/295] findlib: 1.6.1 -> 1.7.1

---
 pkgs/development/tools/ocaml/findlib/default.nix           | 4 ++--
 pkgs/development/tools/ocaml/findlib/install_topfind.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 1391bc6eb8a..71da6dd6d32 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
-    sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721";
+    sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx";
   };
 
   buildInputs = [m4 ncurses ocaml];
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index 7c9f8e1a6cc..096330a31ae 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -6,7 +6,7 @@
  	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
 +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
- 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
 

From 42a0fc438755b84fc2bb09fe5733238dccebe0fe Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 11:25:37 +0000
Subject: [PATCH 094/295] ocamlbuild: 0.9.2 -> 0.9.3

---
 .../tools/ocaml/ocamlbuild/default.nix        | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 6feab7645f1..df6c66cb98f 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 let
-  version = "0.9.2";
+  version = "0.9.3";
 in
 stdenv.mkDerivation {
-  name = "ocamlbuild";
+  name = "ocamlbuild-${version}";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "ocamlbuild";
     rev = version;
-    sha256 = "0q4bvik08v444g1pill9zgwal48xs50jf424lbryfvqghhw5xjjc";
+    sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3";
   };
 
   createFindlibDestdir = true;
@@ -25,18 +25,12 @@ stdenv.mkDerivation {
     "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
   '';
 
-  # configurePhase = "ocaml setup.ml -configure --prefix $out";
-  # buildPhase     = "ocaml setup.ml -build";
-  # installPhase   = "ocaml setup.ml -install";
-
-  # meta = with stdenv.lib; {
-  #   homepage = http://oasis.forge.ocamlcore.org/;
-  #   description = "Configure, build and install system for OCaml projects";
-  #   license = licenses.lgpl21;
-  #   platforms = ocaml.meta.platforms or [];
-  #   maintainers = with maintainers; [
-  #     vbgl z77z
-  #   ];
-  # };
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ocaml/ocamlbuild/;
+    description = "A build system with builtin rules to easily build most OCaml projects";
+    license = licenses.lgpl2;
+    inherit (ocaml.meta) platforms;
+    maintainers = with maintainers; [ vbgl ];
+  };
 }
 

From 4889c271cacf72a47dc2f081e6e718980fb80d60 Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Tue, 6 Dec 2016 00:11:49 +0100
Subject: [PATCH 095/295] Add macvlan support for declarative containers

---
 nixos/modules/virtualisation/containers.nix | 12 +++
 nixos/tests/containers-macvlans.nix         | 82 +++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 nixos/tests/containers-macvlans.nix

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index a532696d03a..637a8713904 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -476,6 +476,17 @@ in
               '';
             };
 
+            macvlans = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = [ "eth1" "eth2" ];
+              description = ''
+                The list of host interfaces from which macvlans will be
+                created. For each interface specified, a macvlan interface
+                will be created and moved to the container.
+              '';
+            };
+
             extraVeths = mkOption {
               type = with types; attrsOf (submodule { options = networkOptions; });
               default = {};
@@ -654,6 +665,7 @@ in
               ''}
             ''}
             INTERFACES="${toString cfg.interfaces}"
+            MACVLANS="${toString cfg.macvlans}"
             ${optionalString cfg.autoStart ''
               AUTO_START=1
             ''}
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
new file mode 100644
index 00000000000..721f9848149
--- /dev/null
+++ b/nixos/tests/containers-macvlans.nix
@@ -0,0 +1,82 @@
+# Test for NixOS' container support.
+
+let
+  # containers IP on VLAN 1
+  containerIp1 = "192.168.1.253";
+  containerIp2 = "192.168.1.254";
+in
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-macvlans";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ montag451 ];
+  };
+
+  nodes = {
+
+    machine1 =
+      { config, pkgs, lib, ... }:
+      {
+        virtualisation.memorySize = 256;
+        virtualisation.vlans = [ 1 ];
+
+        # To be able to ping containers from the host, it is necessary
+        # to create a macvlan on the host on the VLAN 1 network.
+        networking.macvlans.mv-eth1-host = {
+          interface = "eth1";
+          mode = "bridge";
+        };
+        networking.interfaces.eth1.ip4 = lib.mkForce [];
+        networking.interfaces.mv-eth1-host = {
+          ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ];
+        };
+
+        containers.test1 = {
+          autoStart = true;
+          macvlans = [ "eth1" ];
+
+          config = {
+            networking.interfaces.mv-eth1 = {
+              ip4 = [ { address = containerIp1; prefixLength = 24; } ];
+            };
+          };
+        };
+
+        containers.test2 = {
+          autoStart = true;
+          macvlans = [ "eth1" ];
+
+          config = {
+            networking.interfaces.mv-eth1 = {
+              ip4 = [ { address = containerIp2; prefixLength = 24; } ];
+            };
+          };
+        };
+      };
+
+    machine2 =
+      { config, pkgs, ... }:
+      {
+        virtualisation.memorySize = 256;
+        virtualisation.vlans = [ 1 ];
+      };
+
+  };
+
+  testScript = ''
+    startAll;
+    $machine1->waitForUnit("default.target");
+    $machine2->waitForUnit("default.target");
+
+    # Ping between containers to check that macvlans are created in bridge mode
+    $machine1->succeed("nixos-container run test1 -- ping -n -c 1 ${containerIp2}");
+
+    # Ping containers from the host (machine1)
+    $machine1->succeed("ping -n -c 1 ${containerIp1}");
+    $machine1->succeed("ping -n -c 1 ${containerIp2}");
+
+    # Ping containers from the second machine to check that containers are reachable from the outside
+    $machine2->succeed("ping -n -c 1 ${containerIp1}");
+    $machine2->succeed("ping -n -c 1 ${containerIp2}");
+  '';
+})

From ea5551b551d0d7f462b7f8e00e2bf86b2412a365 Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Tue, 6 Dec 2016 23:32:17 +0100
Subject: [PATCH 096/295] containers: fix broken /etc/hosts entries when
 localAddress contains a netmask

---
 nixos/modules/virtualisation/containers.nix |  2 +-
 nixos/tests/containers-hosts.nix            | 52 +++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/containers-hosts.nix

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 637a8713904..7d445fa0951 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -676,7 +676,7 @@ in
     # Generate /etc/hosts entries for the containers.
     networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
       ''
-        ${cfg.localAddress} ${name}.containers
+        ${head (splitString "/" cfg.localAddress)} ${name}.containers
       '') config.containers);
 
     networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ];
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
new file mode 100644
index 00000000000..c7a85f190a5
--- /dev/null
+++ b/nixos/tests/containers-hosts.nix
@@ -0,0 +1,52 @@
+# Test for NixOS' container support.
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-hosts";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ montag451 ];
+  };
+
+  machine =
+    { config, pkgs, lib, ... }:
+    {
+      virtualisation.memorySize = 256;
+      virtualisation.vlans = [];
+
+      networking.bridges.br0.interfaces = [];
+      networking.interfaces.br0 = {
+        ip4 = [ { address = "10.11.0.254"; prefixLength = 24; } ];
+      };
+
+      # Force /etc/hosts to be the only source for host name resolution
+      environment.etc."nsswitch.conf".text = lib.mkForce ''
+        hosts: files
+      '';
+
+      containers.simple = {
+        autoStart = true;
+        privateNetwork = true;
+        localAddress = "10.10.0.1";
+        hostAddress = "10.10.0.254";
+
+        config = {};
+      };
+
+      containers.netmask = {
+        autoStart = true;
+        privateNetwork = true;
+        hostBridge = "br0";
+        localAddress = "10.11.0.1/24";
+
+        config = {};
+      };
+    };
+
+  testScript = ''
+    startAll;
+    $machine->waitForUnit("default.target");
+
+    # Ping the containers using the entries added in /etc/hosts
+    $machine->succeed("ping -n -c 1 simple.containers");
+    $machine->succeed("ping -n -c 1 netmask.containers");
+  '';
+})

From 7c8b1e7b24382b198a1f29bfaada0936c1e99280 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 12 Dec 2016 09:31:02 +0100
Subject: [PATCH 097/295] python36: 3.6.0b2 -> 3.6.0rc1

---
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index f65989f5bb5..4654a6e1cb6 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -25,7 +25,7 @@ with stdenv.lib;
 let
   majorVersion = "3.6";
   minorVersion = "0";
-  minorVersionSuffix = "b2";
+  minorVersionSuffix = "rc1";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "1sk990n2xm5vhn3ys2cp427dx0z14cx3sz1za5f2fcwrp524bz9s";
+    sha256 = "01sqzz5iq7law93zgdxkb8sv98a493a2wzslynz64cl3hhdqr1pw";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From 98fce78cb3461afa83ac5a11be91bbe32fb97a24 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Mon, 12 Dec 2016 10:53:10 +0100
Subject: [PATCH 098/295] r-modules: Fix `png` package

The package requires the `dev` output of `libpng`.
---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5c05973095f..f168e115de1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -288,7 +288,7 @@ let
     pbdNCDF4 = [ pkgs.netcdf ];
     pbdPROF = [ pkgs.openmpi ];
     PKI = [ pkgs.openssl ];
-    png = [ pkgs.libpng ];
+    png = [ pkgs.libpng.dev ];
     PopGenome = [ pkgs.zlib ];
     proj4 = [ pkgs.proj ];
     qtbase = [ pkgs.qt4 ];

From aa1364affd8ff61dd5b3c10b012fb1298de18cdb Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Mon, 12 Dec 2016 14:25:28 +0100
Subject: [PATCH 099/295] containers: add tests for hosts and macvlans

---
 nixos/release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index 4fd48bc2477..683e09f431f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -229,6 +229,8 @@ in rec {
   tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {};
   tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {};
   tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};
+  tests.containers-hosts = callTest tests/containers-hosts.nix {};
+  tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
   tests.ecryptfs = callTest tests/ecryptfs.nix {};

From 570708183b74972932425ac1786f4fcd757ad99f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 8 Dec 2016 17:32:27 +0100
Subject: [PATCH 100/295] haskellPackages: add hoogleLocal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The docs in `hoogle.nix` intend for it to be in the packageset as `hoogleLocal`
and that also makes a lot of sense from a user perspective.

`packages` is not a function `HaskellPackages -> [Package]`, but rather an
arbitrary set of packages.
That is good, because that way it can be used e.g. to merge package databases
from other versions of the packageset.

It’s done as function with default argument, because otherwise the user has to
use `overrideCabal` to override `packages` in `hoogle.nix`.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6fb76bcfbee..700f9d0dbb2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -18,6 +18,11 @@ self: super: {
   # Apply NixOS-specific patches.
   ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
 
+  # enable using a local hoogle with extra packagages in the database
+  # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])"
+  # $ hoogle server
+  hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
+
   # Break infinite recursions.
   clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;

From 7c8d4cd9a9ab721c6bf7909315a9130b6d7a9f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 10 Dec 2016 21:45:03 +0100
Subject: [PATCH 101/295] wireguard: 0.0.20161116.1 -> 0.0.20161129

---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 9a378988608..2e2bb82d133 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
 let
   name = "wireguard-experimental-${version}";
 
-  version = "0.0.20161116.1";
+  version = "0.0.20161129";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz";
-    sha256 = "1393p1fllxvl4j0c8qz35k39crmcwrp8rjwxwn1wyhhrks8rs3bk";
+    sha256 = "1dyik704aixq38n71alpr4r8dxh7ipy7mgwbbccipsdadbjy7p3v";
   };
 
   meta = with stdenv.lib; {

From a86d6f404c451f6dca88f48f005eaf6e67441978 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 12 Dec 2016 14:17:06 +0000
Subject: [PATCH 102/295] firefox-bin: tweak updateScript

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index b768bfd6111..219f208af71 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -236,7 +236,7 @@ stdenv.mkDerivation {
         }
         EOF
 
-        cat $tmpfile > ${if isBeta then "beta_" else ""}sources.nix
+        mv $tmpfile ${if isBeta then "beta_" else ""}sources.nix
 
         popd
       '';

From c8c6ff4a96f1216fdb9c1fae6002b12d1b8deacf Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 12 Dec 2016 16:19:19 +0100
Subject: [PATCH 103/295] simp_le: bump acme dependency to newer version

acme_0_5_0 is no longer working and removed in another commit
---
 pkgs/tools/admin/simp_le/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 24bfe043b9d..b4ed398541f 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -15,9 +15,13 @@ pythonPackages.buildPythonApplication rec {
       url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch";
       sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc";
     })
+    (fetchpatch {
+      url = "https://github.com/kuba/simp_le/commit/9ec7efe593cadb46348dc6924c1e6a31f0f9e636.patch";
+      sha256 = "0n3m94n14y9c42185ly47d061g6awc8vb8xs9abffaigxv59k06j";
+    })
   ];
 
-  propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ];
+  propagatedBuildInputs = with pythonPackages; [ acme ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From ee4b59c5219146f36c4c25cf7b73521aa15bafcd Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 12 Dec 2016 16:17:01 +0100
Subject: [PATCH 104/295] acme_0_5_0: remove as it is no longer required

---
 pkgs/top-level/python-packages.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89971bdf05b..87cd2970fab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -412,26 +412,6 @@ in {
       maintainers = with maintainers; [ teh ];
     };
   };
-  acme_0_5_0 = buildPythonPackage rec {
-    version = "0.5.0";
-    name = "acme-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "letsencrypt";
-      repo = "letsencrypt";
-      rev = "v${version}";
-      sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm";
-    };
-
-    propagatedBuildInputs = with self; [
-      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
-      ndg-httpsclient
-    ];
-
-    buildInputs = with self; [ nose ];
-
-    sourceRoot = "letsencrypt-v${version}-src/acme";
-  };
 
   acme = buildPythonPackage rec {
     inherit (pkgs.certbot) src version;

From 1f811a67274e340d9e13987801fe726308e748ab Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 12 Dec 2016 18:59:10 +0100
Subject: [PATCH 105/295] rustcNightlyBin.rustc: revision bump 2016-11-26 to
 2016-12-05 with fix to contain components as libcore

---
 pkgs/development/compilers/rust/nightlyBin.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 47d918ddf3e..a60d17fb7cb 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -9,17 +9,17 @@ let
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "1hsvf1vj18fqxkqw8jhnwahhk2q5xcl5396czr034fphmp5n4haw"
+    then "1afsqaavhwiaxm38zr08cbq0985c7lrb1jzdcmq0jh6y8rb8ikff"
     else throw "missing boostrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
 
   src = fetchurl {
-     url = "https://static.rust-lang.org/dist/${version}/rustc-nightly-${platform}.tar.gz";
+     url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz";
      sha256 = bootstrapHash;
   };
 
-  version = "2016-11-26";
+  version = "2016-12-05";
 in
 
 rec {
@@ -41,7 +41,7 @@ rec {
 
     installPhase = ''
       ./install.sh --prefix=$out \
-        --components=rustc
+        --components=rustc,rust-std-x86_64-unknown-linux-gnu
 
       ${optionalString needsPatchelf ''
         patchelf \

From 7a25ceade189f1aaa19b44c25bc35e60b02d7258 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 12 Dec 2016 13:00:02 -0500
Subject: [PATCH 106/295] elpa-packages: 2016-12-12

---
 .../editors/emacs-modes/elpa-generated.nix          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index eb25a64b709..4d9d903c7d6 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -967,6 +967,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "json-mode";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/json-mode-0.1.el";
+          sha256 = "025bwpx7nc1qhdyf2yaqjdr6x1qr6q45776yvy427xdh4nbk054l";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/json-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "jumpc";
         version = "3.0";

From a448d478c0e6e8ef42e36f2a38c9e99b1d5e03b2 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 12 Dec 2016 13:00:17 -0500
Subject: [PATCH 107/295] melpa-packages: 2016-12-12

Removals:
 - bitly - github repo no longer exists
 - gitty - github repo no longer exists
 - gplusify - github repo no longer exists
---
 .../editors/emacs-modes/melpa-generated.nix   | 1039 ++++++++++-------
 1 file changed, 597 insertions(+), 442 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8ac53e85728..4f027897c2c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
-          sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
+          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20160819.2147";
+        version = "20161210.1838";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
-          sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
+          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1642,12 +1642,12 @@
     ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ample-theme";
-        version = "20161002.1640";
+        version = "20161207.614";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "ample-theme";
-          rev = "7546ab41c4c106be7b781a8c351abfb59fe95078";
-          sha256 = "124kxhp7q4ddlj4nhjn8y2w3s08ln8am49cwjvwsvrfliz87n9kq";
+          rev = "ab3bdaa99dda8ac86a8be44162ac0f2374392950";
+          sha256 = "1ncwzjh46df89zsh8y0nprdv2wb06aq6swfc7byi0ghcbd8x3jv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -2365,6 +2365,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "apib-mode";
+        version = "20161201.817";
+        src = fetchFromGitHub {
+          owner = "w-vi";
+          repo = "apib-mode";
+          rev = "940fb1faecb4b0a460ed36de5551a59ebd1edf58";
+          sha256 = "0sny3jv4amfc3lx45j1di2snp42xfl907q3l7frqhhsal57lkvd1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
+          sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
+          name = "apib-mode";
+        };
+        packageRequires = [ emacs markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/apib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -2450,12 +2471,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20161120.943";
+        version = "20161207.1248";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "a84e23eebf26b4f0f5fe9926d8feaf01e7d6c304";
-          sha256 = "12lrnv4aqwpvr40351n0qvh2d6p378qffh8fqw9x8dyzcxjyjhpr";
+          rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1";
+          sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2470,10 +2491,10 @@
       }) {};
     apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "apu";
-        version = "20151231.1208";
+        version = "20161210.842";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apu.el";
-          sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
+          sha256 = "0knmp8kryndpag0hy3mjbhmw9spvi6kzmx0s215m0lbiqzzibgwz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
@@ -4841,12 +4862,12 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160606.1343";
+        version = "20161207.711";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "6e1ba6edbd5a29991698806e775288fb3de2b186";
-          sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2";
+          rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
+          sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
@@ -4964,27 +4985,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    bitly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bitly";
-        version = "20151125.848";
-        src = fetchFromGitHub {
-          owner = "jorgenschaefer";
-          repo = "bitly-el";
-          rev = "fca9d8da070402fa62d9289e56f7f1c5ce40f664";
-          sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e6b1161d39ba66577ad57d76e4f4ea84e604002f/recipes/bitly";
-          sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
-          name = "bitly";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/bitly";
-          license = lib.licenses.free;
-        };
-      }) {};
     blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "blackboard-bold-mode";
@@ -5066,6 +5066,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bln-mode";
+        version = "20161210.610";
+        src = fetchFromGitHub {
+          owner = "mgrachten";
+          repo = "bln-mode";
+          rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0";
+          sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
+          sha256 = "0w4abaqx9gz04ls1hn1qz8qg9jpvi80b9jb597ddjcbnwqq9z83r";
+          name = "bln-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/bln-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "blockdiag-mode";
@@ -5236,7 +5257,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20161127.1727";
+        version = "20161211.1601";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr";
@@ -5465,12 +5486,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20161018.858";
+        version = "20161207.2252";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "f55bb2abdc139b8da0cb5c9764388bb5ad24e9d8";
-          sha256 = "04sv02mfjn3gvqpln0x7z5wa8w0dd2khv277jb84ifvy8bmchd2g";
+          rev = "396f6ca23e3a6d12cd3af4651d8130a5baf10e2b";
+          sha256 = "0d4lhaqwralv790ry6g84q0nk243dkaybf1nynr8kp0njhdif6k1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -5982,12 +6003,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20160514.34";
+        version = "20161209.154";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "794afbfa4c5a004fe8e0c5373be98671ee24c413";
-          sha256 = "1jhfpcz9k2kkg19gn3v4imahaf0w01gj04yw451x8dx1m7q1jaqc";
+          rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3";
+          sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6820,7 +6841,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11909";
+          rev = "11919";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -7525,12 +7546,12 @@
     ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ciel";
-        version = "20161110.2236";
+        version = "20161211.1946";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "1a19d08b14cd0f5a76b5681b2f80d65f06af3df4";
-          sha256 = "01l5rswqh9dk626ykmdvs2imaqli9f5pkyzl9j41nhx49c3j1q6z";
+          rev = "d8bf0d2829485886daddf8d4b11322a1ed7a0fc5";
+          sha256 = "1glswbpnvvngzahcn9jdy0jamr72xfcqaman6iqkgzxwj2kf84bn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7675,8 +7696,8 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "288906";
-          sha256 = "0m24mss1ra1k46vn473qlnjbm0zzw4s154gnhf0lpk4f80b9wy11";
+          rev = "289430";
+          sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7881,12 +7902,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20161127.1306";
+        version = "20161211.1451";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "0be07c6ca67a9ef52022286342c22eb4e0f3133c";
-          sha256 = "0g113b4mm5ggb67vmj57zy6p1q61pzff9hq06y2sm5lx8r5a3rk3";
+          rev = "1b49cddfff0420aa5f1ca7b6d1753b4e1d35cb7d";
+          sha256 = "0ywvww3r3lb90hi41ngkxgxxw2y7kigr2a31nbbg2b6h508r44qr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8229,12 +8250,12 @@
     clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clues-theme";
-        version = "20140922.2056";
+        version = "20161210.1752";
         src = fetchFromGitHub {
           owner = "jasonm23";
           repo = "emacs-clues-theme";
-          rev = "69d873c90fbf24590c765309b7fb55cd14bb6bda";
-          sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
+          rev = "16c05f6dbe7125358f8456110f237d68263e987a";
+          sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
@@ -8317,8 +8338,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "b620772b11fe396194148ec4768bd59ad89fb91f";
-          sha256 = "1n057g3fmycy6j0yw8a0avn1iblp0ymn24x2dv3b3pff26w7xfhb";
+          rev = "3874843f0f5be9d53001517b3697e0d092f0e845";
+          sha256 = "1qnnba479wb065yq1xg6jaddvmix1cdy39d2wg4n704dks9pyp8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9060,12 +9081,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20161126.1629";
+        version = "20161211.1850";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "ec7a8608853f41d42c357f214de069ae06c9d576";
-          sha256 = "13bdf1h09v6vn5947pl9hg90wp0ch6ng713fnwglca6lk5rf5fqd";
+          rev = "21357f6d6274420d0f4fda07841daf0853b4749c";
+          sha256 = "0nywpm89vw2qsplwndijxzl8bga7i69j3aspf9qbypnhlbmkvm0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9173,12 +9194,12 @@
     company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }:
     melpaBuild {
         pname = "company-bibtex";
-        version = "20161023.1605";
+        version = "20161210.1223";
         src = fetchFromGitHub {
           owner = "gbgar";
           repo = "company-bibtex";
-          rev = "223002a6ff83ff3851d07155b470d5941ba09455";
-          sha256 = "17y4i37a1j9crdl8bpbbs71l1mnkif8s42a3p7rgvp3mn6z8qsdi";
+          rev = "9b236cb9527ec69d73101193e6b53ad6080ea333";
+          sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex";
@@ -9688,8 +9709,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
-          sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
+          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
+          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9855,6 +9876,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-statistics";
+        version = "20151126.1246";
+        src = fetchFromGitHub {
+          owner = "company-mode";
+          repo = "company-statistics";
+          rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523";
+          sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
+          sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
+          name = "company-statistics";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/company-statistics";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
     melpaBuild {
         pname = "company-tern";
@@ -10190,6 +10232,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "copy-as-format";
+        version = "20161208.2152";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "copy-as-format";
+          rev = "a7f468f8d809ae1d2d9a3c74e8ab0b4fb6728380";
+          sha256 = "1ndksvs1f2xg5gkxzpf06a4wzkx49kjl7lmzf118fijd2cxx92d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
+          sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
+          name = "copy-as-format";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/copy-as-format";
+          license = lib.licenses.free;
+        };
+      }) {};
     copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "copyit";
@@ -10277,12 +10340,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161207.331";
+        version = "20161211.1126";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3b15585257c083706c32d0988f1982018fb17e9b";
-          sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh";
+          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
+          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10382,12 +10445,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20161204.1156";
+        version = "20161212.146";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "86ddf43616f2560f2b60b3f154783af25cd2e03b";
-          sha256 = "1plr44jaznk1kdphjb7wm1mnxxg75fm6s0pnqmxmi6830gfviylh";
+          rev = "5728486a2852cda5b6b12890de917326ce3bd75c";
+          sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10797,6 +10860,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "csgo-conf-mode";
+        version = "20161209.819";
+        src = fetchFromGitHub {
+          owner = "wynro";
+          repo = "emacs-csgo-conf-mode";
+          rev = "57e7224f87a3ccc76b5564cc95fa0ff43bb6807c";
+          sha256 = "14wzh3rlq7xb8djncbjkfiq9hl5frp7gp42sz2ic7aky4qajbcdv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2298e3f840da549707ec3270c8303f4f63a674dc/recipes/csgo-conf-mode";
+          sha256 = "0djx6jraqlh9da2jqagj72vjnc8n3px2jp23jdy9rk40z10m5sbr";
+          name = "csgo-conf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/csgo-conf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
@@ -11315,8 +11399,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb";
-          sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz";
+          rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
+          sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11626,12 +11710,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20161022.713";
+        version = "20161210.2038";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "c9a3a985ca1dec84557c45129798cfa7a3da4638";
-          sha256 = "11rhwddxw64xwhghlchrmm30dsg1bs7v2l14v9lf66ck8n3xzfpk";
+          rev = "9b349813bee4e0b0f1c89e6e9796f43de3930fc5";
+          sha256 = "1iivrz48h8f7rqbihxk2m2ffxlqfikd4bmf57d4z428d6yp31sr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12979,12 +13063,12 @@
     dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-quick-sort";
-        version = "20161025.1322";
+        version = "20161208.1312";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-quick-sort";
-          rev = "192a2535025d4644729b65f38474eaf54c999f18";
-          sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50";
+          rev = "1845f978d313f750a5b70b832457ed803c4ffbdb";
+          sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort";
@@ -13960,12 +14044,12 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20160128.951";
+        version = "20161209.631";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "53434afa3b56eb9284d5e2c21956e43046cae1fa";
-          sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
+          rev = "bebfa1b73e7e006d574a0e4fbae225dc1db214ff";
+          sha256 = "129kang099mw6lfi4616d47axm3q81hr8jhqwymc3ar9ramggyg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14492,7 +14576,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1773071";
+          rev = "1773793";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14970,12 +15054,12 @@
     easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-escape";
-        version = "20150718.1933";
+        version = "20161209.744";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "easy-escape";
-          rev = "c87d76e5001f36fbbf975e9ce7e776acd2dd7776";
-          sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
+          rev = "63fa5fcf9a53b7d3c1e872081e65afad5a722ba8";
+          sha256 = "11v5pzpyrzada07laa3jh6c1hafwrpx1pxvp7r1azqy9fpi3slnz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39e3b867fa3143e9dc7c2fefa57b5755f70b433/recipes/easy-escape";
@@ -15117,12 +15201,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20161206.1633";
+        version = "20161209.1546";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "87546fbf0202ca4f476b77f8afaaa532f38dd2d9";
-          sha256 = "0wwk3xv0qv9fl7crdfbldsnwxwnhqqsq0kgyp4vfwjqyrj78cb66";
+          rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c";
+          sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15576,12 +15660,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20161205.1743";
+        version = "20161211.2144";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "627588cdecba03faad831fae380f1540551b893f";
-          sha256 = "0yivg6caiqhflijj8m24nl2s3klazy3sbd2bli145hrddfjhzn8z";
+          rev = "19e81d24f33da40cd414142e44a55957ac9be83d";
+          sha256 = "1xcfyqnannnm6myv7pn2gjwnlq7rq4zciiykj5fs9kziaf4qggnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15736,8 +15820,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "60c403e10a530ac503367bc538d9d0f48478089e";
-          sha256 = "0y3g5n77qph41d07zblj962g247j9bzcp28mdp80k229w1j8x90i";
+          rev = "87b279f0e1ea1754215eceef007c8736d4bd9dfd";
+          sha256 = "1zjy8zmsh6n535cazmkrr081rmjaigkqxx134sam474dzbmcybdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15923,8 +16007,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "840c4b1c8aecde69e79c5ec944a62fb8e9e82f74";
-          sha256 = "1nvd2jlb3qaharij3hqcp98vzawyf4p0f72fwd61ld13bmxlxyvi";
+          rev = "ce9dc5ec48dae139338c69a53f9779876038bb54";
+          sha256 = "0wknmkv38zf8q4qd2iasng08mia1x7l813qzvysw8lv1x45gspsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16228,12 +16312,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20161023.241";
+        version = "20161211.1122";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "cbb27a753bb3ff69c2fbe31e5d9df77f764f5472";
-          sha256 = "1wb00qms1rpz729zkdnk1j2mh2lnx6cfh5g9i7la4pnfdvsgpy4j";
+          rev = "86d5ae04c35642cbccfa75a12008f7b65d63312b";
+          sha256 = "189vxvhp018bs42qb6z9nfw51nsmjfb5q66w3hr5zgkapxwgjpsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16249,12 +16333,12 @@
     electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "electric-spacing";
-        version = "20161127.720";
+        version = "20161209.1157";
         src = fetchFromGitHub {
           owner = "xwl";
           repo = "electric-spacing";
-          rev = "b9a4bb5e9a5867d089779e62e1e51072ffc3c8f8";
-          sha256 = "0a7ikd46xwjpc8ya2cb75xabrihn58ihk4r1wpsqj6dkhifch47p";
+          rev = "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0";
+          sha256 = "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing";
@@ -16312,12 +16396,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20161122.1713";
+        version = "20161211.1108";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee";
-          sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm";
+          rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
+          sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16386,8 +16470,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee";
-          sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm";
+          rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
+          sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16592,12 +16676,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20161123.33";
+        version = "20161210.49";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "529c20acb9efda756b69e267d73d33c66fa08293";
-          sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx";
+          rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
+          sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -16820,19 +16904,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
+    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20161125.56";
+        version = "20161211.1045";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "1332a08d5895acc5d14f23dea927fb8e715bd415";
-          sha256 = "1alsygm1n24y4asf0l0bgg3l0i628m7xpva8xfw1vw69r06dvypp";
+          rev = "6b139ed3f28cfe255288aa07f14c49f1f15132bf";
+          sha256 = "0hmk1pi9mv74ry3mff854qz07rpiirn275wkd6s4vqpy7m8za4rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
-          sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
+          sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
           name = "elpy";
         };
         packageRequires = [
@@ -16840,6 +16924,7 @@
           find-file-in-project
           highlight-indentation
           pyvenv
+          s
           yasnippet
         ];
         meta = {
@@ -17232,8 +17317,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-emamux";
-          rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73";
-          sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b";
+          rev = "e4611a4049d3180e35da6419cf01f15c8fe2575f";
+          sha256 = "1gskns6fqgp575hvk3jxl8wjlrh3i6wq1s4lwbgx0m5qybgqa62q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
@@ -17709,12 +17794,12 @@
     emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
     melpaBuild {
         pname = "emr";
-        version = "20161206.1325";
+        version = "20161207.1229";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "d1b2db7b4aa60379528c68753e0fb7952c803830";
-          sha256 = "0y01flz5q3q9kdxgw9n4bxagygvy73y6x5k83kyxrjiz4m3xz21p";
+          rev = "483877f912944ff0e4a51362548c3528c4df068c";
+          sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -17893,8 +17978,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "8a0e14c292814c072633681bc8d06a8b821be052";
-          sha256 = "1xfnj7khfqx6m1121jlym35bfw3dgw1p5kx6qs0g15s8bnjbp3bj";
+          rev = "5156f9b1b748c3e2246730d3234121b36e6d7553";
+          sha256 = "08m5ps972fbjwz97s6bs92icf7x32kh2invjdypy59zj2q0pdixv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18530,8 +18615,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a0d365fc3c41464e77d24942aa3255788c5959a5";
-          sha256 = "0sikbfbh8im6lrgylbnidgz7jzz3prip5xxmj1vx077jsbs263al";
+          rev = "b47d104994c6f11301f23b0675ed5f06f3e25922";
+          sha256 = "06498ydjw27wvyaxrc6fxf1z3ymw5cgy553ij2p1s9d4b78czlm0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19569,8 +19654,8 @@
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "5fe309effae89fa60a3b9dc47383fa54fce2bc7e";
-          sha256 = "0nsragb714xycmq35kl29ngmchwapvm2hdk0fc29iv75mrmflnr1";
+          rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e";
+          sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -19968,8 +20053,8 @@
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "5db7d1cb39d3193089407deee4a2b21a5b1ef782";
-          sha256 = "1lghqmdlbz56a9g0p5r4wgw24zj8ymqjarx03zxqqmjigy9792h4";
+          rev = "124ac33859cb5f0d7928b5de62e5b40159f84478";
+          sha256 = "1lhgxb2fsl66c0a2afn56h4rqs2x2v7ijskzv95ag7i0zmjgrfds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20090,12 +20175,12 @@
     evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
     melpaBuild {
         pname = "evil-opener";
-        version = "20161017.235";
+        version = "20161207.1010";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
-          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
@@ -22081,12 +22166,12 @@
     flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flim";
-        version = "20161029.1930";
+        version = "20161210.1728";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "flim";
-          rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0";
-          sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk";
+          rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb";
+          sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
@@ -24490,16 +24575,16 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20161201.113";
+        version = "20161207.1442";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "0d22cedbaf2530386eeb5faff8feef6a7a25ee82";
-          sha256 = "1y3kr2k7h7w7d8k2ivj06fy4cqhw7gin39id2m3zfidq1cln02aw";
+          rev = "0bbf7992d618a84f823b21de5eb36a7cb081e35f";
+          sha256 = "0566l9zrz8hsmjcywn7851rgrrjq2qfhnlkbcwgn0n0q98x95hq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode";
-          sha256 = "09arqyzsfiqblpxb6kv1nwcdr1ify96814jvxrqwkd20rxx1d79j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
+          sha256 = "0j60abi5qyy94f4as90zhmkb12jdirysdbq4ajs5h91vi6gb1g3i";
           name = "forth-mode";
         };
         packageRequires = [];
@@ -24805,12 +24890,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20161017.739";
+        version = "20161211.2200";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "52b4f97c0852fde10fd8de40c1ace626923f77fc";
-          sha256 = "18b2sifxvwb8biq3d4vksad093mxmbvlzfbba22fi784fainvvvq";
+          rev = "b633674651d324a2aa09a53134e5a617d7ee5f87";
+          sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -24829,8 +24914,8 @@
         version = "20161123.2000";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "4e3fe96d3db816da1a1e252eb3a9c1d6424fa786";
-          sha256 = "0fm2wxll3y5ypjqp324znzi94dpxpkbn9s0zf2klgjzd8mb97x5v";
+          rev = "aa5334420c42399d929cc6506a6b71c724c47df1";
+          sha256 = "19i5c5v0d1h12jkwbbg47p1n8a99ic7hl5avi8xndsm958aghcdl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25279,12 +25364,12 @@
     general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general-close";
-        version = "20161207.434";
+        version = "20161208.1021";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "general-close";
-          rev = "ee920766ed53b29dc87f4ec400b8212c9a8c1198";
-          sha256 = "0krc3lp5k8nm67623v6lr41sj1fnyvp4axbs2pgh0biiq7yaff2i";
+          rev = "aab9b0bdb147ccae2b8b49a8bd2f1ad05f435909";
+          sha256 = "122lm7yh5nf6s6pf64fmsqvr4aqidbjx7vsizxpwjk1i47hj48q3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close";
@@ -25409,8 +25494,8 @@
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "gh.el";
-          rev = "a30668ac60e54199025d96a59a9f718dfe0130bb";
-          sha256 = "17j66iqqnwlbaalcy45l0vy37rll59z7rd5vkckgfwlnzxn8k1pg";
+          rev = "6a76836a2ed1ebc3380dcfbe2b46786abf905fab";
+          sha256 = "0anlavmfhm0ax6566sl9ih0j4v80s313n32d4yfp9lh4f1drp62k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
@@ -25745,8 +25830,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9";
-          sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk";
+          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
+          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26284,27 +26369,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "gitty";
-        version = "20151120.2348";
-        src = fetchFromGitHub {
-          owner = "jorgenschaefer";
-          repo = "gitty";
-          rev = "c7c3d622d59531d023b9184d2479316c28045ca2";
-          sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/01d314eac1da048fe67eb907c42734f495462c20/recipes/gitty";
-          sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
-          name = "gitty";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/gitty";
-          license = lib.licenses.free;
-        };
-      }) {};
     glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "glab";
@@ -27268,22 +27332,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-maps";
-        version = "20161120.1342";
+        version = "20161210.458";
         src = fetchFromGitHub {
           owner = "jd";
           repo = "google-maps.el";
-          rev = "8b5f6012e28de0ae96d3162b21004308f5105c5f";
-          sha256 = "18vmcda7p1ch7bvvq7abczarfz52nymc4j3ykd9d79vrxkzfzq98";
+          rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7";
+          sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/google-maps";
           license = lib.licenses.free;
@@ -27482,8 +27546,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "5b4d52150638665b6378a65b3d579c74718c5bff";
-          sha256 = "1x46axy950x8japxiabrf293x7jn146jrdimznmckkapfszxrpdg";
+          rev = "b5c807e3033ca8173cb48e8ef22f6cafc55244ba";
+          sha256 = "1i53iqcnq4bk29n7yj90n9m4g7qzdxp51c5mdgyvkdlwy3mry3i9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -27517,27 +27581,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    gplusify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "gplusify";
-        version = "20150312.1244";
-        src = fetchFromGitHub {
-          owner = "jorgenschaefer";
-          repo = "gplusify";
-          rev = "bd6237ae671db2fbf406dcc6225839dcbd2475b2";
-          sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d7d6cf6cca5e6abd1e7b0835bd6aba4f156369d/recipes/gplusify";
-          sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
-          name = "gplusify";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/gplusify";
-          license = lib.licenses.free;
-        };
-      }) {};
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
@@ -28597,12 +28640,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20161110.316";
+        version = "20161212.116";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "023989e46d6449532f3ab7581ac56b31f87a9448";
-          sha256 = "0wx5dlq9l0r79adfg8sadclk1i2ab3vs4925nwxdx11ccyxph55l";
+          rev = "319020de4a79a005eb0fe651222430ceedcd332d";
+          sha256 = "1slagi6f0mkzsjhy0cldlp5g1aqgiazkdb1mrzafw5cr12pdi9zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28865,12 +28908,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20161207.428";
+        version = "20161209.753";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe";
-          sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43";
+          rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2";
+          sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29432,12 +29475,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20161206.2324";
+        version = "20161212.408";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe";
-          sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43";
+          rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2";
+          sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29516,12 +29559,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20160802.1147";
+        version = "20161207.1232";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "414e2a19664c21010622e41da49ef90cfc8075c7";
-          sha256 = "02dgbprhvrij4k5wgvfgx8wpi36wwk5rsyfsya13mz6navx5nqgs";
+          rev = "b649ca44481e874146df8b88cc8750589dbdc232";
+          sha256 = "0wchzxfd16g7idlvfa1idqivv7m2nvnil94b2fx39q9zcs0qzw4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash";
@@ -32146,12 +32189,12 @@
     highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-stages";
-        version = "20150421.2057";
+        version = "20161212.241";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "highlight-stages";
-          rev = "c5a01b29cf79cebd09da863d45f9f35f6ad3bd06";
-          sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
+          rev = "d2c4f78ca9fc696da05fa05e3731c9a130a578da";
+          sha256 = "1sl419f957q9c04lm10i4jawqz28mymyaiwvk4dwh1x1iqa37qsw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages";
@@ -32951,12 +32994,12 @@
     htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "htmlize";
-        version = "20161206.1142";
+        version = "20161211.1019";
         src = fetchFromGitHub {
           owner = "hniksic";
           repo = "emacs-htmlize";
-          rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797";
-          sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z";
+          rev = "88e2cb6588827893d7bc619529393887c264d15a";
+          sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
@@ -33572,12 +33615,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20160623.815";
+        version = "20161211.910";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
+          sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -33870,8 +33913,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
+          sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -34442,15 +34485,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "importmagic";
+        version = "20161208.108";
+        src = fetchFromGitHub {
+          owner = "anachronic";
+          repo = "importmagic.el";
+          rev = "e536d96fdf4bfcbe44eb22827dec0955551f537e";
+          sha256 = "05ayg63v3a57d0x6lzkb25z7gwf4dwa4j56q25fk0p6y5ynrhfwr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic";
+          sha256 = "1d85sg8wsm03v8zmv5w0znkgnr4q33x0d3frkr16dcmgqh2z9lgp";
+          name = "importmagic";
+        };
+        packageRequires = [ emacs epc f ];
+        meta = {
+          homepage = "https://melpa.org/#/importmagic";
+          license = lib.licenses.free;
+        };
+      }) {};
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20160913.1754";
+        version = "20161207.1714";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "2f764164d0ceb5dceddd8642447b74939d98d583";
-          sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b";
+          rev = "38cc1c64d6f897230125c3590157f25c09703044";
+          sha256 = "10ymf5fwkxcs94pxvv754krqnvzz9hjv44ma7bakz0r1rfgn1jhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -34463,22 +34527,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indicators";
-        version = "20161203.349";
+        version = "20161211.326";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "indicators.el";
-          rev = "d80155197d4a5691ca038c2f3cc14cf4b2a4a3d0";
-          sha256 = "1xrc3q7nnfcfycklrj7r6w36sipc7am1izx9kjqzalarkajlcsfl";
+          rev = "f62a1201f21453e3aca93f48483e65ae8251432e";
+          sha256 = "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "https://melpa.org/#/indicators";
           license = lib.licenses.free;
@@ -34633,10 +34697,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20161127.1748";
+        version = "20161210.837";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "0mz8vq55r3n89187q2qc60n0s5iigv0i19pzb3zxbca8769vlbdc";
+          sha256 = "1d2n5yyrm904f22s8d4wqk66p646c7yx4rpsymp9cfgjvwlbar96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35298,10 +35362,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20161205.1445";
+        version = "20161210.1812";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "02k88x6gn9sk7w352q2vgzgfmmv0p2gv4k7wm9k5pyymy0j9skna";
+          sha256 = "01y1r0drfhjq87ip1mai4p47ivhc0gvfman8p9g6fqbywskdnnxm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35524,12 +35588,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161204.48";
+        version = "20161210.333";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3b15585257c083706c32d0988f1982018fb17e9b";
-          sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh";
+          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
+          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35612,8 +35676,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3b15585257c083706c32d0988f1982018fb17e9b";
-          sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh";
+          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
+          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35816,12 +35880,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20161124.500";
+        version = "20161210.804";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6";
-          sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd";
+          rev = "2bacd4da0b190547d2d767adfea1b3c4501710c0";
+          sha256 = "18r8rkcqrcizg884axf3d2zi9a6d5nlh1syn68l17yf2fi4mkkzw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -36152,12 +36216,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20161206.1410";
+        version = "20161207.1325";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "e903628a0260787e4fd0834b314cba63cee53f63";
-          sha256 = "1444yzxxfmwq5igcxlzd9yknghqbzinimsc23zbsk21in31rrnlj";
+          rev = "c4ee9b3fefe42e00475af452d7c664c62dbe067b";
+          sha256 = "11sz08a59hqcyynmd2zyllbvqnh7ll0ql22vj4gxrvkv18sb79za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -36608,22 +36672,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-highlight-vars";
-        version = "20150914.108";
+        version = "20161209.128";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "js2-highlight-vars.el";
-          rev = "5857999e6a376810816a0bee71f6d235ffe8911d";
-          sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
+          rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56";
+          sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
-        packageRequires = [ js2-mode ];
+        packageRequires = [ emacs js2-mode ];
         meta = {
           homepage = "https://melpa.org/#/js2-highlight-vars";
           license = lib.licenses.free;
@@ -36632,12 +36696,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20161205.1446";
+        version = "20161208.1415";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "3106e3c47dde930fdd4867e8583fd7e9bb418996";
-          sha256 = "06wvjbxn6dbrwi26flqbs6y8c4dw7nr0bdsplwzw2ikwpdsgjsrv";
+          rev = "6f2d51bd723126f82b491b5e2515356018a48849";
+          sha256 = "0bnbfbii0gq6rai4r62c9yaw6q1hlkiw038x0g2skmhnwm24ciiq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -37465,12 +37529,12 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "20160902.513";
+        version = "20161211.1015";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "14c86914b708081299cf6a290570ff8e11853cab";
-          sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv";
+          rev = "8c88aa025201d4d890ab4eb51ce20d3c1ad20454";
+          sha256 = "19pjxhi4vp1xb7q9wrknvypylrnx052c9r3s0kl65wqasiqmrans";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -37700,8 +37764,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "0ebcdb7e4eb5dcab919779111374191bcf0f03a6";
-          sha256 = "16g5s7s3rdd8jvm9g3bhdq3xwgx5gf4nxdjw2pbqhiparnkkqsz2";
+          rev = "a58a88c506472302eee373b689cc297f64e42476";
+          sha256 = "0sgfl1d7dc7xppz6y9jchyl0dsx6jinjza7r1ak0ij5m32070zm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37717,12 +37781,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20160902.759";
+        version = "20161211.513";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "686bac60f942665ddf695e761a1a37900c30885f";
-          sha256 = "1salimr0295hqk14g0s3lw8a7znkkfw2mdk6g1ij07lc4cahhfx6";
+          rev = "34851315ae9df84107f99236a0312ca4408838b6";
+          sha256 = "19jlrhrm1aciw20a52ljjzx3g17izkznxhg6j9q920v72dwm2z0m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -38011,12 +38075,12 @@
     labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "labburn-theme";
-        version = "20161108.139";
+        version = "20161212.313";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "labburn-theme";
-          rev = "3d180e556e20520081cbd05ec51aeb527bb48846";
-          sha256 = "11p86v1qmgrxsv4zr14ygs43s9vdn4kscxr3gbjxz31ikbxf9w3g";
+          rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484";
+          sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
@@ -38574,12 +38638,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20161202.46";
+        version = "20161211.1055";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "a8c6fc562043f1f4821d44e097713db2c67526ce";
-          sha256 = "0l55k47szdhk4hhkddpfq6lrya9gc5n0ayslzjvz8g07g3m6p1y3";
+          rev = "10585a4333b409ee8b6e1a329de912464b69351d";
+          sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -38951,12 +39015,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161129.743";
+        version = "20161211.1128";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "806b7dd5deb620751afc88480888e9bcc9f38e88";
-          sha256 = "1c0zxjkq25a5aqxmbmnjih44as21g6yva05h9srxzbwn0w45mv4f";
+          rev = "b50c07af1ee414c73b4dd53d6ca19ca4e473763a";
+          sha256 = "0i5zgrym9bh1b584qwh3npw4383s9arbs71xckp28di9w249sm4v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39351,8 +39415,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "1517e2ed72820d41a169f195c500d7adf2ff65ea";
-          sha256 = "1bi1pk6yl31fg8yv6c7dkkb57ahs9cig2dy0lw137n4bgrd4l3jd";
+          rev = "f00c869d13d6af87f02ebf0bc5b682d5260436c6";
+          sha256 = "0667v43kd1ld764550s0qjki71iv4bp02nmdywbwfv60l76f5swl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39928,12 +39992,12 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "20160522.729";
+        version = "20161209.1826";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "3f58122429ea24c54fca79a91605eb660ee5bc3e";
-          sha256 = "109j4czb71qg9jlnflzph0qmbxyfajddmg0yqwhl368pa29alvrk";
+          rev = "3a5b86370cd495622be0200220405f48ea2aadc1";
+          sha256 = "1dw4r21c45l51l49n6jddn479kx2rmf27xm69cg1fp9xvadxqcd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -39970,12 +40034,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161206.2039";
+        version = "20161210.737";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9";
-          sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk";
+          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
+          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40145,12 +40209,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20161206.1703";
+        version = "20161207.613";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9";
-          sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk";
+          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
+          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40520,6 +40584,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    malyon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "malyon";
+        version = "20161208.1325";
+        src = fetchFromGitHub {
+          owner = "speedenator";
+          repo = "malyon";
+          rev = "0d9882650720b4a791556f5e2d917388965d6fc0";
+          sha256 = "0an1yvp0p624rxd8n5phiwvznw35ripqhlwzwyv2bw7lc1rscllr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/54b3785cfcdb3b54307f60ee634a101e8bcd9989/recipes/malyon";
+          sha256 = "050kj4c1vp9f3fiskf8hld7w46092n4jipdga226x97igx575g3r";
+          name = "malyon";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/malyon";
+          license = lib.licenses.free;
+        };
+      }) {};
     man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "man-commands";
@@ -40565,12 +40650,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20161202.2205";
+        version = "20161211.2253";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "2282848c1ab80f606390824711ca4a80548e6dac";
-          sha256 = "0ckm7a0x367k3vv8ighl2ah2h8nwsgzqn30makrr7gqid6fas92s";
+          rev = "04f1aaf687ad1d3bf6bf032b817032b82a6cd6bb";
+          sha256 = "0pf6hcbd13gfjb58z2cgc4ql2m08kx0inxz1x7sfrpg1cvh8nb8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -40751,22 +40836,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, web-server, websocket }:
+    markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "20161207.59";
+        version = "20161211.1443";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "e1fce78ad3b96799675765140e0fa6936467be62";
-          sha256 = "0dwrb0b0ninasf538lsv41gq4v3pw15i6mc90cs3nqi50i5l64c6";
+          rev = "b55c8ddba2f9c4e87f0dd9bed586f4d94890350f";
+          sha256 = "18x7mk4xysiihr707xl4s52a73mpj9bwlh53gli37wmpjfgdlp1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
-          sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
+          sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
           name = "markdown-preview-mode";
         };
-        packageRequires = [ cl-lib markdown-mode web-server websocket ];
+        packageRequires = [
+          cl-lib
+          emacs
+          markdown-mode
+          uuidgen
+          web-server
+          websocket
+        ];
         meta = {
           homepage = "https://melpa.org/#/markdown-preview-mode";
           license = lib.licenses.free;
@@ -41400,12 +41492,12 @@
     mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "20140904.1710";
+        version = "20161211.1946";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "f5d653348140cdab1d8ee9143b14a50ea88ed3fb";
-          sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
+          rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
+          sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -41420,10 +41512,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20160918.1025";
+        version = "20161209.734";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "1kzmdanaf167qvmybf6hfbgia628xpqycnnl4a9qms6vfjzmqznk";
+          sha256 = "18i4isl86ldmbxkyiqiawby1izhdhpa8x7zyvzbfhzrny15dp32p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -42348,10 +42440,10 @@
       }) {};
     modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-char";
-        version = "20160523.1520";
+        version = "20161210.852";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-char.el";
-          sha256 = "0qikw44mj209xycchxqifbn9vwyd4zd2d25w8m134cnkhbbjmf5q";
+          sha256 = "06n97a196rqc88py7jnydv8a4q1vd0bb2ich2mx25sl3pylmd6lq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char";
@@ -42699,10 +42791,10 @@
       }) {};
     mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse-plus";
-        version = "20151231.1525";
+        version = "20161209.737";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse+.el";
-          sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
+          sha256 = "1jr6m5cm6j6bfdk2f2n632aybjna4pcpyqm6j9flcr537fciwvap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
@@ -42866,8 +42958,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "b2a74bb1bab6cc3de8611b7679b4c79f45d8ddb3";
-          sha256 = "08ygyinb5p9xiszmvdscnmmbiznxdz96v3rl0pw1vjmghl5v7j8w";
+          rev = "fdfe0d73b72682022c76dd7dfe04b0d63d524779";
+          sha256 = "108cicmggkzrvrjkja1f0n2gnqfnisiq7wsakgscfpxjsmyszhsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -43093,12 +43185,12 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20161205.2";
+        version = "20161209.635";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "0b7908280c97c1fe29de0d10ac2715344e36b1e4";
-          sha256 = "0ifwf5skadck4x11v6s12pdfraxcmdj335jmhvgn3r4gzg55qgl8";
+          rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874";
+          sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
@@ -44529,8 +44621,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "ceeedb58d23950f0ae3944484bca331e5cbb8053";
-          sha256 = "1pnh32h2ga5ny6b4snzlsv4fbp30dzmkhs58aajp5zx05bngvgkr";
+          rev = "05f907787fdc1903af0366d72cf6c30e9835182d";
+          sha256 = "1mb9kbd1qdqmfljjqgam3ivd5iap315fmw8hihl6afrnw42281rv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -44651,12 +44743,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20161130.519";
+        version = "20161210.929";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c";
-          sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg";
+          rev = "403e62a1f434664c9e9477d574f18ced258359fa";
+          sha256 = "0p0xz6vj3qv3wx9bwg6syi6alw223zc0l2h95bgcx2pi40da94w0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -45336,12 +45428,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20160709.224";
+        version = "20161208.222";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "47a7b367314f6051715882e46a0e40477bda20a2";
-          sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw";
+          rev = "9155a413e41d918042e9839399e3940aa0f8499c";
+          sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -46350,12 +46442,12 @@
     open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "open-junk-file";
-        version = "20160912.1859";
+        version = "20161210.314";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "open-junk-file";
-          rev = "31b6a88001d66cda95eabb444df188a61bde6346";
-          sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp";
+          rev = "558bec7372b0fed4c4cb6074ab906535fae615bd";
+          sha256 = "0kcgkxn5v9bsbkcvpjxjqhj1w3c29bfb33bmiw32gzbfphmrvhh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file";
@@ -46392,12 +46484,12 @@
     opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "opener";
-        version = "20161017.236";
+        version = "20161207.1010";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
-          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
@@ -47292,12 +47384,12 @@
     org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20161126.1955";
+        version = "20161209.2253";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "28b460821c6227402ed2cb3222ea45bb99f7d43e";
-          sha256 = "1x3y5jlcvqzzxi1rvhj9hbirgbav82m7kqmc49cjcdga5zs4x458";
+          rev = "370c05876f151e7aba9c63562d41d9b7cade30ed";
+          sha256 = "0scslv9il8i6yz2akrz88q7dig1lf2sz34c7hn2adbkl0ykj4wh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -47379,8 +47471,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6";
-          sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc";
+          rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526";
+          sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47399,8 +47491,8 @@
         version = "20161126.239";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6";
-          sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc";
+          rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526";
+          sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47745,12 +47837,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20161129.417";
+        version = "20161208.1825";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "d3319a7a3d724ee51a9b97328bf778324e4ab9e7";
-          sha256 = "0s3h1yji4z42nd2pc50mddpvpkgi7066c3l1kb6jaywaj3yw2bi1";
+          rev = "f5a5e5e20e5f99d069d3fd8c89ee5b186a02f1de";
+          sha256 = "0szn5rg3xwlfgkq26fadkdsxdx2a1srshwcri9j0rlj4111c2fp4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -48476,12 +48568,12 @@
     osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-dictionary";
-        version = "20161115.2350";
+        version = "20161207.810";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "osx-dictionary.el";
-          rev = "8bbe1c700830e004f34974900b840ec2be7c589c";
-          sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn";
+          rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
+          sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -51013,8 +51105,8 @@
         src = fetchFromGitHub {
           owner = "j0ni";
           repo = "phoenix-dark-pink";
-          rev = "bd4962562a3d9f7330b9fbe8684ac6ba76feaab5";
-          sha256 = "0mm8gyw6qzn6bkghrdsar0gbyv6sz5x2m3dii0frablgw9zac4nj";
+          rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15";
+          sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -51639,12 +51731,12 @@
     platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "platformio-mode";
-        version = "20161206.636";
+        version = "20161210.539";
         src = fetchFromGitHub {
           owner = "ZachMassia";
           repo = "PlatformIO-Mode";
-          rev = "9cd77621fb1aa64c6d2b346cef99373d659e4999";
-          sha256 = "1myq0k8hnd8niwwskbfyy17lhgislzx9gshgsfhr8xg6b4id3p1k";
+          rev = "1466aed132a77f48fcb31938d64abb1a1e58ec42";
+          sha256 = "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode";
@@ -51825,8 +51917,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "7eb592d6a7071a4d8d33f15668c33da79ec42780";
-          sha256 = "0d3vqx0khw46g9692cd7nf5xpgbmsw9r79s4jmm11wsz552fp7d1";
+          rev = "94737a1be1a1d68f7e032ceac9cc2ed770f36196";
+          sha256 = "0f87ghm106c1f8jngcjzxg0fmdp087p4dh2yhdhaln7rd8x4zl6y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -53259,8 +53351,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "607b92149948393311d66329b9851f5971662f19";
-          sha256 = "1pdszacywqkk2p5f9jigbm0brz0i5a1n9lijl1kcx4lblzyq755d";
+          rev = "277a8b65805aceeefc1764947616430994e05bdf";
+          sha256 = "0ykx4wgi58hgndpn5ifrn6kgmm57gx8h7np1b31mml4n7si2bsfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -53402,12 +53494,12 @@
     pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pug-mode";
-        version = "20161206.1934";
+        version = "20161208.2016";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "cd4cc093c62735c3947f4f7ff458a2a0a153645f";
-          sha256 = "1bbqm704cfm76qd6fh9x4lij72hchciy60hjp2wxv2n5j51xqlq7";
+          rev = "e8099627829aef2d382d9a5df4a24881086879dd";
+          sha256 = "1w9lb3r92l0rcflkivd0k9gz2gy33xpmyxd1ikjbsr2mf7h0r1i7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -53947,12 +54039,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pyimport";
-        version = "20160705.1444";
+        version = "20161209.557";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "f5e56b683eed07bfbcc2fe7256b59a8e8c09a492";
-          sha256 = "08b0bmky35wfzy2ax7llvw19clkh5gb5if5k46s1js5a193l2qd1";
+          rev = "c0c12b64a189f99d3b1477d2dea35528a856c860";
+          sha256 = "1kn38j9fgn0ja2xhvj69jdw5h6j5dqnnqk0zzd6ypk5zbwhxncp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -53993,8 +54085,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "dcebae55d3b3246078658cd3a2f100f80a8cff32";
-          sha256 = "0gmia3yd9rvvriy04m91zrgx2sd1if141317741vv250ji4lql7w";
+          rev = "3a94b38b26b5f4191ffe8c67e1db272a2570489c";
+          sha256 = "001c068s56qr1vkmli0mxc985drb5vwcln7fzs605kjlvfh0mwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -54493,12 +54585,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20161112.1728";
+        version = "20161209.1533";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "ca5b2f2922d9ab642ee353771091f4f8dd5add83";
-          sha256 = "0j9yrb3xhx4wkk2hyk9ayzh4l1mrcvmwrg52a0dm9zpq4pr8p61s";
+          rev = "485b827cfaca5e4e204e5529912d7999bc29bde7";
+          sha256 = "0xjv8pi8rc0dbmllkv8gchp05j1k20pgqdi97h7s0xwjkwcpbqym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -55186,12 +55278,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20160829.1821";
+        version = "20161209.1829";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "809658d30038e4fab186d47730a3790abf7cd2a1";
-          sha256 = "0r1xz8l2513xhzc0dv97g4r6pxnyk5kwcih4jfribhxil0xjd5g0";
+          rev = "7689f4910ce081dcecdcc8a7c534af037c65295e";
+          sha256 = "1aq8r2yqwspil9l4jxprkknnj2cl9x9srx4qd8fw07ad7razcf99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -55317,10 +55409,10 @@
       }) {};
     recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "recentf-ext";
-        version = "20130130.1350";
+        version = "20161210.840";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/recentf-ext.el";
-          sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
+          sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext";
@@ -55505,8 +55597,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "40f94f3c63087c05ff989dd3dc27db0ef9a638e5";
-          sha256 = "1fjr85b5k8zfcdsa4si602r12x0pa7xb208y3j5ld35gwmwr493x";
+          rev = "8cf6e816720cd7a8fe147a6f412d0300be015a76";
+          sha256 = "1ic32q9dcrfpn8zb5bmf21iklhrr3va54kmdpy3iyyvkxs8ipcyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -55918,10 +56010,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20160508.843";
+        version = "20161209.738";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "1a59nqrs62xzdpi7as00byf3jamr1zsz8jmf0w4mqag4bp79cd40";
+          sha256 = "1898bwn0slhvkqcriwipa8d25554npj9b1hkz7rxz1pw7s8hgmck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -56733,8 +56825,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "cc36a69e4190ed2b071c136b332ec4bca10e967b";
-          sha256 = "11h8r79v79fhhbjyxlazzqrqxw8abf6xy6a9bh4gp0j7l4kmch98";
+          rev = "9063198b8c19995b3d1fce8c441e1244ada0b987";
+          sha256 = "03b8ajpx7vjkyn6amgrfx90v4pp3020fhq6qvb4h6s3hqsmgfzmz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -56795,7 +56887,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57016";
+          rev = "57064";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -56875,7 +56967,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57016";
+          rev = "57064";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58021,10 +58113,10 @@
       }) {};
     second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "second-sel";
-        version = "20160918.1024";
+        version = "20161210.820";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/second-sel.el";
-          sha256 = "0kc3fmg92blqbx85ykxrd4n0rcjfjhxxig4xjw3ah3cpp39zcsxx";
+          sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
@@ -58413,12 +58505,12 @@
     seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seti-theme";
-        version = "20161028.816";
+        version = "20161208.836";
         src = fetchFromGitHub {
           owner = "caisah";
           repo = "seti-theme";
-          rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8";
-          sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h";
+          rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132";
+          sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme";
@@ -59365,12 +59457,12 @@
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20161130.609";
+        version = "20161212.642";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "070aa311b0a08b530394c53d0c52c6438efbc20c";
-          sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04";
+          rev = "d005d6567cc484b61f2d233f4bf828a2365223c2";
+          sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -59533,12 +59625,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20161202.2316";
+        version = "20161212.300";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "d0924e13fe88bd8f920d55bea7317d714f6992d9";
-          sha256 = "1ij55zldz90ima8q9ay6957rzki9gcqfdfq70lgy41bgcafqp3qv";
+          rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0";
+          sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61131,12 +61223,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20161115.613";
+        version = "20161209.1140";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "a0fbf0873d113c3f42a16c560329e43b7840f47e";
-          sha256 = "0gsy0i6q4csnkdyv3hjqcap7xqjalzl167ccfligc28h07pw5zcp";
+          rev = "d40f4b972e307a043963f2262e66d43b6eaf7803";
+          sha256 = "0k51sm7qrhvda3gbj35gx3svvlvdvpcch76d20lnvh6y035ymmkg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -61754,12 +61846,12 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "20160911.1911";
+        version = "20161207.2044";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "da9273d9da8f84827b840776f398d24ea4c46b76";
-          sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z";
+          rev = "81ad4ec3ca58172a3c261acf4973ec767693d0ef";
+          sha256 = "02438pr144952ragf1ph4qd43kpzalbp6c5qpl725rwqxjh7bf8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -62271,12 +62363,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "20150805.256";
+        version = "20161211.649";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "147990de9d07d8e603ade92a23ef27a71e52b850";
-          sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
+          rev = "0a26739a513f16bc368e0cf86ed7f4352b493fe8";
+          sha256 = "12wg1zlw1l850csxi74aqycnsjxzniigd2a8gm6dy5bi2dwb7kjs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -63034,12 +63126,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20161206.155";
+        version = "20161208.857";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3b15585257c083706c32d0988f1982018fb17e9b";
-          sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh";
+          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
+          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63950,6 +64042,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    temporary-persistent = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
+    melpaBuild {
+        pname = "temporary-persistent";
+        version = "20161210.333";
+        src = fetchFromGitHub {
+          owner = "kostafey";
+          repo = "temporary-persistent";
+          rev = "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0";
+          sha256 = "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent";
+          sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362";
+          name = "temporary-persistent";
+        };
+        packageRequires = [ dash emacs names s ];
+        meta = {
+          homepage = "https://melpa.org/#/temporary-persistent";
+          license = lib.licenses.free;
+        };
+      }) {};
     ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ten-hundred-mode";
@@ -64412,6 +64525,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    tf2-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tf2-conf-mode";
+        version = "20161209.820";
+        src = fetchFromGitHub {
+          owner = "wynro";
+          repo = "emacs-tf2-conf-mode";
+          rev = "536950f64c071ffd8495fb2c7ac7c63a11e25f93";
+          sha256 = "0vga7kgzp9wiiji1w47llbb3gp9qgwk8v0f6s8b6jng2gmdg25bk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c43c53dca64cf0c7d59ffd0b17e9fe60f4aa90d3/recipes/tf2-conf-mode";
+          sha256 = "09kvb3ya1dx5pc146a6r9386fg9n9nfpcxm5mmhmyf75h9c6a25g";
+          name = "tf2-conf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/tf2-conf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "tfs";
         version = "20120508.1120";
@@ -64618,8 +64752,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "7ab125a253e5aebbf2a0ed9a0a1602a4b879eca7";
-          sha256 = "11wsdxjjw4l7h79achnw6kq5qs3dwyinkfn4r26bijapmk60626s";
+          rev = "60611917cf309d2a25b9cd8f8b5631784b07323d";
+          sha256 = "11y20g86s2n0lhkjw38lvv4kki2kq6ywgy4qm3na9m2sbw2p6khw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65815,12 +65949,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20161129.1516";
+        version = "20161207.1239";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "f2c75b3dce0760a84d2558d9e8ef43d5f4559c47";
-          sha256 = "1nsj9iqinmnw10b0ij636nikdfhz946rd97751pzk4irwsbycxyk";
+          rev = "18596179aa3da630e544ecb3ad02bcfde8c3a845";
+          sha256 = "1clx74wpb3bp5njy95clvz14zcipf8mcldnp6xsv39x8xwsvgi26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -68010,12 +68144,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20161114.1527";
+        version = "20161209.1521";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "68f000149a82a4c4ef46989e261c7541ce8bf778";
-          sha256 = "0k5dcaswpr0pdps3hls14hn91r2nw6024npdn599gj67naajccfr";
+          rev = "5e7e812e0ef025b72dfb9adbcb751695e777873e";
+          sha256 = "0c9x0w7hc3h1x1p0m3vzb3gq16vdlsswc3qxxslfxmnykzbqc4hv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -68241,12 +68375,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20161203.834";
+        version = "20161210.243";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "f0aec22fd9cbefb8246f8ae533716b7cce016077";
-          sha256 = "0zmn8jyvs164kim3avvdaw66rmdh6nqbm5qi6bpz5i0zb3w36jzn";
+          rev = "98be3285362a512d28a96ce4220c6dc295d5fee8";
+          sha256 = "1mylmz3xl4yj80i1n8xv8jiszrqywhiavd7db0qxx04lrl71n02b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -68388,12 +68522,12 @@
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
-        version = "20161003.1201";
+        version = "20161211.259";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "9efd3468bca81d74adfe5f63a17c64b9a7df2f0f";
-          sha256 = "15r2gv0d0nyyrww9nvvh1mvsy1gdn0cm92bgrg6izmvs32fm8q85";
+          rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
+          sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -68577,12 +68711,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20161205.1129";
+        version = "20161207.714";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "786d800f61e25a1892c44f68a3e21c0507d03a1d";
-          sha256 = "0whh6srdw1byr3zq84q3z847jlfsiqvmz2pybkvvdc4j5bfbr7hx";
+          rev = "f0eb183af6ce87344af40813a20fbe81bf98c80a";
+          sha256 = "0p1hzhcqy17cb90hsii1xiy9bw5129q847wpdbz8i58345svzm83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -68867,10 +69001,10 @@
       }) {};
     wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "wimpy-del";
-        version = "20151231.1623";
+        version = "20161209.736";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wimpy-del.el";
-          sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
+          sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
@@ -69135,8 +69269,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "c8c2934f6674";
-          sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy";
+          rev = "a67adbf5fc75";
+          sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -69677,12 +69811,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20161025.341";
+        version = "20161210.2152";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "0dc80c428cc48dfbb411b77588db7030903705b6";
-          sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3";
+          rev = "c2ca5a4422e8c05ff1428c76b3b9c20d38bcfcb7";
+          sha256 = "1wkibjznxg1khvgnabgh8808hp31i2zrkzq9crjc37xv65vkb3v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -69698,12 +69832,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20161202.1016";
+        version = "20161210.2135";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "de18e02b5fbbc82de463727d519ccf8aa45fe997";
-          sha256 = "1n40lp273zjjd82ggzvibzxcp8szyxdqpz8c61mdfq8hyk174nmm";
+          rev = "d541d7940a078c7cec64578bf51fa1023df7d931";
+          sha256 = "0l3jadf5zlkva7lcrd7z7gfhb71p8dccsbn5mwwwhcfv449z0a5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -69740,12 +69874,12 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20161122.358";
+        version = "20161210.2112";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "cff6ab06055d59d858f85946ada505eec854b1aa";
-          sha256 = "01d4lag4jcfvaafkk18ijcq91nbc1r7gdpn95gficjy0l6kf9dbg";
+          rev = "a6c454132d00f7140f8130b55981c343b4c1b7a6";
+          sha256 = "07h9x74g66z3nw6d07sa0pkjsb1ddnyrs2pmka9ly9n35irix2ms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -69761,12 +69895,12 @@
     xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20161019.2018";
+        version = "20161210.2058";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "4a831ad9e5d1c96a045ba505424c041fb4361413";
-          sha256 = "12bgj8b3haldc6ixpm86cq6xwb75gbq81dfpy1xyid6x29a7rail";
+          rev = "1604ebb340b31eae31596716489b99043c237ccc";
+          sha256 = "19wjiwdlmpj9yax0zv401ah0zp80dvr2mhxwyhqsnfd802yp1n00";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -69824,12 +69958,12 @@
     xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20161005.1847";
+        version = "20161210.2059";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "9b518378fe204737301a8c206d915ce19f2b9b5d";
-          sha256 = "1289ylz3dmyjv4z6yssb9c84a3wa794kd10xf5gwqlpmdlp7x1yc";
+          rev = "2cf602c6d8136a44799e8799f17c3b12e2bec5c8";
+          sha256 = "09bb516srdjkdibv5p2gsmwhqahwnlka0wbpcx4064w54afgh5a6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -70181,12 +70315,12 @@
     xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-frobs";
-        version = "20091211.1555";
+        version = "20161207.1609";
         src = fetchFromGitHub {
           owner = "emacsmirror";
           repo = "xterm-frobs";
-          rev = "58fb0de21e4d1963d1398a38e1b803446fb41320";
-          sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
+          rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8";
+          sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs";
@@ -70451,6 +70585,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yang-mode";
+        version = "20161212.213";
+        src = fetchFromGitHub {
+          owner = "mbj4668";
+          repo = "yang-mode";
+          rev = "f37745cda52d161761fcfe2fed792faa909b6fce";
+          sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
+          sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
+          name = "yang-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yang-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yankpad";
@@ -70598,12 +70753,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20161201.1520";
+        version = "20161211.1918";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "7b013dbbdbaa692199616e5ef727b5d4e3149e63";
-          sha256 = "1l8n4ab0ls5zmdn6l8836qc220s4lh05q99bzad716h42p5va4gd";
+          rev = "e878afb8832ecf05d654d99cd7ecb3406f7a425e";
+          sha256 = "0nlw4c9cfcg04zfjfv1z097yn8cqv1l6dsbdcmf34ccgmncr076y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -70639,11 +70794,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20161001.518";
+        version = "20161008.2359";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "0c098405a3c9";
-          sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha";
+          rev = "564510b9caca";
+          sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -70878,12 +71033,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20161018.437";
+        version = "20161208.2137";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "8715e379b00a788bfb6a1025e7ebc69e3aeca0d6";
-          sha256 = "02hkrisv2lk0ncq84rciq4l6az9yvk9wpd2617nvfijws4avgh02";
+          rev = "eb0bafac9d3208daba5a3f744514a463ffd0e131";
+          sha256 = "1h4y7lxdcss3c219lr6wd30af32n850w77q6xlys8qrb9l71f1vk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -70940,12 +71095,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20161202.731";
+        version = "20161209.632";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "5ebe8195d77b0c35baccd4279d6e0b92731c35fa";
-          sha256 = "1mdihfra7p7hvqsif1zlwnw46kvqp70r67f7qkwnlwhywgggvkvg";
+          rev = "af231794425255d436690c9c31bceb2052251210";
+          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From 5df4ed710a0ca3fc015c9f528f2dafad2d291e5b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 12 Dec 2016 13:06:59 -0500
Subject: [PATCH 108/295] melpa-stable-packages: 2016-12-12

---
 .../emacs-modes/melpa-stable-generated.nix    | 191 ++++++++++++++----
 1 file changed, 148 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 38ab70fd4f9..2d33ce39736 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1456,6 +1456,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "apib-mode";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "w-vi";
+          repo = "apib-mode";
+          rev = "18aebab7cd61b9d296b7d5d2de0c828e2058c906";
+          sha256 = "0sj948j4s26sxxandjzjjzmjqma7vf86msyyi23gsljy1q28vwlf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
+          sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
+          name = "apib-mode";
+        };
+        packageRequires = [ emacs markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/apib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -2452,12 +2473,12 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f";
-          sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa";
+          rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
+          sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
@@ -3909,6 +3930,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clues-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-clues-theme";
+          rev = "16c05f6dbe7125358f8456110f237d68263e987a";
+          sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
+          sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
+          name = "clues-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/clues-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
@@ -4650,6 +4692,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-statistics";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "company-mode";
+          repo = "company-statistics";
+          rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523";
+          sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
+          sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
+          name = "company-statistics";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/company-statistics";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
     melpaBuild {
         pname = "company-tern";
@@ -4860,6 +4923,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "copy-as-format";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "copy-as-format";
+          rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107";
+          sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
+          sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
+          name = "copy-as-format";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/copy-as-format";
+          license = lib.licenses.free;
+        };
+      }) {};
     copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copyit";
@@ -5386,12 +5470,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.25.2pre0";
+        version = "0.25.2";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb";
-          sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz";
+          rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
+          sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -7719,12 +7803,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.20.2";
+        version = "0.20.3";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "529c20acb9efda756b69e267d73d33c66fa08293";
-          sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx";
+          rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
+          sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -7853,8 +7937,8 @@
           sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy";
-          sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
+          sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
           name = "elpy";
         };
         packageRequires = [
@@ -9628,12 +9712,12 @@
     evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
     melpaBuild {
         pname = "evil-opener";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
-          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener";
@@ -19292,12 +19376,12 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "0.1.3";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "bccd17a8d152e4a2692c2bd71999f1d53c00262a";
-          sha256 = "1rw5lvcj2v4b21akmsinkz24fbmp19s3jdqsd8jgmk3qqv0z81fc";
+          rev = "9a2f069e9b3dfff8e9a5fe3cbd4bc8abe1dc86a0";
+          sha256 = "1dzrj4xyrr5d9kisq8khzr2yvrhwff0l676g237sc3v4hg3ch8sr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -19832,8 +19916,8 @@
           sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode";
-          sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
+          sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
           name = "markdown-preview-mode";
         };
         packageRequires = [ cl-lib markdown-mode websocket ];
@@ -20115,22 +20199,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "bd8e4b89341686bbaf4c44680bbae778b96fb8f0";
-          sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
+          rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
+          sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
-        packageRequires = [];
+        packageRequires = [ xml-rpc ];
         meta = {
           homepage = "https://melpa.org/#/mentor";
           license = lib.licenses.free;
@@ -22159,12 +22243,12 @@
     opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "opener";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a";
-          sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p";
+          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
+          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
@@ -22516,12 +22600,12 @@
     org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "1.0.1";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "3fc4dd52a5235fa97b0fca06b08ae443ccc43242";
-          sha256 = "017k8hw2wy4fzdrkjniaqyz4mfsm60qqxrxhd1s49dfs54kch0hq";
+          rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1";
+          sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -23267,12 +23351,12 @@
     osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-dictionary";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "osx-dictionary.el";
-          rev = "8bbe1c700830e004f34974900b840ec2be7c589c";
-          sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn";
+          rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
+          sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -29054,12 +29138,12 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "0.7.0";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f";
-          sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2";
+          rev = "65e75ebc7d85a63e4e27900ba746623a8e4bfa95";
+          sha256 = "1yiz1k2dg010dypql5l9ahcl33nvqxl731wghv4jvp6bdxcf90g3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -32250,8 +32334,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "c8c2934f6674";
-          sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy";
+          rev = "a67adbf5fc75";
+          sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -32789,6 +32873,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yang-mode";
+        version = "0.9.1";
+        src = fetchFromGitHub {
+          owner = "mbj4668";
+          repo = "yang-mode";
+          rev = "f37745cda52d161761fcfe2fed792faa909b6fce";
+          sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
+          sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
+          name = "yang-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yang-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";
@@ -32857,8 +32962,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "0c098405a3c9";
-          sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha";
+          rev = "564510b9caca";
+          sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -33010,12 +33115,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "4.1";
+        version = "4.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "63df2ae09a9e1d670f0694f7c15f19f9170e2407";
-          sha256 = "18a0g33z70yqr066cxm9d17jwvrx8hpgp0v2c6swk05h9b4h3pb2";
+          rev = "af231794425255d436690c9c31bceb2052251210";
+          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From 788417e607027bef1980915f4f2183bb76d9dd60 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 12 Dec 2016 17:48:18 -0500
Subject: [PATCH 109/295] zsh: 5.2 -> 5.3

---
 pkgs/shells/zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 261dbf12f8e..537df67d447 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.2";
+  version = "5.3";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj";
+    sha256 = "0cvkdw7x6i4m2brc9aakw8d3bmp6baziv72amlq9jd65r421bq88";
   };
 
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps";
+    sha256 = "0vcsgc1ymqhq0acklhlq5skgj27z597x2a7nx5g3j6q4jvx778hx";
   };
 
   buildInputs = [ ncurses pcre ];

From e955e64fd81be6849d5ab7d62d9f3c61007a433d Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 13 Dec 2016 00:35:53 +0100
Subject: [PATCH 110/295] Revert "helm (kubernetes): init at v2.0.2"

---
 lib/maintainers.nix                           |  1 -
 .../networking/cluster/helm/default.nix       | 45 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 48 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/helm/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 28258856917..8a3584b0b8d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -384,7 +384,6 @@
   retrry = "Tadas Barzdžius <retrry@gmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
-  rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
   rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
deleted file mode 100644
index 58ac31ce49f..00000000000
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, kubernetes }:
-let
-  arch = if stdenv.isLinux
-         then "linux-amd64"
-         else "darwin-amd64";
-  checksum = if stdenv.isLinux
-             then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200"
-             else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465";
-in
-stdenv.mkDerivation rec {
-  pname = "helm";
-  version = "2.0.2";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
-    sha256 = "${checksum}";
-  };
-
-  preferLocalBuild = true;
-
-  buildInputs = [ ];
-
-  propagatedBuildInputs = [ kubernetes ];
-
-  phases = [ "buildPhase" "installPhase" ];
-
-  buildPhase = ''
-    mkdir -p $out/bin
-  '';
-
-  installPhase = ''
-    tar -xvzf $src
-    cp ${arch}/helm $out/bin/${pname}
-    chmod +x $out/bin/${pname}
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/kubernetes/helm;
-    description = "A package manager for kubernetes";
-    license = licenses.asl20;
-    maintainers = [ maintainers.rlupton20 ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb6c118d1f9..0b94668c554 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13360,8 +13360,6 @@ in
 
   hello = callPackage ../applications/misc/hello { };
 
-  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
-
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
   heme = callPackage ../applications/editors/heme { };

From 5bd136acd4c683b30470b5dfbb6f0b15dcea42a5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 13 Dec 2016 00:43:24 +0100
Subject: [PATCH 111/295] Revert "Revert "helm (kubernetes): init at v2.0.2""

---
 lib/maintainers.nix                           |  1 +
 .../networking/cluster/helm/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/helm/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8a3584b0b8d..28258856917 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -384,6 +384,7 @@
   retrry = "Tadas Barzdžius <retrry@gmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
+  rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
   rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
new file mode 100644
index 00000000000..58ac31ce49f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kubernetes }:
+let
+  arch = if stdenv.isLinux
+         then "linux-amd64"
+         else "darwin-amd64";
+  checksum = if stdenv.isLinux
+             then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200"
+             else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465";
+in
+stdenv.mkDerivation rec {
+  pname = "helm";
+  version = "2.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
+    sha256 = "${checksum}";
+  };
+
+  preferLocalBuild = true;
+
+  buildInputs = [ ];
+
+  propagatedBuildInputs = [ kubernetes ];
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    mkdir -p $out/bin
+  '';
+
+  installPhase = ''
+    tar -xvzf $src
+    cp ${arch}/helm $out/bin/${pname}
+    chmod +x $out/bin/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubernetes/helm;
+    description = "A package manager for kubernetes";
+    license = licenses.asl20;
+    maintainers = [ maintainers.rlupton20 ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b94668c554..bb6c118d1f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13360,6 +13360,8 @@ in
 
   hello = callPackage ../applications/misc/hello { };
 
+  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
+
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
   heme = callPackage ../applications/editors/heme { };

From fa613c7dddff41c1f588c65e891e766a127ee732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Dec 2016 09:16:16 +0100
Subject: [PATCH 112/295] gnome3*.devhelp: add missing gschemas

Otherwise it would crash when starting; fixes #21094.
---
 pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix | 3 ++-
 pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
index 1cfae754cfe..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
+, webkitgtk, intltool, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+    gsettings_desktop_schemas
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
index 1cfae754cfe..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
+, webkitgtk, intltool, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+    gsettings_desktop_schemas
   ];
 
   meta = with stdenv.lib; {

From fd2cf186b0012c0d7a941d1984b987ddb87cf95d Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 13 Dec 2016 02:47:50 -0600
Subject: [PATCH 113/295] openjdk-darwin: Fix libfreetype path (#21089)

The freetype path was not working. This fixes it to use the nix
freetype version with install_name_tool.
---
 pkgs/development/compilers/openjdk-darwin/8.nix       | 6 ++++--
 pkgs/development/compilers/openjdk-darwin/default.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index bcafca16022..1d12d59998a 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath }:
+{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jdk = stdenv.mkDerivation {
     name = "zulu1.8.0_66-8.11.0.1";
@@ -9,7 +9,7 @@ let
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
     };
 
-    buildInputs = [ unzip ];
+    buildInputs = [ unzip freetype ];
 
     installPhase = ''
       mkdir -p $out
@@ -26,6 +26,8 @@ let
       mkdir -p $out/nix-support
       echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
+      install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
+
       # Set JAVA_HOME automatically.
       cat <<EOF >> $out/nix-support/setup-hook
       if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index e43563fd60d..10a9eb2b366 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, setJavaClassPath }:
+{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
   jdk = stdenv.mkDerivation {
     name = "openjdk-7u60b30";
@@ -9,7 +9,7 @@ let
       sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401";
     };
 
-    buildInputs = [ unzip ];
+    buildInputs = [ unzip freetype ];
 
     installPhase = ''
       mv */Contents/Home $out
@@ -25,6 +25,8 @@ let
       mkdir -p $out/nix-support
       echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
+      install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
+
       # Set JAVA_HOME automatically.
       cat <<EOF >> $out/nix-support/setup-hook
       if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi

From 9eac665cd2d219194c9f5a5f9ec46822dd168d3b Mon Sep 17 00:00:00 2001
From: Alexander Kahl <e-user@fsfe.org>
Date: Tue, 13 Dec 2016 10:44:09 +0100
Subject: [PATCH 114/295] sisco.lv2: init at 0.7.0 (#20868)

* sisco.lv2: init at 0.7.0

Also added maintainer `e-user`

* Use fetchFromGitHub and adapt accordingly

* Use `version` instead of `src.rev` in name
---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/audio/sisco.lv2/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/audio/sisco.lv2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 28258856917..ea75059b54b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -132,6 +132,7 @@
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   dtzWill = "Will Dietz <nix@wdtz.org>";
+  e-user = "Alexander Kahl <nixos@sodosopa.io>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
new file mode 100644
index 00000000000..d429d545234
--- /dev/null
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }:
+
+let
+  name = "sisco.lv2-${version}";
+  version = "0.7.0";
+
+  robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89";
+  robtkName = "robtk-${robtkVersion}";
+
+  src = fetchFromGitHub {
+    owner = "x42";
+    repo = "sisco.lv2";
+    rev = "v${version}";
+    sha256 = "1r6g29yqbdqgkh01x6d3nvmvc58rk2dp94fd0qyyizq37a1qplj1";
+  };
+
+  robtkSrc = fetchFromGitHub {
+    owner = "x42";
+    repo = "robtk";
+    rev = robtkVersion;
+    sha256 = "0gk16nrvnrffqqw0yd015kja9wkgbzvb648bl1pagriabhznhfxl";
+  };
+in
+stdenv.mkDerivation rec {
+  inherit name;
+
+  srcs = [ src robtkSrc ];
+  sourceRoot = "sisco.lv2-${src.rev}-src";
+
+  buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];
+
+  postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
+  sisco_VERSION = version;
+  preConfigure = "makeFlagsArray=(PREFIX=$out)";
+
+  meta = with stdenv.lib; {
+    description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format";
+    homepage = http://x42.github.io/sisco.lv2/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.e-user ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb6c118d1f9..3992f238296 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3696,6 +3696,8 @@ in
 
   sipsak = callPackage ../tools/networking/sipsak { };
 
+  sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
+
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
   sks = callPackage ../servers/sks { };

From 50466c2d4feca9eee52815eebb30ab6c62dc4deb Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Fri, 21 Oct 2016 17:04:48 -0400
Subject: [PATCH 115/295] buildbot: 0.9.0rc4 -> 0.9.0.post1

- updates buildbot to version 9 release
- adds nixos configuration module
- fixes buildbot-www package deps
- re-hardcode path to tail
- builbot configuration via module vars

fixes #19759
---
 nixos/modules/module-list.nix                 |   1 +
 .../buildbot/master.nix                       | 250 ++++++++++++++++++
 .../tools/build-managers/buildbot/default.nix |  24 +-
 .../tools/build-managers/buildbot/plugins.nix |  21 +-
 .../tools/build-managers/buildbot/worker.nix  |   4 +-
 pkgs/top-level/all-packages.nix               |   1 +
 6 files changed, 281 insertions(+), 20 deletions(-)
 create mode 100644 nixos/modules/services/continuous-integration/buildbot/master.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c89bbcc71ac..4032df9fb91 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -137,6 +137,7 @@
   ./services/computing/torque/server.nix
   ./services/computing/torque/mom.nix
   ./services/computing/slurm/slurm.nix
+  ./services/continuous-integration/buildbot/master.nix
   ./services/continuous-integration/buildkite-agent.nix
   ./services/continuous-integration/hydra/default.nix
   ./services/continuous-integration/gitlab-runner.nix
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
new file mode 100644
index 00000000000..a40be4f546e
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -0,0 +1,250 @@
+# NixOS module for Buildbot continous integration server.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.buildbot-master;
+  escapeStr = s: escape ["'"] s;
+  masterCfg = pkgs.writeText "master.cfg" ''
+    from buildbot.plugins import *
+    factory = util.BuildFactory()
+    c = BuildmasterConfig = dict(
+     workers       = [${concatStringsSep "," cfg.workers}],
+     protocols     = { 'pb': {'port': ${cfg.bpPort} } },
+     title         = '${escapeStr cfg.title}',
+     titleURL      = '${escapeStr cfg.titleUrl}',
+     buildbotURL   = '${escapeStr cfg.buildbotUrl}',
+     db            = dict(db_url='${escapeStr cfg.dbUrl}'),
+     www           = dict(port=${toString cfg.port}),
+     change_source = [ ${concatStringsSep "," cfg.changeSource} ],
+     schedulers    = [ ${concatStringsSep "," cfg.schedulers} ],
+     builders      = [ ${concatStringsSep "," cfg.builders} ],
+     status        = [ ${concatStringsSep "," cfg.status} ],
+    )
+    for step in [ ${concatStringsSep "," cfg.factorySteps} ]:
+      factory.addStep(step)
+
+    ${cfg.extraConfig}
+  '';
+
+  configFile = if cfg.masterCfg == null then masterCfg else cfg.masterCfg;
+
+in {
+  options = {
+    services.buildbot-master = {
+
+      factorySteps = mkOption {
+        type = types.listOf types.str;
+        description = "Factory Steps";
+        default = [];
+        example = [
+          "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"
+          "steps.ShellCommand(command=['trial', 'pyflakes'])"
+        ];
+      };
+
+      changeSource = mkOption {
+        type = types.listOf types.str;
+        description = "List of Change Sources.";
+        default = [];
+        example = [
+          "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+        ];
+      };
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the Buildbot continuous integration server.";
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        description = "Extra configuration to append to master.cfg";
+        default = "";
+      };
+
+      masterCfg = mkOption {
+        type = with types; nullOr path;
+        description = ''
+          Optionally pass path to raw master.cfg file.
+          Other options in this configuration will be ignored.
+        '';
+        default = null;
+        example = literalExample ''
+          pkgs.writeText "master.cfg" "BuildmasterConfig = c = {}"
+        '';
+      };
+
+      schedulers = mkOption {
+        type = types.listOf types.str;
+        description = "List of Schedulers.";
+        default = [
+          "schedulers.SingleBranchScheduler(name='all', change_filter=util.ChangeFilter(branch='master'), treeStableTimer=None, builderNames=['runtests'])"
+          "schedulers.ForceScheduler(name='force',builderNames=['runtests'])"
+        ];
+      };
+
+      builders = mkOption {
+        type = types.listOf types.str;
+        description = "List of Builders.";
+        default = [
+          "util.BuilderConfig(name='runtests',workernames=['default-worker'],factory=factory)"
+        ];
+      };
+
+      workers = mkOption {
+        type = types.listOf types.str;
+        description = "List of Workers.";
+        default = [
+          "worker.Worker('default-worker', 'password')"
+        ];
+        example = [ "worker.LocalWorker('default-worker')" ];
+      };
+
+      status = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        description = "List of status notification endpoints.";
+      };
+
+      user = mkOption {
+        default = "buildbot";
+        type = types.str;
+        description = "User the buildbot server should execute under.";
+      };
+
+      group = mkOption {
+        default = "buildbot";
+        type = types.str;
+        description = "Primary group of buildbot user.";
+      };
+
+      extraGroups = mkOption {
+        type = types.listOf types.str;
+        default = [ "nixbld" ];
+        description = "List of extra groups that the buildbot user should be a part of.";
+      };
+
+      home = mkOption {
+        default = "/home/buildbot";
+        type = types.path;
+        description = "Buildbot home directory.";
+      };
+
+      buildbotDir = mkOption {
+        default = "${cfg.home}/master";
+        type = types.path;
+        description = "Specifies the Buildbot directory.";
+      };
+
+      bpPort = mkOption {
+        default = "9989";
+        type = types.string;
+        example = "tcp:10000:interface=127.0.0.1";
+        description = "Port where the master will listen to Buildbot Worker.";
+      };
+
+      listenAddress = mkOption {
+        default = "0.0.0.0";
+        type = types.str;
+        description = "Specifies the bind address on which the buildbot HTTP interface listens.";
+      };
+
+      buildbotUrl = mkOption {
+        default = "http://localhost:8010/";
+        type = types.str;
+        description = "Specifies the Buildbot URL.";
+      };
+
+      title = mkOption {
+        default = "Buildbot";
+        type = types.str;
+        description = "Specifies the Buildbot Title.";
+      };
+
+      titleUrl = mkOption {
+        default = "Buildbot";
+        type = types.str;
+        description = "Specifies the Buildbot TitleURL.";
+      };
+
+      dbUrl = mkOption {
+        default = "sqlite:///state.sqlite";
+        type = types.str;
+        description = "Specifies the database connection string.";
+      };
+
+      port = mkOption {
+        default = 8010;
+        type = types.int;
+        description = "Specifies port number on which the buildbot HTTP interface listens.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.buildbot-ui;
+        description = ''
+          Package to use for buildbot.
+          <literal>buildbot-full</literal> is required in order to use local workers.
+        '';
+        example = pkgs.buildbot-full;
+      };
+
+      packages = mkOption {
+        default = [ ];
+        example = [ pkgs.git ];
+        type = types.listOf types.package;
+        description = "Packages to add to PATH for the buildbot process.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraGroups = optional (cfg.group == "buildbot") {
+      name = "buildbot";
+    };
+
+    users.extraUsers = optional (cfg.user == "buildbot") {
+      name = "buildbot";
+      description = "buildbot user";
+      isNormalUser = true;
+      createHome = true;
+      home = cfg.home;
+      group = cfg.group;
+      extraGroups = cfg.extraGroups;
+      useDefaultShell = true;
+    };
+
+    systemd.services.buildbot-master = {
+      description = "Buildbot Continuous Integration Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = cfg.packages;
+
+      serviceConfig = {
+        Type = "forking";
+        User = cfg.user;
+        Group = cfg.group;
+        WorkingDirectory = cfg.home;
+        ExecStart = "${cfg.package}/bin/buildbot start ${cfg.buildbotDir}";
+      };
+
+      preStart = ''
+        mkdir -vp ${cfg.buildbotDir}
+        chown -c ${cfg.user}:${cfg.group} ${cfg.buildbotDir}
+        ln -sf ${configFile} ${cfg.buildbotDir}/master.cfg
+        ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
+      '';
+
+      postStart = ''
+        until [[ $(${pkgs.curl}/bin/curl -s --head -w '\n%{http_code}' http://localhost:${toString cfg.port} | tail -n1) =~ ^(200|403)$ ]]; do
+          sleep 1
+        done
+      '';
+    };
+  };
+
+}
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index d16b83a2831..8e85c645e2e 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,12 +1,21 @@
-{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }:
+{ stdenv,
+  lib,
+  pythonPackages,
+  fetchurl,
+  coreutils,
+  openssh,
+  buildbot-worker,
+  plugins ? [],
+  enableLocalWorker ? false
+}:
 
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.0rc4";
+  version = "0.9.0.post1";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc";
+    sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g";
   };
 
   buildInputs = with pythonPackages; [
@@ -22,7 +31,7 @@ pythonPackages.buildPythonApplication (rec {
     pylint
     astroid
     pyflakes
-  ];
+  ] ++ lib.optionals (enableLocalWorker) [openssh];
 
   propagatedBuildInputs = with pythonPackages; [
 
@@ -52,14 +61,17 @@ pythonPackages.buildPythonApplication (rec {
     ramlfications
     sphinx-jinja
 
-  ] ++ plugins;
+  ] ++ plugins ++
+  lib.optionals (enableLocalWorker) [buildbot-worker];
 
   preInstall = ''
     # writes out a file that can't be read properly
     sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
+  '';
 
+  postPatch = ''
     # re-hardcode path to tail
-    sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
+    sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
   '';
 
   postFixup = ''
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 09f8b1e750a..2875f6942a9 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.0rc4";
+    version = "0.9.0.post1";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10";
+      sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -23,22 +23,19 @@ let
   };
 
 in {
-
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.0rc4";
+    version = "0.9.0.post1";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl";
-      sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p";
+      url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl";
+      sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q";
     };
 
-    propagatedBuildInputs = [ buildbot-pkg ];
-
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot UI";
@@ -51,11 +48,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.0rc4";
+    version = "0.9.0.post1";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva";
+      sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
@@ -72,11 +69,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.0rc4";
+    version = "0.9.0.post1";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8";
+      sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g";
     };
 
     propagatedBuildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 01b2051aaa6..7d7ecc1c52d 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.0rc4";
+  version = "0.9.0.post1";
 
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c";
+    sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3992f238296..9b6f913e1ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5952,6 +5952,7 @@ in
   };
   buildbot-full = self.buildbot.override {
     plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
+    enableLocalWorker = true;
   };
 
   buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };

From d6f1081314e0ea341bd237e9064e94a1b5ce874a Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Tue, 13 Dec 2016 11:26:56 +0100
Subject: [PATCH 116/295] opencv3: pull patches only if necessary

---
 pkgs/development/libraries/opencv/3.x.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d86a2671cde..388167319c1 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -42,16 +42,17 @@ stdenv.mkDerivation rec {
     sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429";
   };
 
-  patches = [
-    (fetchpatch { # Patch for CUDA 8 compatibility
-      url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch";
-      sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1";
-    })
-    (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0
-      url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
-      sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
-    })
-  ];
+  patches =
+    lib.optionals enableCuda [
+      (fetchpatch { # Patch for CUDA 8 compatibility
+        url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch";
+        sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1";
+      })
+      (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0
+        url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
+        sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
+      })
+    ];
 
   preConfigure =
     let ippicvVersion = "20151201";

From cbdc94f2b7798ac4b2c0f1b564607e64a03996d2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 13 Dec 2016 11:35:15 +0000
Subject: [PATCH 117/295] buildGoPackage: remove go version from name (#21111)

As a user installing the program it's not interesting what go version it
was compiled against. Not more interesting than any other potential
dependencies. It also makes it harder to install or update the package.
---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index e076c6ca90e..d3a31f32189 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -69,7 +69,7 @@ in
 go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
-  name = "go${go.meta.branch}-${name}";
+  inherit name;
   nativeBuildInputs = [ go parallel ]
     ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
   buildInputs = [ go ] ++ buildInputs;

From 7a813d3f6d3b983b67683234fe1fe77afb3d97e5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 13 Dec 2016 07:25:46 -0500
Subject: [PATCH 118/295] linux_{4_8,grsec_nixos}: patch to fix build failure

crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory
---
 .../kernel/multithreaded-rsapubkey-asn1.patch | 45 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     |  6 +++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch

diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
new file mode 100644
index 00000000000..9f5790862b6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
@@ -0,0 +1,45 @@
+
+From	Yang Shi <>
+Subject	[PATCH] crypto: rsa - fix a potential race condition in build
+Date	Fri, 2 Dec 2016 15:41:04 -0800
+
+
+When building kernel with RSA enabled with multithreaded, the below
+compile failure might be caught:
+
+| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory
+| #include "rsapubkey-asn1.h"
+| ^
+| compilation terminated.
+| CC crypto/rsa-pkcs1pad.o
+| CC crypto/algboss.o
+| CC crypto/testmgr.o
+| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1
+| make[3]: *** Waiting for unfinished jobs....
+| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2
+| make[1]: *** [Makefile:150: sub-make] Error 2
+| make: *** [Makefile:24: __sub-make] Error 2
+
+The header file is not generated before rsa_helper is compiled, so
+adding dependency to avoid such issue.
+
+Signed-off-by: Yang Shi <yang.shi@windriver.com>
+
+---
+ crypto/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crypto/Makefile b/crypto/Makefile
+index 99cc64a..8db39f9 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
+
+ $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
+ $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
++$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h
+ clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
+ clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
+
+--
+2.0.2
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 124518c36b2..06d6f88299f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -38,6 +38,12 @@ in
 
 rec {
 
+  multithreaded_rsapubkey =
+    {
+      name = "multithreaded-rsapubkey-asn1.patch";
+      patch = ./multithreaded-rsapubkey-asn1.patch;
+    };
+
   bridge_stp_helper =
     { name = "bridge-stp-helper";
       patch = ./bridge-stp-helper.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 922af73fd20..5b33e6aa7ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10985,6 +10985,7 @@ in
   linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.multithreaded_rsapubkey
         # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
         # when adding a new linux version
         # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
@@ -11191,6 +11192,7 @@ in
     inherit (lib) overrideDerivation;
     kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {
       kernelPatches = with self.kernelPatches; [
+        kernelPatches.multithreaded_rsapubkey
         bridge_stp_helper
         modinst_arg_list_too_long
       ] ++ lib.optionals ((platform.kernelArch or null) == "mips")

From 2bcd41b9ffc629c7c9df402b7a39700340fdf52e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 13 Dec 2016 14:31:47 +0100
Subject: [PATCH 119/295] buildPythonPackage: install builds reproducibly

Without --build a temporary directory is created to unpack the wheel in.
We now set a directory instead.
---
 .../interpreters/python/build-python-package-common.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix
index 381606acd8b..2b383fe985d 100644
--- a/pkgs/development/interpreters/python/build-python-package-common.nix
+++ b/pkgs/development/interpreters/python/build-python-package-common.nix
@@ -24,7 +24,7 @@ attrs // {
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
 
     pushd dist
-    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags}
+    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild
     popd
 
     runHook postInstall

From c1d60d8c1e23dc5ad1bc85df561e615bcb2bb0cf Mon Sep 17 00:00:00 2001
From: Stefan Goetz <goetzst@hotmail.de>
Date: Tue, 13 Dec 2016 14:59:49 +0100
Subject: [PATCH 120/295] youtube-dl: 2016.12.01 -> 2016.12.12 (#21122)

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 9dff0c8214f..db11875afa0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.12.01";
+  version = "2016.12.12";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "ddff281a251c7a40bf8c28afa1df63e9a64ff61b6b8097535fbbe587e8ccaef7";
+    sha256 = "643efa7755ac4aa03a241f106d8923dfd5dbaf8d3c14e56b696048c4f2fab430";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 64a64c6b14d6556b46266c25fa9acb11c99fc033 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 10 Dec 2016 13:38:26 +0100
Subject: [PATCH 121/295] grsecurity test: refactoring

---
 nixos/tests/grsecurity.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
index e585a7402d3..ee9e0709e5e 100644
--- a/nixos/tests/grsecurity.nix
+++ b/nixos/tests/grsecurity.nix
@@ -8,7 +8,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   machine = { config, pkgs, ... }:
     { security.grsecurity.enable = true;
+      boot.kernel.sysctl."kernel.grsecurity.audit_mount" = 0;
       boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0;
+      networking.useDHCP = false;
     };
 
   testScript = ''
@@ -20,16 +22,14 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     subtest "paxtest", sub {
       # TODO: running paxtest blackhat hangs the vm
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/anonmap") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execbss") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execdata") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execheap") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execstack") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotanon") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotbss") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotdata") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotheap") =~ /Killed/ or die;
-      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotstack") =~ /Killed/ or die;
+      my @pax_mustkill = (
+        "anonmap", "execbss", "execdata", "execheap", "execstack",
+        "mprotanon", "mprotbss", "mprotdata", "mprotheap", "mprotstack",
+      );
+      foreach my $name (@pax_mustkill) {
+        my $paxtest = "${pkgs.paxtest}/lib/paxtest/" . $name;
+        $machine->succeed($paxtest) =~ /Killed/ or die
+      }
     };
 
     # tcc -run executes run-time generated code and so allows us to test whether

From 33088accc814a139cdcb2f44018da6dba2ac056f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 11 Dec 2016 14:56:40 +0100
Subject: [PATCH 122/295] terraria service: fix tmux output

tmux.bin was removed in 5535d9439415454abe00589bd7575b61e7fbb8db

Use `lib.getBin` to be more robust to future changes.
---
 nixos/modules/services/games/terraria.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 57ac37bb1bd..93377dedbd4 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -126,8 +126,8 @@ in
         User    = "terraria";
         Type = "oneshot";
         RemainAfterExit = true;
-        ExecStart = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
-        ExecStop = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter";
+        ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
+        ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter";
       };
 
       postStart = ''

From d893c86b34680fc4de04b8df05c84dc91c401ab0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 11 Dec 2016 14:59:41 +0100
Subject: [PATCH 123/295] terraria service: fixup worldPath option type

Otherwise, using the defaults results in a type error.
---
 nixos/modules/services/games/terraria.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 93377dedbd4..21aff780b67 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -64,7 +64,7 @@ in
       };
 
       worldPath = mkOption {
-        type        = types.path;
+        type        = types.nullOr types.path;
         default     = null;
         description = ''
           The path to the world file (<literal>.wld</literal>) which should be loaded.

From d918c80e133d00693973fb15ae12b6fd0b2d7a5c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 13 Dec 2016 15:09:00 +0100
Subject: [PATCH 124/295] grsecurity: disable verbose initify

Not as useful/informative as I had hoped.
---
 pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
index 895c0ec42ef..ed8942b1066 100644
--- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
+++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
@@ -23,8 +23,6 @@ PAX_XATTR_PAX_FLAGS y
 PAX_EI_PAX n
 
 PAX_INITIFY y
-# initify is a fairly recent feature, enable verbose mode to aid in debugging
-PAX_INITIFY_VERBOSE y
 
 # The bts instrumentation method is compatible with binary only modules.
 #

From df07922e3e26ead710bbcabec53f290feb12dd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 1 Jul 2016 13:44:07 +0200
Subject: [PATCH 125/295] knot-dns: init at 2.3.3

Only .lib is tested ATM.
---
 pkgs/servers/dns/knot-dns/default.nix | 39 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/servers/dns/knot-dns/default.nix

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
new file mode 100644
index 00000000000..62343666729
--- /dev/null
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
+, systemd, nettle, libedit }:
+
+# Note: ATM only the libraries have been tested in nixpkgs.
+stdenv.mkDerivation rec {
+  name = "knot-dns-${version}";
+  version = "2.3.3";
+
+  src = fetchurl {
+    url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
+    sha256 = "a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94";
+  };
+
+  outputs = [ "bin" "out" "dev" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    gnutls jansson liburcu lmdb libcap_ng libidn
+    systemd nettle libedit
+    # without sphinx &al. for developer documentation
+  ];
+
+  enableParallelBuilding = true;
+
+  CFLAGS = [ "-DNDEBUG" ];
+
+  #doCheck = true; problems in combination with dynamic linking
+
+  postInstall = ''rm -r "$out"/var'';
+
+  meta = with stdenv.lib; {
+    description = "Authoritative-only DNS server from .cz domain registry";
+    homepage = https://knot-dns.cz;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7dc9d7e0789..dea35b0640c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10119,6 +10119,8 @@ in
 
   jetty = callPackage ../servers/http/jetty { };
 
+  knot-dns = callPackage ../servers/dns/knot-dns { };
+
   rdkafka = callPackage ../development/libraries/rdkafka { };
 
   leafnode = callPackage ../servers/news/leafnode { };

From dcee4214b9fb29f42e69da27a4c6069f75c9e6f1 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 13 Dec 2016 15:39:33 +0100
Subject: [PATCH 126/295] ponyc: 0.9.0 -> 0.10.0

---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 2bce01551ee..2c785d2a721 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1g2i3x9k36h5rx7ifx0i6hn78xlj42i86x8apwzvkh0y84y88adi";
+    sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 8c0f4755bd086a8a07c2ff3799273e5b4f7e3699 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 13 Dec 2016 15:43:02 +0100
Subject: [PATCH 127/295] urbit: 2016-06-02 -> 0.4 (#20922)

---
 pkgs/misc/urbit/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index cbe9416ee8a..e3d6d40bdac 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,21 +1,20 @@
 { stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
-  cmake, re2c, libtool, ncurses, perl, zlib, python2 }:
+  cmake, re2c, libtool, ncurses, perl, zlib, python2, curl }:
 
 stdenv.mkDerivation rec {
-
   name = "urbit-${version}";
-  version = "2016-06-02";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "urbit";
     repo = "urbit";
-    rev = "8c113559872e4a97bce3f3ee5b370ad9545c7459";
-    sha256 = "055qdpp4gm0v04pddq4380pdsi0gp2ybgv1d2lchkhwsnjyl46jl";
+    rev = "v${version}";
+    sha256 = "1ndy58ypilabf9pfkqzzl7wf6x1vr4gpvsbn30sygp2ip908q0xz";
   };
 
   buildInputs = with stdenv.lib; [
     gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool
-    ncurses perl zlib python2
+    ncurses perl zlib python2 curl
   ];
 
   # uses 'readdir_r' deprecated by glibc 2.24

From 140643be451fa8c5d9c47eac2ca7a3a193ee6efa Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 13 Dec 2016 15:50:58 +0100
Subject: [PATCH 128/295] jid: init at 0.6.1 (#20923)

---
 pkgs/development/tools/jid/default.nix | 25 +++++++++++++++++
 pkgs/development/tools/jid/deps.nix    | 39 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/tools/jid/default.nix
 create mode 100644 pkgs/development/tools/jid/deps.nix

diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
new file mode 100644
index 00000000000..e77921c5437
--- /dev/null
+++ b/pkgs/development/tools/jid/default.nix
@@ -0,0 +1,25 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "jid-${version}";
+  version = "0.6.1";
+  rev = "0.6.1";
+
+  goPackagePath = "github.com/simeji/jid";
+
+  src = fetchFromGitHub {
+    owner = "simeji";
+    repo = "jid";
+    inherit rev;
+    sha256 = "0hnda2nqgirwbqbzq38kbl83cr0kn7hxsh4wim4fwwla0hs2nwjg";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Incremental JSON digger";
+    license = licenses.mit;
+    maintainers = [ maintainers.profpatsch ];
+  };
+}
diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix
new file mode 100644
index 00000000000..4bc32247c08
--- /dev/null
+++ b/pkgs/development/tools/jid/deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/bitly/go-simplejson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bitly/go-simplejson";
+      rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44";
+      sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "737072b4e32b7a5018b4a7125da8d12de90e8045";
+      sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "0b413bfa31e8c6843db20dce4454566b1951709e";
+      sha256 = "1n45cq3p7z5533bmsqj3a0xvp7c8ncb52k3l8zqvd37f34zpsyxb";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302";
+      sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0b11d62033..e1794bbf401 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2296,6 +2296,8 @@ in
 
   jhead = callPackage ../tools/graphics/jhead { };
 
+  jid = callPackage ../development/tools/jid { };
+
   jing = self.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 

From 1d0fb40af004a760996780548e6872941fe61d54 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 13 Dec 2016 16:25:04 +0100
Subject: [PATCH 129/295] abcl: init at 1.4.0

---
 pkgs/development/compilers/abcl/default.nix | 40 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/compilers/abcl/default.nix

diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
new file mode 100644
index 00000000000..c296f690fa5
--- /dev/null
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ant, jre, jdk}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "abcl";
+  version = "1.4.0";
+  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  src = fetchurl {
+    url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
+    sha256 = "1y4nixm1459ch6226ikdilcsf91c2rg1d82cqqmcn24kfjl1m62i";
+  };
+  configurePhase = ''
+    mkdir nix-tools
+    export PATH="$PWD/nix-tools:$PATH"
+    echo "echo nix-builder.localdomain" > nix-tools/hostname
+    chmod a+x nix-tools/*
+
+    hostname
+  '';
+  buildPhase = ''
+    ant
+  '';
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}
+    cp -r README COPYING CHANGES examples/  "$out/share/doc/abcl/"
+    cp -r dist/*.jar contrib/ "$out/lib/abcl/"
+
+    echo "#! ${stdenv.shell}" >> "$out/bin/abcl"
+    echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
+    chmod a+x "$out"/bin/*
+  '';
+  buildInputs = [jre ant jdk jre];
+  meta = {
+    inherit version;
+    description = ''A JVM-based Common Lisp implementation'';
+    license = stdenv.lib.licenses.gpl3 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://common-lisp.net/project/armedbear/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1794bbf401..1f16ceeddb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4533,6 +4533,8 @@ in
 
   ### DEVELOPMENT / COMPILERS
 
+  abcl = callPackage ../development/compilers/abcl {};
+
   aldor = callPackage ../development/compilers/aldor { };
 
   aliceml = callPackage ../development/compilers/aliceml { };

From 6c226b1e7ac4f699dfc46a1fd38d59af6efb2c2a Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Tue, 13 Dec 2016 16:25:44 +0100
Subject: [PATCH 130/295] rPackages.DescTools: unbreak build outside of Linux.
 (#20787)

DescTools does not require X during build, so remove it from that list.
---
 pkgs/development/r-modules/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f168e115de1..2ef3fbdd076 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -472,7 +472,6 @@ let
     "DeducerSurvival"
     "DeducerText"
     "Demerelate"
-    "DescTools"
     "detrendeR"
     "dgmb"
     "DivMelt"

From 360234dab6b22d9f05821369a43c10b5faea3b79 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 13 Dec 2016 07:14:22 -0800
Subject: [PATCH 131/295] coq_8_6: new package, based on Coq 8.6rc1

---
 pkgs/applications/science/logic/coq/8.6.nix | 89 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 26 ++++++
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/applications/science/logic/coq/8.6.nix

diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix
new file mode 100644
index 00000000000..659034e0586
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/8.6.nix
@@ -0,0 +1,89 @@
+# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, coq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
+# - The patch-level version can be specified through the `pl` argument to
+#   the derivation; it defaults to the greatest.
+
+{ stdenv, fetchurl, writeText, pkgconfig
+, ocaml, findlib, camlp5, ncurses
+, lablgtk ? null, csdp ? null
+, pl ? "1"
+}:
+
+let
+  version = "8.6rc${pl}";
+  sha256 = {
+   "1" = "0wral36h39q7g2sa2z8jvjc8ggqmqsjrbs0k299n0nykmmrq1pr8";
+  }."${pl}";
+  coq-version = "8.6";
+  buildIde = lablgtk != null;
+  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  csdpPatch = if csdp != null then ''
+    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+  '' else "";
+in
+
+stdenv.mkDerivation {
+  name = "coq-${version}";
+
+  inherit coq-version;
+  inherit ocaml camlp5;
+
+  src = fetchurl {
+    url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
+    inherit sha256;
+  };
+
+  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+
+  postPatch = ''
+    UNAME=$(type -tp uname)
+    RM=$(type -tp rm)
+    substituteInPlace configure --replace "/bin/uname" "$UNAME"
+    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+    substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
+    ${csdpPatch}
+  '';
+
+  setupHook = writeText "setupHook.sh" ''
+    addCoqPath () {
+      if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+        export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+      fi
+    }
+
+    envHooks=(''${envHooks[@]} addCoqPath)
+  '';
+
+  preConfigure = ''
+    configureFlagsArray=(
+      -opt
+      ${ideFlags}
+    )
+  '';
+
+  prefixKey = "-prefix ";
+
+  buildFlags = "revision coq coqide bin/votour";
+
+  postInstall = ''
+    cp bin/votour $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Coq proof assistant";
+    longDescription = ''
+      Coq is a formal proof management system.  It provides a formal language
+      to write mathematical definitions, executable algorithms and theorems
+      together with an environment for semi-interactive development of
+      machine-checked proofs.
+    '';
+    homepage = "http://coq.inria.fr";
+    license = licenses.lgpl21;
+    branch = coq-version;
+    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f16ceeddb8..23f904f450a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16682,6 +16682,11 @@ in
     camlp5 = ocamlPackages.camlp5_transitional;
   };
 
+  coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
   coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
@@ -16765,8 +16770,29 @@ in
 
   };
 
+  mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec {
+
+    inherit callPackage;
+
+    coq = coq_8_6;
+
+    coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
+
+    coquelicot = callPackage ../development/coq-modules/coquelicot {};
+
+    dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
+
+    flocq = callPackage ../development/coq-modules/flocq {};
+
+    interval = callPackage ../development/coq-modules/interval {};
+
+    fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
+
+  };
+
   coqPackages = mkCoqPackages_8_4 coqPackages;
   coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
+  coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
 
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 

From 69ce9a9edde33db668c602dbb25df598cc6b09c1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@tumblr.com>
Date: Tue, 13 Dec 2016 10:27:21 -0500
Subject: [PATCH 132/295] watchman: 4.5.0 -> 4.7.0

---
 pkgs/development/tools/watchman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 9c09277deb7..379f87b4cf4 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "4.5.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "0hyj7nbsm5mv8zq2fldd06f92a3wamavha20311518qv7q5jj72v";
+    sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n";
   };
 
   buildInputs = [ autoconf automake pcre ];

From 62934023c3ece9c6339816dd0d8e7cfe0995e0a9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 13 Dec 2016 08:06:48 -0800
Subject: [PATCH 133/295] coq_HEAD: Update to the latest commit as of
 2016-12-13

---
 pkgs/applications/science/logic/coq/HEAD.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 86935b178d9..f6837397e21 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -6,8 +6,8 @@
 {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
-  version = "8.5pre-0c999f02";
-  coq-version = "8.5";
+  version = "8.6pre-0c999f02";
+  coq-version = "8.6";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
@@ -24,20 +24,18 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://scm.gforge.inria.fr/coq/coq.git;
-    rev = "0c999f02ffcd61fcace0cc2d045056a82992a100";
-    sha256 = "08z9z4bv4a8ha1jrn18vxad6d7y7h92ggr00rx8jfvvi290n9344";
+    rev = "ad768e435a736ca51ac79a575967b388b34918c7";
+    sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
 
-  patches = [ ./no-codesign.patch ];
-
   postPatch = ''
     UNAME=$(type -tp uname)
     RM=$(type -tp rm)
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+    substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\""
     ${csdpPatch}
   '';
 

From 8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 13 Dec 2016 17:27:23 +0100
Subject: [PATCH 134/295] tigervnc: fix missing Xvnc (xauth) (#21110)

the xorg patch was not applied.
Also a different root for `make install` is needed.
In addition more unnessary option are disabled.
---
 pkgs/tools/admin/tigervnc/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index d0eb9e8fb15..901ec06ea65 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -39,9 +39,20 @@ stdenv.mkDerivation rec {
     tar xf ${xorg.xorgserver.src}
     cp -R xorg*/* unix/xserver
     pushd unix/xserver
+    version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g')
+    patch -p1 < ${src}/unix/xserver$version.patch
     autoreconf -vfi
-    ./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \
-        --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
+    ./configure $configureFlags  --disable-devel-docs --disable-docs \
+        --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+        --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+        --disable-xorgcfg --disable-xprint --disable-static \
+        --disable-composite --disable-xtrap --enable-xcsecurity \
+        --disable-{a,c,m}fb \
+        --disable-xwayland \
+        --disable-config-dbus --disable-config-udev --disable-config-hal \
+        --disable-xevie \
+        --disable-dri --disable-dri2 --disable-dri3 --enable-glx \
+        --enable-install-libxf86config \
         --prefix="$out" --disable-unit-tests \
         --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
         --with-xkb-bin-directory=${xorg.xkbcomp}/bin \
@@ -49,9 +60,9 @@ stdenv.mkDerivation rec {
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';
-  
+
   postInstall = ''
-    pushd unix/xserver
+    pushd unix/xserver/hw/vnc
     make TIGERVNC_SRCDIR=`pwd`/../.. install
     popd
     rm -f $out/lib/xorg/protocol.txt

From 1beb9e6d1e3bbafa3c953903813b1526fb81c622 Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei@boronine.com>
Date: Wed, 14 Dec 2016 02:22:31 +0800
Subject: [PATCH 135/295] haxe: enable darwin platform (#21127)

---
 pkgs/development/compilers/haxe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index f70fbcf583c..a2afcc77380 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     homepage = http://haxe.org;
     license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 78ffee7f063f568b0b8338c6d2ae21cb47380ec9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 13 Dec 2016 20:57:35 +0100
Subject: [PATCH 136/295] kakoune: update 2016-07-26 -> 2016-12-10

---
 pkgs/applications/editors/kakoune/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index d45fdc8e12d..73ee7ed64cd 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-nightly-${version}";
-  version = "2016-07-26";
+  version = "2016-12-10";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "0d2c5072b083a893843e4fa87f9f702979069e14";
-    sha256 = "01qqs5yr9xvvklg3gg45lgnyh6gji28m854mi1snzvjd7fksf50n";
+    rev = "e44129577a010ebb4dc609b806104d3175659074";
+    sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l";
   };
   buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
 

From d3be9a50e0a3d87d76b74133a9afc40ea2fb0f08 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Dec 2016 21:39:31 +0100
Subject: [PATCH 137/295] nginxMainline: 1.11.6 -> 1.11.7

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 00a5ac2563a..c00cc3f4e5d 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.11.6";
-  sha256 = "1gc5phrzm2hbpvryaya6rlvasa00vjips4hv5q1rqbcfa6xsnlri";
+  version = "1.11.7";
+  sha256 = "03ihv5v8qasifh4wlql0ggbqkyvak29g0h5fqzka69i15fsvwm8d";
 })

From 762d902b1d9a6eb2eba065d7d3eee60a59cecd14 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Dec 2016 21:55:05 +0100
Subject: [PATCH 138/295] php71: init at 7.1.0

---
 pkgs/development/interpreters/php/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix               | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 3b1b288fd5d..d588b6a7ad5 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -310,4 +310,9 @@ in {
     version = "7.0.13";
     sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h";
   };
+
+  php71 = generic {
+    version = "7.1.0";
+    sha256 = "0qcf4aahkiwypidw42pd5dz34n10296zgjfyh56lgcymxryzvg38";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23f904f450a..f1882397933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5621,9 +5621,14 @@ in
     php = php70;
   });
 
+  php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php71;
+  });
+
   inherit (callPackages ../development/interpreters/php { })
     php56
-    php70;
+    php70
+    php71;
 
   picoc = callPackage ../development/interpreters/picoc {};
 

From 2ec19900aba3178c29acc17a72e5251e769f063a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Dec 2016 21:56:10 +0100
Subject: [PATCH 139/295] php56: 5.6.28 -> 5.6.29

---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index d588b6a7ad5..fc0e6a31242 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -302,8 +302,8 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.28";
-    sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5";
+    version = "5.6.29";
+    sha256 = "1fr530x1hxpaf0gb1ayrs9a4xa9v14dfb4hn2560dgm7i96896s9";
   };
 
   php70 = generic {

From 60dfc245c7f7cc41eb1b6f515625a644af9c2164 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Dec 2016 21:56:47 +0100
Subject: [PATCH 140/295] php70: 7.0.13 -> 7.0.14

---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index fc0e6a31242..1a5bed6d20b 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -307,8 +307,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.13";
-    sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h";
+    version = "7.0.14";
+    sha256 = "0d0596vzpyw86a77smk799sxl4mh2wylzsvmrv8mzda21nd3di7v";
   };
 
   php71 = generic {

From 00f5ed6e4c7627b99a260ca068003a1f61764b98 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Dec 2016 21:58:37 +0100
Subject: [PATCH 141/295] libfilezilla: 0.8.0 -> 0.9.0

---
 pkgs/development/libraries/libfilezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 61fb8f2ffd8..4df326e278c 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb";
+    sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21";
   };
 
   meta = with stdenv.lib; {

From 1bb96c202dada87398cc88ec64f15fbee0d1477a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Dec 2016 22:21:21 +0100
Subject: [PATCH 142/295] filezilla: 3.22.2.2 -> 3.23.0.2

---
 pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index d49eaad4d33..c0951d97990 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.22.2.2"; in
+let version = "3.23.0.2"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1h02k13x88f04gkf433cxx1xvbr7kkl2aygb4i6581gzhzjifwdv";
+    sha256 = "0bq22nq2g1b0x5msm9if74ync2qk13n2782mwj2r1r7hsmx4liiz";
   };
 
   configureFlags = [

From d65ef03677ab395e8dfb312c32ef379046ac3472 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 13 Dec 2016 22:34:25 +0100
Subject: [PATCH 143/295] stunnel: 5.37 -> 5.38

---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 6bcf2b80a13..e9c82a798ed 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.37";
+  version = "5.38";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh";
+    sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89";
   };
 
   buildInputs = [ openssl ];

From b23b7a81748f8d1ae9c746de41090f2bd0448e0d Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 13 Dec 2016 22:35:16 +0100
Subject: [PATCH 144/295] ecl: add threadSupport option

---
 pkgs/development/compilers/ecl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index cfaf8184c69..60293fa2ec1 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -3,6 +3,7 @@
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
 , gcc
+, threadSupport ? true
 }:
 let
   s = # Generated upstream information
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = [
-    "--enable-threads"
+    (if threadSupport then "--enable-threads" else "--disable-threads")
     "--with-gmp-prefix=${gmp.dev}"
     "--with-libffi-prefix=${libffi.dev}"
     ]

From e4db40ad2374aa28b59cd15027f5d7248e84bd1e Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 13 Dec 2016 22:36:12 +0100
Subject: [PATCH 145/295] toxic: fix arm build

---
 .../networking/instant-messengers/toxic/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 414b36b05e3..be72895b430 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libconfig ];
   buildInputs = [
-    libtoxcore-dev libsodium ncurses libqrencode curl
+    libtoxcore-dev libsodium ncurses curl
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
-    openal libvpx freealut
+    openal libvpx freealut libqrencode
   ];
 
   meta = with stdenv.lib; {

From 20f138c3d7fb30340092e0569796b2b68840d9ac Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 13 Dec 2016 22:37:06 +0100
Subject: [PATCH 146/295] ffmpeg: respect sdlSupport option

---
 pkgs/development/libraries/ffmpeg/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index f6c40fa5dd0..0ac82f98a24 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
-    libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus
+    libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
   ] ++ optional openglSupport mesa
     ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isArm) libva

From 6d1180cf023f309438de77afd38c6de3c3eda3f9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 13 Dec 2016 23:11:30 +0100
Subject: [PATCH 147/295] perl-Sub-Quote: init at 2.003001

---
 pkgs/top-level/perl-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 485c0a95dc3..48c76ca6d69 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11832,6 +11832,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [SubUplevel TestException];
   };
 
+  SubQuote = buildPerlPackage rec {
+    name = "Sub-Quote-2.003001";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
+      sha256 = "9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9";
+    };
+    buildInputs = [ TestFatal ];
+    meta = {
+      description = "Efficient generation of subroutines via string eval";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   SubUplevel = buildPerlPackage {
     name = "Sub-Uplevel-0.24";
     src = fetchurl {

From 586dd2a3bb8d825fa2479a2f3b816cc6d38e7686 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 13 Dec 2016 23:11:51 +0100
Subject: [PATCH 148/295] perl-Moo: 2.002005 -> 2.003000

Also remove myself as maintainer since I'm not really using this
package.
---
 pkgs/top-level/perl-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 48c76ca6d69..3199f65f955 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8515,17 +8515,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   Moo = buildPerlPackage rec {
-    name = "Moo-2.002005";
+    name = "Moo-2.003000";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "8147f98a43f7beb808773202b05d3fba25d5fca018ad939d7e529f4d36d6dc68";
+      sha256 = "ccab84b1377e52922026b24b2ed51d83c439757f2b0783fffa73ac22b4fb3dd2";
     };
     buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ];
+    propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny SubQuote ];
     meta = {
       description = "Minimalist Object Orientation (with Moose compatibility)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 10ca00a9a2ba913fa93dd0eb8bbb021410c1665c Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 13 Dec 2016 21:56:14 +0100
Subject: [PATCH 149/295] shaarli: 0.8.0 -> 0.8.1

---
 pkgs/servers/web-apps/shaarli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 83c0a6c1034..32eae53420a 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz";
-    sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww";
+    url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
+    sha256 = "17p8bmkgmlan6vbvh955idddckr5kyf00gp8apjfcnm4b2awma8x";
   };
 
   outputs = [ "out" "doc" ];

From a26acf99adc64de533740456b64b77966a4f94f1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 13 Dec 2016 23:46:29 +0100
Subject: [PATCH 150/295] torbrowser: 6.0.7 -> 6.0.8

---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 13f2b145663..d0484b251a4 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -12,13 +12,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "6.0.7";
+  version = "6.0.8";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "1llgqvxmn572wyxk7r1hf3j6ldi9hkgahm7918rsmsvk66i187h4" else
-      "16z8qfmcgxbvmv5hriv1gq4lpz54fy04mhhwdd6s72y52dfcvfy3";
+      "1s2yv72kj4zxba0850fi1jv41c69vcw3inhj9kqhy1d45ql7iw0w" else
+      "0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97";
   };
 
   desktopItem = makeDesktopItem {

From 8a7cf06b54986dc4d21aaefeedf8d0b4c5cc97fa Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Dec 2016 08:48:35 +0900
Subject: [PATCH 151/295] firefox-bin: 50.0.2 -> 50.1.0

---
 .../browsers/firefox-bin/sources.nix          | 1101 ++++++++++++++---
 1 file changed, 912 insertions(+), 189 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index cb85d83065f..c37404d881b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,192 +1,915 @@
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 46.0.1 > sources.nix
-
 {
-  version = "50.0.2";
+  version = "50.1.0";
   sources = [
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "21cb43e55ff902380463a2ac896d64625d2e65bb824b49063675c80049d0230cae089736445910d84d0123e474d6e8455ef310593beda8b1bfe950e5b0fcb6c5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0e1e297d8efd180c8312311854b54c9f64367e5fc3fd96cdae55d47001807eda48c8e2bc9568219dab453e2324b2b5c6c51b72e38c15d4e2c2a5a5fd881527a0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "c3a35b53d04472c58714a6fcc775283754df51055e2afdb1765a8879d5b1af20ce37e6100535cb0687712a96b02ae41875c9fddf85b6322ccd3725824a1d804d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "efca6bdc66cb175e4fa6c263099c3aa6407dca7a9cbb0cda9f00ca4ad2944745c0ae576848e0d58b4af59d66b5f9ed8a426d9674d2cd24b8e4d04874763b4324"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "565f18d139594b5cef133bdb2f873f6eea41d0b6345393bb825847dd59b60da8798ecd3be71bccf7cbb95829b668a0950caa5129d912ce534850ca76aebb52e8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "a1ba2af26f386ed8cf2263e32867fbb162df85f6992109926d5cd102026aa554f246ef3770f3a81effc9019cdd3efe9e7c4713e43c778714394ea981b53f9c30"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "0698e8f4c618ffa6db6d2675ad2752cfd8187373c43f815d20ad92bd1d534ea4f4ff3fc97c0a9c5774a58c63dc5faf024158ff91e402a2f1ba5d1c06550970c5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "b94f265ac682bd5c879b13f02189afe1aafb6a8e668b39bd3ed5fe145aecc54b1ca62004ba7d770fccad6abf0e259a1b1e41a4e6558a03b856dcebfbb8f21c2f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "e2644b2613f1c36549cdadca6cc9339b1b2f60eb83cdbe5400663bfc681b6c096ea610279f66969272f2e766ad7829da06716eaac13606ba21e3351521846b68"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "46cf0673b2776526920030a9698077ad375af2eaba80e153ffe56e34b7066e7c1731d9ded70530df9db37f3b99c658dfad9451f32f8344a37acef38444baf6f3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "3995e32ed9acdc2a481599adb2d6ed608e1820aa914da2b6da3cebf0d229f89b19f1355de7953d74de6815cf0eac5381a4d99db5a5b76c3874076ee800a88ca9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "dbe3807aed7ba5717197ae2f7c8c59b5aec752ab32093a0a103ab6f6f34c298fdc7718bf1f367aff1539871077857ddbec53068fea27c4c716eea0bab6f4eeab"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "311be32d836f56d49d6d7cacab0208702870063d1569a83f30006b641586ac2beee32583cad31a75638745e196a6d2d309eee731dda5acbcaef865380c3940a0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "37d165529b6b8a34f35065d2d5971892c95c9537b24f20125242a8ddbf250efd5049c82299c70694fb5e591fa8acfeb68e3cc6222c6d60544448331c199d3f8a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "23737d6c1bdd91c9bb0256ef9ff9708a8b082461e62198bbb90fac31e4a6d077b059e8da7d0b4ba63d52e0a6cd6b244eab8b0c038fc65cd3da66a0cdd5fe6bd5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fdfa30d26dc561f829c56acadaaa7dbb53def9c6213efe493d26954a621291d609d1e1400d13081621efe5a949ac33cb89655f1715430ee74c6d43518c35f95c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0b7e7b790183c949418d67716326b0ae13597ae21f45ce15d0d9bf62f09f5f9e66908b236f5d5e8d81362d193e1c19da7307dd2528cdedff50ece1310f8cb13"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "cc7690fe45edf2173f1a681e5a0507e31fd2b4a347da5fabf4272355001d9f09058666671356cf76ddcf9c98344921bf36a8b1f94eac6ebd484348d73a64506a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "b599c718fc82cafafea71db2122cbf5f99c7e64029956f475ff5ef40959de07bb8b9b880459e5462c49283a9d94763457e6a9199cd4c88117a66d7732357a507"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "7b974ea9526d431edd2663dfa14852a517546ce222834d7b50ca132abd787a86dbe4b4bd0b347ad016bf458551ed275517a45fd4322783f78de4e82a6ae88365"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d6f4256ac05bdf62397e243ccd2057d9a0920bb9aa9edd0f91aef1bff4f3cd1302acd8ad212e9508b903a97815ad9488730c7795538daf42d4521e7bd47f57c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "a7bd4c547335e3e54cf035219410ffb60a5f8e621c4b8459a2e01f3956168d8677e7d1892f509d7f1c2b823dccbcca71e21d47a83b189846a2dedebe9caa345c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "b539ffd5a34956580f884505245ccc64d3b15192b27aea72191a923065a671c1a24077fe7092405dac05b081b98016b096145fd096847abc3b3144f0e927ea75"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "0befd224443852cbbc861e72405326f957637554e66041376799ce0f498877a14bf63d892b3e779a182f7f4cdeb5e8d8b688625a7d5f7529ae6fc680cf35a01f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "016957d9cb2208da775061c40a0baf66fa348d5426d6ac5801d9c07cb984f6faf85013fe9508c41281a5f66011ee75b28d4c02ac5d37a1fa4d030e9ac640990a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "0192f63869f98f0ea09aef814f2f52f7d07d6e42e2d4d31ce020a9670df04808e3a2baba0865ec8f685a9a5156c7648282acd16b4227d461496e6d76c6ab2247"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d9aa202a12bbb81e2e17f6252261ec22c570f03a2b178b73ccd316c05da2c50fb590ba3ef78b067f681342b596fe887d33f3977dd9fa54b9fa5f78c0a36d9931"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d39aeaa7cc01181914445d5e3cfc55288373a05e6987e4c8e3be37743fc99df6c85c47337560f9faa38b826a041c52f6314ffbb3fa4e2593d126dff4b0bc55ba"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "05d043e48522191a959da5276add9ff88fd009c64b705397abf546567c677f874f640addb206e35c762b5ad614c9b4dddb0162beb9668ad28b4620aa5a2395d4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "7c2e513d00c092d205e0b9360dd907454b87f705b2db6b0cb88226ea3456aa1a0d7d45bf7560861b27fade669c226c48bf08d24b28459c0eadb4baf3fe947433"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "cd37b2be51aa96a3848c1058fa523062d79422e120a74eee2cf0b032002a80db2c07fd8b43fe374e0aeaf2425a72db75fe77d3e5928d1f8c4798a763d33c13cf"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "4132edd33d3b1195e5774cb4add6b121ade7dbc3592dea69c5f45fb74da5b3b2e851e38df05173b11a011c1366fd2ab000ed4ce1d9eb7a1b6d0deb0f1d8296d1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "b2e00d3f5eaf76862270efc672f50043cb928abefa02b299ce519d420ef6ee5c65ce8710a5a49b4ff6c72762c7df0386c2d4f155ac88f3853206c6d7e0d0e36c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "a8ab381099673212aa9370365aa26099f418560c12bec5b1094cb7228cf2828ed396da60fa7d45b6bb3c2126b69d03a2fa76124d7df345673b86ad5434c59ab8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c61e353e30656039adba5264e32d2f95d0d2f2195e21250134b3408a62f936fff3d26caed1122964f6cf4b1120dddd6b17631323d21c93d7c18402559a0e40f8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "f3dd25ce556793bbebb5e23ae0b380bbac13ac75a4a3e7c23103a8e6aaada84173f67153dba2bcdc40e2f73b9f6faca40ed1932fe5e3e5e3dd9edff67b7eda53"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "11ac4020f61a185ea24c3ab3ee3361c11275e44908cc4be1650b523bfd356dfb3b8b065ffa69d32ad7b1d4f54d0d2369b1a18779e27871971bdd9be680aeb140"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "5e338e90d23326d7d81289ef44d688d8d45d26ccc57a8888be64a1fba85277527c05a7bce0395852a15a1b4707e146503d881e0a718303cba37213c8ad85189f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "7157d02ac19602acfdf67df8ec4696d13cdb433beab2be997d0996b45d89778fa435c2f92bbb7374503d1241d8a9c62a5f3cbcd278df5dd9279cce8f75481c21"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "8d70071d127efbb5b7591966e615ad8c49a01166c654d601520b72b04170523f8b5e63bdffc92e8a34b28d214d0a683bdc3a9655c4295c3c98f87f510b0de7ee"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f1323f32618bb81dc0cf566a9341311050364b68c51d51531a17133b7b039853d94b80eec21f1ea9f76607d9cbda46ad15b4eb378016e753f3900bb060b66a35"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "6ee87d5d96419749638ab4adcae63f3d9e6e397ef9f8cc30ad93d51adb5ee08e2381f48153a785f5e4694686dbb7d43bef3bf8a5ad161f02f3ef9f2f18324592"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "6b9bb4aed532011ec4a66d7a19be6d68b7efc699e56388141d0a2895d52936b2c5037e44978a67cbb82e5d0098270e4615315ed2162a6f4f112ec0bbc5c773b6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "2f1dd9d6c43fc8a49262b3ed3899a1ad1933ffe3491f5af7e3c3071b68fc8f1926efe2d0c159d8e614eafdc365e0dcb572b01b6d874c404fa17024c38ad7950e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ccd6e9e49c5c784da30e47cbdb275318b857d8da1cbba6df1210890f6a3e027d791e176eab60964904c0c27ab33fbaa29001119f7ed928e2978a8bc6f9b6e309"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "388e7cd5c6914d889c44a1246b056d6a2f4b9c1f38d08db34209b3d0e76a3caea0269d137ea66890dfd3f53f404ca101bfdb27666484936e49a73be01af5e677"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "ad41de1ffe0b2358f9ddca8a0e161119933e966380cbea6648216938371b2cb49c9d4f9646b4d8c194830c0f20b95c3f5d74d674316fe684bab1668bdcc88f17"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0ea2b935a8bef6e75b1ffe0ad783217dbbe1511480aa8824f3b1cadc1bf67327b45d77c1fff7d27cc2e4d1def0e49a8dd4638781631774dcb6d08a56d06aa96c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "ad48892743f3a804776be094d06ce69187e1fdfb625def2aa33cacb5353521ce5ffb3eb142b96d08a4700264e9a6d47f70fafbba1d851b44f7e90f52143f4334"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "7a1b83a505bc6af3c856bcf33652925cb3450a5dbbf3eceaf06ee82236cf359bbb1ead70d97a4338df56bdaf07e668d8fc82dcb9335c51f4ea2fee4d51bff711"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "e7b53e5c35b63cc46626896d69b01a30630d4a4bb700cd824d96221cd3f20d51edc298149842a8b23d069d2e02ff7905722e93fa9267c72dfa82ffb8f711d930"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "536bf789f33ad59d890cede2583af3952c5ec18a159e5f8385b7acc50149d398da91bb8259cf8ccbba2740d0cce497cbc9d354d75dcccc4998ca04e1f2c51ede"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "9c13de853952915cbfde787bd8e66c5e1f331069f3fc462f3944228fc552fb5016a908eb28c8bc30f8ff298e0f188f07e2ff8b1141d5cb575f8ee9e0e38e3bef"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "0bdf31dc9eef5ee0d8ccb5da3001c0fb0dfa4613311bb3a389cc12c4cf370180ac8b0917980cbf2df3ab9205eaae35edbec60dca88624ef13437795c174e8c2f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "18d8012a9e9d55b93aebda9abacfcdcd2935d9019f77d6978fb8b02b5c16c07197eb7f08bcefa86813fba195df87d22d5007f6c1d208c37381204e6c03175b68"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "77b547dd21e645aaed68e1a263bcf91b2101f05c96cb051b787707911ea9b047f73256b26b28efb790d0abadc46c44f304cc3f2f80472778b5a1e45d294d9b23"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "60507ea94627f172cbed941ed084e803ff5ae814f838f9b0b55993878acc78fc9bf73e53de2f0314fb59572109da57860a5df9b7f7815273a8db73d70c400d59"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "d920f13bc0bcdef484194a6b3a48195f5d3e7686a828b963a8d7b22b43b024b53eb284cab548b55de81c97831b6d3ccb2e88eb79cf715c94ef4680a4b12a5b7d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "1b9cd4182f45785b927da9e78e52ee6966194ec4482fe6547d7b0e1d6bf3bc66d1a67c683c1f716199db354a373d425f32861d3fbc4ad2ab38aa1b9c21b847df"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "9da2ad5723dc8d5c0570afb906b0e5808110702ca634a631454b082dc70c8fd97a9977a7c2e656d5e259db7d584dba3ed3cba9b2f45183fa63c03b2a3605c0db"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "c05a6ec69e1cdb8493adda32ff9ddda4fbe03d1c23fb6007b67ec693a13bd50bb18f6f821c4789ae40746f4753c39eedb514c7581ad51323e8f9ae2c284766e4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "2ebb5e755115c19961a25b9ad4598a03b3263f1fdc096b873577c2b5846d4c11b94cc002e2305729d96be146f13db5daacbf0575f7931594f4e49adfa597faa3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "26e1674500b1b15c79fb87a103d742fdef100dc6a2895d4884626d27c94a1c897335263dfe583878ed92bf4e66e9a3f194b2985bb487560317bd340bf8c1ba69"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "e6b94b200294d7fc6b8be442dbce0424cebd039ae840453bee17ffa8ef14a2785636f548b7e79e25ecafae202fcb53211b4fa37c29cd3b2a24383a1c54d78462"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "166e20eaf5250e307dd2878156f325cdde93b10f947e7fee461ee5fce4be61519ee07260231e99024167cbf509c88828dfad072cdb38749669cca2438699e29a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "dbbca6eba73d6d5ee158b08dcef536563ff6a9f537126858786e6a39ac161469268c26c92b6c1e89a546e1fd68e14759253100459e66352b263cee5cfa6ddde2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ad006b74b3891a7bb6b59b4ea4bd70575c670b6acbc337bf6da14c0e464b47c55ce63aef05a2a68f915a9d32e455b2c0a27927135c809f2ef3035e75a3c60f5f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "8d4a273f5e9e0a6d43260d11914b8e52b62cf0aefb45fb6da8705ded079c6db0af5d7a7ee70cf908459cb76dbcdaed2be2a09e8f8b3f0c7b689ce910a35ddbd6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "8339683787463649ea6dbc0f761e658fa92b6fd8c8a9160f95686a37d10170adba6cb64ca550ba5cfe774e3700ac8bb95b33737aec9887eeee86f4323365c0a0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "893358e845b50f024b61444ba608314a574e91943440a40a214d69a233b3ff5f4854d86e5a2b90813ab50fc7ca01a009bbb22d69b1b5b5d3b3603a45e30dc512"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "a1c88e244c73de9922487f00336215c79dab047cf2c57fa4a8188e434489163bbb7da586daf0ad051510278bf0af703a26a76d65d265d0dba23d524a53e4c11f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c400ef2dcad7680b65fb50560929c73d9395fc10300c1aab13e4a1c4381514f0fbaf9b192952a5320c6e39db002629f0d27b3b1f4d10ea41324dd4c97fc40ff"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "eb6fc7526c9aec0a9a2634d83ea7a086890a61112b2a66747e7bc6b94cb0ce07b48e362cad7873d409a893dec712bee5ad210fa10806354d6dce60dc7daaec2e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "6d06c32a47d7def8017e933b6e03cc01fc35ca7dc32eb6931ec6c749b6b65d59a6dcff119b9a51fa949d893d0f30fac45bb0b52be3ccf1c519ee1c469cff1e24"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b768ccd8724854a810f0a9b53c5bcfc1db6373575e0a7c9d9143b674e1aadc5dec614528340732630fc26a227007a0aafc99223c4e377bd1b9d16ba78f6a699a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "0445c45bc17a57022f09df0e9b3545c27fe55a69a431ed6feac4523b632617895c48f2b68c8d0c9a92b0f86a345bbe8821f5be6ae072e76af5d7829d59d5dd9b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "1bddebdc108787ad9d07d3b782a1ff6188e88108a508eae890d3588cb89bd03dd8c84a099f5aed8696cf15acc2573f112ffd352247470a5f04bdc439ed8a8e69"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "7aaac17918fa6e595820828049952da22be67cc6cd248acfe89c47d8f92af35983d79128d980e889ffff809b1af385086e71d3d637cbb672df36209a1bda90a2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "09cd1a3961a2636f257eb0edc073960368d784ba4f5b456339b213044898526ace726406a47430f75b7f4950f5e721c5f5eb59fcda65133dcefb5157b3e4c258"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "8cc67393779a6062799dd89c656790a0bf63d3354423298156bba87357f94e0421853795bb1af95bae932ce2541abff620918ab5ef3711e48ef1687af9dff2a3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "5dc4ab917fd86cbfad7734ebfe57b21a0546c7c5b5eaedf55424165b88d5e847c512c27fa94f6be45825c198dd2d625c18b6f536aa03b686e33b8920cc71105b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "81a6d8df939702ec5c02c4474a1a4122c6f622c09a53da83abef08993e10aefaca3f3e0837919b7c5dd198c524a5fc53567ae41010c9194739d18c7d7ccdcc09"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "884f9effac55f297f40725a480b388eaf28e15deb4e462ab615c2c97e44827492cd52f5ec9c6b0eb0f8adb0c8b5e41385f2f6125d5a9ba00d6ae7beb044f0d62"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "629138d559596bb7c9791b33ee3a5c81fd0805ec033d7e6f125cee4eecdfb3cc9337b5069f143c1f56433a6c663bef28c70f08b422ee37ace80888add3747d3c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ff94c3b07a985bd184d6b17144284eaf60604845a7854c7aaa4cea552682b4340dabc24f1b65641f45b17253eb9239cb0c4468d282f2715ebeb24b993f17d96e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "638325ace5de570b0d31b72caf54a82c406146d13328ad0c9d1bafcb19331e181f53f1db55ad406ae50f1aac8390df1b3f8f51381897b5a226359d7188cb1eb7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "4bba9232f6a55f28403a66e7a72decb2a212a716ff80a14daae6798939e0e2593d926e25c55262d43e35844442480dd358149dc674f62314b6ff858d917e9fa2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "aad773e41b35978d00f991011276c70773fa78760f40de4b2f2ddd6216f6bbd503dc5a9e834a21466379499a8af06707ce4b44ee27f624a68fbcef808e2f87a6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d642de8c388a27f59f3f7b54d3d497d9eb1444d5c6af69bdd761f9e1e92ff381e7ff8f0005b5d9a2ad796acfd9adf64d2620a48ac654c161529fa88a9ce97495"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "b8d8f2fd30350b759b05a8485f98645a91ead02389e93dfaa6eeaa63f65b6d75a58bdb8e462d96fa79b61a161f82f1b31bbbaefdff99e703294ae407c60aeec4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "acfd42a744185b84018869d278b1139c9d72edf23a5529acbc35cb57253f897caae2b3c296b32131897d8072e8bdba4beb1e5134b7a740f40697b0a78fb95073"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "62c000fbbade7c1f5dddaadfd0d718faa6150fe6deb759e76cc0e02d05827f5669b1c5e3f3dedb6e70e4d5f900951af644729edc3e34b665679c42667dc3085f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "433cb00cc5ae251c7b9668217835cb7bd359641a7e25089d9bfbc8f2621624359b0b2a2590c08068a8700d32c94547492c12fe89678d64df376a182020adc382"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53d4dbb289a4615aca4583edf503cbbd5439a8a89567029f3aa894ad4d7a2f8ea3db42982574aba21b91fb14af6615dc145ab99237d612370b2db93016066927"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc23b6ea54d06f35e81146f562a18e9d83fe50ae7d52d98425ce1c313e44f7e45b09546c3542ee025dd4348c17ed20383ba7204a9ecb6af2345db196a14e6df3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "6226010373c387143794ae1e7ac0816405d62e648d3466677c3ed0a6ff42de78ae76d7cfbacb94caeefccaad38b6c3df921dcd4d6358b9764b3dfc124b8008dd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "bec1ceedb067b1e3ffa168205c3badb4ae9bb1d9829bb9ea848e7d0e70db91fe3e6d814c24149bf16862dcf24cc66b529323f438aca181b1e6636c69faaac510"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "0e6b15139883ca0d58d05b065c79c7fb6b6c2eff404061f329d9086d63e9e7c9b693fd16fb3a356fa0ecce43d640039b1e92a020fe0569b8ad8eec3d92ae16f1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "317cbbd21ad133ea44818429d5b3e7c8053395d69c5528a14b44e823b24deeab1acf66eeeafbc61a9bc502eca0790ac2bd18a8e6bd24bf2a19b6f9b7eb74eee6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "d9b518614de4247694d62871cae1f7e4e66af848bb7e0f4b1c0cbf77806e06a9d3d8062a6baa8b518f824d4f0759bdd76551525e55676870d3b18731eda2ec45"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "33064b1626d1f91781b85227142f912c93454582f0d220c09ca9cf5abbb3d31d3481d342ac91a7b79845b9f86755464cd717008084da56c05fc6f78215366b2d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "eaa227e027416aa7fa8f654d3067284ab7b7afee042d69af1f0a5d873257cff50e73b13744118cef0b0426e1e5f4884b7bb43adfc1c03cd317eb50d4131e05be"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "0c8f3381e15495c57a5ddb66d01a73d5923905a02ae58d0a11b9f983291ae6b254defc40e285e1b0c3e154ba2ec3e3342231601b43f12d705fdf5b500108cd5f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "55e0e3ddc0491ebb0c95278fdfe69c7a807d6e06544120398685f7856ba9a5fc45f491aca364049a2994641ae1d28fae856086dd0bc32a0f50e9919fff585002"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "4f563ef8581404f24fd7bccb4860df6f7175a5992bd432a1a39f4984f67d33642255dea8bda3f319b505a0750c91b0bace18f674d1dfc6d85b5671e5069fa5c6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "8b3ffe3626f6520cf421a4b41f4852fd09043d917b586677af9781154fef96c721a2d799e11179d867c38cba5cf1826a4e17569d0165fa99f2e2e006ae5ad371"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "a543b8ade4ccfe8d1ff0d107d9b9f86715c9dc2dd633025f82d47f9aab260415f2117f15f7481c6313d3f71ce455c9adc1607ed38a12bd90717e67aa987290bf"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "4c56c4804b9296766413c503cbfb4db42c2237dbc87cccdbf991ce7cd57553e08b4c67dd77cdeb34695d34145dcec71a61107af3687203bb21ec773d322a03ee"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "76a41e342280307d732ce4f6b4f35834367f3585568fbb0c36e70f64b3f274eca94392a0f46e8a646acfb900b1c6005117d508a258a4989758c89ad08f34bcf8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "bd5e0abed8992cba6532d32e84919e77de01691845045f98c3c9d4f312e48d83ea1bbff27567aa9f4f9f486dc3a0e7254bc5fa75606f1880de085adcc1d08285"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "880f88cdda17b0eaaeefa35640b09690b5410a4111d02e7260c3d57bc4bc4389731707f183abd34365af5a4937b34c58d31db210370146855827463307e2bd54"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "8c1ae96efafc8edda4b23e8393011daa7c801376dd67a49cfb2d509d8fb3029ca75942dd5d275ebb0f29997462381068c09fb3fddd93556de3b5acb1fb6b8561"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "c5382bb928d5ee83aa5e122df3723126eb1151d3a26ab2c364c32c05e3f5345ef420825c67c4da32467aac123f8e245dbd0675bd16e9638ac29f0508bbb7f2d3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8d889c17ef408f7095c451f896d5b1e5f73fd5db42ae1a3fe9a0eae12580c6c96e0ae61e3b78de99460efb2f02dc035c71c96f137b16661e310b8d7635914303"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "f30d33f57481d68632830804e1b75f730368954e23ec7ebb1e907abfe5d9eb9059e3288dae0d27a6298fd6a658412b66706d81843537967f92c04b11abdcfe59"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "6b743281af9c2bfb40d02b92a4d4b0d2abb23942032590f55cb86515c71e42868eb680ca8ab44c46a0610b7fd877cc95efe28047bb95523cc2d13538e9de68c6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "70822ebeb495fbfc7cba878e379ffeb3395ad90381d21472f242f12607ea95fa6a6bcd2d8a9b87e2eb42156d2cbc7fd90abd144ea47baf9d445249a78d3eb6bc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "c2f20a9bbf1f8781ac11a396bd5580f171c025f1f4abec85ee4b96314ffdfe14cc8b4abf4de8a3907065f5b1bca55b39590a5d58c06cb77e22d636604f9a7ed8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "ed6c3b7f023e479a7c5bbf89ee1769534d697b8b5da3f1ee9f37c2b112adc44cf4c61861eea4de5889ee07aa2c26aa078572afa60facfdf9bfc9245339657d29"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b826a6780d39b036c5ca9a34f3192dba8f0503f046bb20e96e9f71dd0d43b5a34f8f3998a83f3eef43b8fdace8d3ba87ccd740983b093c6007bed00b9a4e3292"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f7f9a2a255465f99ee6870e5a92f11315dbbad0bef26f1f1a1c406bd3c17a52a1304fdf174fa50f80c22fe014f025c28a8b061395cc71ff4552718af45cfa48a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "5960f783f95b5abb5321dcb0dee13a678f82c1e5bd314e1964b34cb9bd2f982149764cbe388aae4f0f727207874feb71749322e0dbc517d5195760d524650cee"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "5f67df3d948ba0b4f8a77df006d6810497984863abd3f63dcbd46d4794be333a3cf7e19b22cdf70ade8b3cf64561c71faea6da34787aea5f750c588604778156"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "242ac952a3709580f355313751d17a5194d059851c243ec0cef702984ccf131985ac0ddaad7bcba8d3e8ef4faac56c660dd2ada65555ba199c9b5b0c38d1ea68"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3058646c2b1933036118e4cefb5fd2325c41ecce7a03f2516c041cb1a09b12988c2301b97ec1ab359bc351800865e3a652bcd0b78ce5858738e81366ef62fa29"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "cd1700ef9ba9b0554ceb404674ff19cd48d54ab811edac3112984029b96ecd2da34c4f7f691d2e2559e4d6c9a3f312eeb4df20c58203c1345d7eac9fd3880856"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "1c827b5805c84c14dcf6a0ccb30601aacbf67cdd546560a53451daa223bc4d903d3165ec4dcc20d8a6d5f8679a9cf5fd325a8ae3f463711311702ecf2e5665ec"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "aa4d58092339a8506cd3c07ed15bce36f56975320e53b480d84f1c3130ad895cff1d1b9cd02bd405f09e4d8f9e0d37f9e29dc6fc3102f58a75fc2c69f2673210"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2b673ca58695ba9a7fcaa2570521529d380e725be60091191a373dce6f1e0986714b22827054580aaec7b756b4a5ab7bf88957ff7b473b0b775cf3e32ef1a67c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "5a3fc957a8abfb7343f78a61e68ed31513b3c25e8211203ad78719bc8c1bb42b4a1740ec8557da77340558844bce07a1daa3d95333331c0e39839cc6733096f8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "fa455a9c2bc429c09aed09fc307c1aa9c5cf285c62bd01348d733c82af840d851d3568dbe5c5d3b543d999e61508f19f2ab744a5dc34350d31471ea1b0179c9a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "2b07ce2526bde8dea2ffc7afb9a0c6b97f9ad8a3203588419be84ef2b5bbd9064339782cf00007b3c520e61207ceeac37841008a057f663f2e19d03ce22bbadd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "88a70b7eac8987782fb63821d4ad9513a493b0f75e51b04cb8ceaf3034a4d1148bfa75bb588c128862706b009cba24f2e0091f511d542958672d6417e252ddca"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b924191e6358f23da98f55dcfd2a282598db723d2b2fcb0864e91e77e220e9c6a2b9c7ac37db11230ff206d383e87ae8bb6df4d799e6bca87f8ee006fd2cffd6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "fc7606d53076e1972c09cbf3ec300a596732e301ec3a847030fc9286e87385fb017672210dfed4a5c3f0acd0e3243abe11b845632c89cc082d2118aaf69daa68"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "821ce0d7c4983793da61fdd1c056072c7ab2548d75eadf511a1bb1fa7d155b2908874e4d6420d803069e47af8f6271df38bb572f6eb181224800546d82fd6c4c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "19bcaa93dcc165a274826e8d646abc91913f586ffebae5283e608955bc0ad7ffff0ce94cd497544134863368b9761aa0c9f29403c176064381b45d108ad8b80e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0e5a248810ed4300ea8d6f07ccf2192edfe1c4465bd192ccaaffbaa64e9a1d0128bc63d7aadb2977c05bc4d99654abb7f30d2ebadac6e164d0f77c058d20df6a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "7b9b805324da5492ae85a0a8776d13f342c2222dd2c905af162fdcaa74d634891cc6ac2efbc79d39dbae333a6d8e0c49a2315b326323ebd6ddf724ce3067996d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "08078f738b76f32d1658a26f8ad0d16bf74c397d35ca57631281eb0d651a1f3cb04f7a3e428eea143520126fcd5ed7786f2c8d89c5863795ac807eb9d214d5fe"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "908419fe59a3a1186fa79aa8a2f6ffc7f55c0bfa32c4d9ef2ef29e921e0acaa23f85071eb7657716c602b2368f7b28b775ff772b26d8ac46ad630258488b01cd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "15bd2c20f3d04f0ff4d1f47391114fdbefa46013928f825daccba8915b97bbc99d03b3c8fd80ed147ccb00cf1338a9220bb6eb4d09ea2ca7f16d97571d36baa2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "44126c01c9033b8a8f260940710774285dfa6ff35493b35b735d83858827b94bae0323148f0c95e87976156ecf0cc9a833ec52d882571a13784f74b12067d557"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "a167029d21205c7b452b569aeabb75a05f6f6f498a7b861fd5b0bc803d411b0522137de86feb618a247e33556964da3645bb91d45f1cca020b6453eedcf238a0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "56636b9a33a5f681cbd2ec6d4fde8decf1ebe6477108bfbe54c13c29c15a2b5ab91875b407c8fcd7f272328dbddf10b36f2cfe6148b3a77f93acf22de0f29481"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "f9d79d3901821c6813d4f204a6760abe219448e0fdf568953d7ac04d4d87113daccb69eadf9503f842bbd13f7ce6a83e4fbdeb31d1a6c70051050bfba56ed025"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "2ca3b158a45b6b3943adc21d56cddf451a3ab7521af3934ea0759ade5136290afa8ff2c7ebe7bee04537c869d665cc0843ce471a2a8582d998d32f38680bc587"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "306a01f372b1ba8c59cbb1d67834d2e1d9a255ac0bc784c180c1da67857b439cbee253642e30fcf400dc8d988886403fdeb432fadee5dbe297bce6ddfb9fbf74"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "55fb61f100fbdfd77e716f11aa603b27e992037fce2d4555389ab4a40edb537621741a8b18fcdf150625a7daad4395d806f4348a364db37c708e199768e91488"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5096ad17de32e339a3bf4556ccfdd50f8f8e738c49a0da1cdd35f04af4e33c0fafffc48f71bb97b6fdd72f420ae3c5853b3be5c79ea48b5e75d85170c6565a4c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "b9a993e9a84b93030e86e2a89b8b93d4c4544e4f1aff0d5c9be31369e9a5176cb256567b5032ab93e959ebd4ab3ed25db21fe890fa75112730ff4dd814029e02"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2ed8b33ff8bd34d546ac7b0dd63d7ba01e39be07f5f5a23098eab5016d487f28b1b0563afa2101d1575a3a1c7abb1e61b8d8e46ed75d8c2b8f3c55e750cb2455"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "310e913b6bb487c78969d5d5cf9318a6c347f70e914d87747a2ec03a6db643a1b3816d4258b1d258fd15842850af48dee96a231e998434834d8999b8461de784"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "42273338e5f38824555acfa9372e9651ed2037fd9fb5bdfb9d09ef7f87aceacd3e802b3ca058282ee82c59a4d26e5f7fbab7756b7bb681371d498b82d9970186"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "25b81dad69c1665116f2de6801c7acb3353e25d4d72a2edebb766119482038bb378c3e15cc9d24d7b3719912067dc4646ba814b75da2f5a702902ffa73fca32a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "043aa96de8257c490c7837250de922934ea465c6b7cc0a313da21c2b4a0fea337e3b3b1d76e027fd3174f66781a9c7503b5e8e36912673fd822615da1da7720c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ad136f59248c3496c5790e721433d743b5d7b52c6b83f89b7adba0bee2c70a2569e39afc2f32d2be0305c3f44ceb8c75b8fb2da980a98eec201a23297abb4ec4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "38f41c7b2aad097bd8eb6542793382c039ea84d0c6eb8835b9f26f3dd6f71b0d9b35ae2e56beecbbe52e9f3908727f66138beae020f6dd2b5b3ae1aa026bbb6f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b8ac56113b49e063898f22e164f0408501ff6836fac7e2319c1dfb9714e0ee409c403a30fdf33a530a53ab5150f54c4a759134238865e92d15208a7f0eea47a9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "e2be4dfce210c00f61bd4f84f0500e7f5288e35c9683c5320777dafe6120009acd9018f4cc9071cda7261ca3e2a9008c3ee5f77278a874caf2545b5fedb85d47"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e183da3b542bbc848518df674f53f8023055299f47a4b5c6519431a2ad2db12deb156d239f8feb48603f39fbd7964aed8d5eac7ae74f08b8915625a187c11d3d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e3a98a8f0e1191cefa214161c2365066b82bd77d205206d7284d63572f54a2d60980de1054a3f4cd53be138e2237eae3ffe313dde5c8bfb2b1a24c4753416593"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "11211f37217e1a531786240258676207b061c0ae5569e548dfff185aeda10646954bd3af5ad18795e7c90c640b9a7159130d8ca52bce6b83c4b2333984bc7ccb"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "790d6cad2823ee3bdf977854013510e45f738c3fe08ed468caabf2a9b523a8678b35c69d4cfab081e38cc9bf3068a2db800d3c475bb9fc590e357bf62db8096d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "6a75467766b47156d767068890254e4c14652fe9cf0c70165828162d9d8aba7080694467b6c0bf2cbbe8bd625f89404f5c56ffb3558d894230fbee62d17b7040"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "9180a50aab3df40cba5706acb9630aec80fa54a7ba4326ba690cf8d6a84783fb233525477fe59e373f336f79b10289dadd14166cb1c6274b3655265aef2d3f9e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "694f7f12b9de658e449b08112c2afb1695926957170394d722c4c44a1b4e1e3e909ac936e1223f0913c1fe88d500adc88fad785bd8954afbe9b5903073666c1c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "36548e75ed1a538eb84dc6878bcc5c3d04a6303c48fb419159539560b2c35abaa2fcb7c77630afb02416076dc32246aef5c4366c4711148e06f6fe09471be353"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "2b5eb631d823ff0a61e0662d50413adaa92dd4aa08aef86f8c3581397565f5305b4055aeeea9398d12be40ebe5ad16098c64392733f5c0cef3cc242129afb6c3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9f0e88b63156fe961a7d2a1ab8ffa88f35243231ac4e812fa5949ac3e8ed4341a41a9891c21cb225a72ffed86824ee925510b13bb3873c019bdf25f972cb7625"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "2dfc608eebe30a740c4550ce9a467d4aabf358e0aef23fc01a19d8b2638531f5736879e317ac09e19926d708c67a584ab5507c6eb503fd0b8833f51da9a630f3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a7537d803fa199e49501b0fae17a6461e71452eb0244780166de59a7991e21ea2c09a68b53d338e507bbf7031b460c9ba5d051733ba5b8c6c01db9168916e7ee"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "75fb452b696aaa68bd541042dfb5c5a4b360478dc4d5d0a3ee938825b0ba1eae0e99d1a42a2dc558a4425a9c5ae9add92e96fc71de1a3a41d6390e7d06050fed"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "c4868931765948352117bb50e685f3694209eb04b6ebddf20528777caff57a4145e19e649e9220d590c2f9b1fec3664a5dbde5f0ba3ea063cea0902f49c7c3b0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "942e8fc6f19c307cd3d403cd545dec8355f045b3a83d469632af7f2150d76bf2b33d61027c34166a86bcce0bab35a1d5b431b96e18c951307dbe947ba95e902c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7e8b2872b63d25a6ec8789fea550ff86e607e1d01c44c9ae20ac05fb4d305e497491d27a35478b975daa034a631b87b11c510ff5216ffb0a3999cb0feff07b0c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "0f53d538665e46f89a3bf3c480f6ba8b74e648c3539680d0a033a21e9d5cdfee578dbeffcb5e445e36511928e31c5c9419e3843db5a02afdcb365c116d467986"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c464681fa140659fb6dc071074279fdde8156bacde02d0a5f91570feeba6b504163b6551f2f4930b1b8be5fdd89b81956f720f80cb98aba6a9db5d47e287855e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "deb26dc8560aa7cbfae2d23bc2fe8a7fe9ab417a7c6eb90bfe8229fa0231edf22c5ecebc8d63eac0fd183b4a17e5403998bc44c4ef78632f89e38b49b908f438"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "418d5e1f87cae02f2155a5f97b17242b8f7589b146475bfdccd5ab5a6d5d37719f008550357b289e353e4ae940cfb2c61229df3aa8f91c318497b668bde0e069"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "cd65efea75a85ac5e30103335a747449c23b5bfa8e1b476540c6cf4bf46596565c74c1e86b3494f0d9e197ba284cb813df63d7809f7edaf709ad9dce7c272b25"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "daddb4ab22650b3c69b09eff9634bd90a0b8e623309b944daced02eae82459405cd47ac5fc0d00a03dd84ef9953efd9aeac21a73a72a5441ad85444c1e1cf93c"; }
-  ];
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ach/firefox-50.1.0.tar.bz2";
+      locale = "ach";
+      arch = "linux-x86_64";
+      sha512 = "fb941dda8a38f2e8474b4c1b235b4d3b2364a3e4b70f929cb40a6bc96a8859a830b072a0b3bb03bf7d551bec6eb0c46e41a93f7ebf4fb73a21949b824ab09084";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/af/firefox-50.1.0.tar.bz2";
+      locale = "af";
+      arch = "linux-x86_64";
+      sha512 = "9ca21be569db94f528dd74ae269e9a0929f9a73b399ad619066c45f38fdd04b511fd8126bcbdca7ad0d6aeb7ec82d597287ef168c04fe1c7a47d9dd4fec3674c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/an/firefox-50.1.0.tar.bz2";
+      locale = "an";
+      arch = "linux-x86_64";
+      sha512 = "1899bd8140e847c6458b23bb0652bcfbc3cc1a6a9520ea10546d6b2f6719715f18ef5e79af07b68fe2cb5f50bb7f7c85376f17081478990a7ba907c45a31cc95";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ar/firefox-50.1.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-x86_64";
+      sha512 = "d3c5e6c263ed1a0cbd535279d03a446ed6e59471c7949d381265056e7dc6bcb7df4abbdc13601b7b681185f66219676a6662e217510a13136d89dbdd6f8460a2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/as/firefox-50.1.0.tar.bz2";
+      locale = "as";
+      arch = "linux-x86_64";
+      sha512 = "3b0112c8830fd9e90301efaff5d8414cc3edac9382947520ab1c283ebc4dd897ccc3102d12d35eee60fefbdd13329a02f056375fced5bf45a51895a7abeb48b6";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ast/firefox-50.1.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-x86_64";
+      sha512 = "b036544990cc08fc0588730780fefe9bda82fa1ffe53b0d7cc0cce60f5fbaba261fbeb6117ecc4b18985751572a5c08f8cc30e9b35291841694a180e0d5e75c5";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/az/firefox-50.1.0.tar.bz2";
+      locale = "az";
+      arch = "linux-x86_64";
+      sha512 = "4beacaf3cf371bf7226095916f3e0c8f4941e32dc2ee6b25368cee6569dd102131cff4fef53f9ce88706172e838dc0a916bc741ae22bbf3eabe293fde3350e67";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/be/firefox-50.1.0.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "e249554f4ed1f1434b3c0b51736c9739817f39db8afd70cf60a7e3ce5a78dc6a23ae903b991f342bdb93b4324c5c5309bec4e84313beb5af94d887249619fa79";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bg/firefox-50.1.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-x86_64";
+      sha512 = "cc4ecea41635b921a652684d7bf10f2e200aacb0c18e50a95f0412c049db26042c0cfbf6d40fabd3db5aedd7ffdca4633827b5f17a27b56766b372420536b593";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-BD/firefox-50.1.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-x86_64";
+      sha512 = "75483d1f7a5bf3fe54de817222f78aecd4621cd1a53c330cda74348ca6569bfe3bac6b60d628abe4632c0e68b9a9e6f0c24b69bb3ac09e52023ee352190d1cf3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-IN/firefox-50.1.0.tar.bz2";
+      locale = "bn-IN";
+      arch = "linux-x86_64";
+      sha512 = "5b378bc2874cc2fd0f3c739048c894670ed7dfb6e0f37e7de324261c5ed62bc75e62a26a1b2b4392858d86bf2314534841eb8676aeb0bd0e4ce6c23432b4b4a8";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/br/firefox-50.1.0.tar.bz2";
+      locale = "br";
+      arch = "linux-x86_64";
+      sha512 = "eb33bf820530e267a5b5c322951563cf66c886bd71f30d6aa8cc43a2a9b16b6e58d207648b68fb1f2c0d1fd645aba6292c6d8674a3fef7c23f3d2ef706973ab9";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bs/firefox-50.1.0.tar.bz2";
+      locale = "bs";
+      arch = "linux-x86_64";
+      sha512 = "aaa4221204b3f736e31fee50c30e73a919066f8cd1f25bf4fc42532edd0a87c557a10f11e275e8b8d2396fe876b8859760d952a311caf0bdfd967e813144b86b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ca/firefox-50.1.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-x86_64";
+      sha512 = "e98b08fb0cd937375fd7473617fd234659fdd08d1299f0792efb9757b356447c479335bea765b0fad902d3b055569fe491a30b73d3f1c3d32c76c3cd1e621ab8";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cak/firefox-50.1.0.tar.bz2";
+      locale = "cak";
+      arch = "linux-x86_64";
+      sha512 = "e8a5ec70d52574929edfe93064f03d254e894a790093b2ae86d3f34376db646366a6970d06eaf3f3fe5cfdc89a8f11d0c289061f41d66d7602c0a841cf589428";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cs/firefox-50.1.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-x86_64";
+      sha512 = "3b5e7ea9571eb8ec0f66ca9d062405e3efa874cfa6d39bc455a14f1f25ce1923b276272deda191ddec085d52042ca8cb633e89a8e908ecc428b0d8c3877b08cc";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cy/firefox-50.1.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-x86_64";
+      sha512 = "78b0e26cdff7f123c6ed3721066ad7f5e9f55d0aee5d1c87c12927ae87fadb8f3e1021193134a83fe5c23c62c68cd9536151999c1ed66a885e12a4dcb4b12fb0";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/da/firefox-50.1.0.tar.bz2";
+      locale = "da";
+      arch = "linux-x86_64";
+      sha512 = "de0f78b0d69c292c482edde52f728df7c3d865f31b8b9633d4ca5a66b4fc5f272402a0715baf5efcf14eba683f8ff633c172a5a198906991ff1735db128816b3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/de/firefox-50.1.0.tar.bz2";
+      locale = "de";
+      arch = "linux-x86_64";
+      sha512 = "f95e36a8393d233409b1c3ae6b56b08fbc44d4603bc932cbdd1897650d1528f57cade92b1b1cf3717191c95db54380ba3c11fbb46b25c14a514e0a00fa5b2a3a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/dsb/firefox-50.1.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-x86_64";
+      sha512 = "a06f9172490ac731f06701fb7f8414438c1e520bbe5669e8dae54697dc9cc3aa03837ee8f84dd1b69751a4e8d82b34f88ef3c43a37ad9fe6e0c8b1afd18956d1";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/el/firefox-50.1.0.tar.bz2";
+      locale = "el";
+      arch = "linux-x86_64";
+      sha512 = "78e4a2fc29487347eea47069e022f13482925ce15f37918455a96eb68fed50152ef6a9a93773c4acb680957eded79c0b20883d86f87ac28895d61d777dc07cdd";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-GB/firefox-50.1.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-x86_64";
+      sha512 = "53deaf16fefcb954b34ce8577d0ff40d2d497c591765a16c7befa6ded348eb997e1523e873775a52a74e47c41ff06cbad3c612722036b6dce538d768d1659886";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-US/firefox-50.1.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-x86_64";
+      sha512 = "f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-ZA/firefox-50.1.0.tar.bz2";
+      locale = "en-ZA";
+      arch = "linux-x86_64";
+      sha512 = "6e1247ccce230fd044f0fbc64deb345b7d82cd347595fee084b8ccedaf31071b992b988346a8bfc5e5af8a2706a47b7e4ce2681e67a11098eefb7895a73bcdd0";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eo/firefox-50.1.0.tar.bz2";
+      locale = "eo";
+      arch = "linux-x86_64";
+      sha512 = "c27c51252c8312f4280dcedb94906296c52c96c26dcfa21fa392c80b0d1277b8d7507daca312c69192cfd6fa70273f66a3319788bc3ae8b8e835af365f3e8fbc";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-AR/firefox-50.1.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-x86_64";
+      sha512 = "ece5c060bbc1809a5609dffbc477ad215245eef1e341232d2516859f1f15959d117e2728605ac57bc94fd6ff6a5b85a892275552ac0b006783d4a1d0f02fa26b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-CL/firefox-50.1.0.tar.bz2";
+      locale = "es-CL";
+      arch = "linux-x86_64";
+      sha512 = "2df20afb64fa6d25678bb6dd91f7c042c754aa241af4e3f728d54526edc342b4e6e591d8586e9cfbcde5baeb932e092c00feabe5e3eff1f00e5065a80f0fd097";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-ES/firefox-50.1.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-x86_64";
+      sha512 = "5b9af2b2664caeaa574ca92d4a63cd0a86a70278f63596e6a7fef0cab3fa4dd22d1c00408e067080979d9b9017f2edd9a3e1e22b3a75710017ef94bb1ba82bb4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-MX/firefox-50.1.0.tar.bz2";
+      locale = "es-MX";
+      arch = "linux-x86_64";
+      sha512 = "610462c6841615e2241a3edde60333fe3ada9897dc7ec8bfeb1771025a5f9aa0acf9fded1459938c70c7fb478f659817606a133af4b38019a3dfcc7fd3b3f9dd";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/et/firefox-50.1.0.tar.bz2";
+      locale = "et";
+      arch = "linux-x86_64";
+      sha512 = "2fa4a1683102849ef33c7a149b7628a3c783ee2466d733b328fb8ea4e1ba96917b128a00ad9a8fb75cec181b0208635667bc16d959b28ac1a4af7c96af10e07a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eu/firefox-50.1.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-x86_64";
+      sha512 = "0b53f26346f16dc06478bad62a0191fb2c9c9fdf2864e0d5332540eaa81a4c22b0492128df5c8d7eea9d122482986b3f97837538436730b4ddfcd1c02098d1ed";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fa/firefox-50.1.0.tar.bz2";
+      locale = "fa";
+      arch = "linux-x86_64";
+      sha512 = "6e6d92624e89214a4110bfdfa181e46847759bb0735e18ca0fcd4b9e333b40b91f8ca48e271b3d1ff4fadc05cfce9824435dbc429f56dfecb6d98e48ea0a31ca";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ff/firefox-50.1.0.tar.bz2";
+      locale = "ff";
+      arch = "linux-x86_64";
+      sha512 = "59865504f50aa5e5aa2bfafa1159623dd54b91e3cbcc0cd76ae84e8da063e6db11e2594b9448e5ee75fdd15188c5ba9daf335eafa13601ad942e8f6f4d2bca26";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fi/firefox-50.1.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-x86_64";
+      sha512 = "6e07761ce3aa5e42bf887ff13a35619e3e20209b94ed890b505c1f0fd79712a2daeab53ea344378c18f6f05c4673e1f146e8f6a44d325ba387ea6967188357cd";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fr/firefox-50.1.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-x86_64";
+      sha512 = "0abd50bc0a7d5a79b98900cbeff95827c46dc53163ee6cc9220f234049ec43c09bbb8a283c54a1a41387be8d0ac761fd9e215d37ad234a0bdd088b07e339757b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fy-NL/firefox-50.1.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-x86_64";
+      sha512 = "2a272b160a2cde4d27f3f3da7a1d6600f4b78af11ecfcfdb3f3596d6a4a1f56b19cec7fee1066afea050b951e1eb7f3245dae28b0a91ac4110010c122609dd58";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ga-IE/firefox-50.1.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-x86_64";
+      sha512 = "730f2c608d9770e2e4c154d6f1ec223290018d2412a1a6103245a71ef17876cf304acbb16e11915cb2e3564c08099a9207839dc8caeb0553cfdcbb869f6cb09c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gd/firefox-50.1.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-x86_64";
+      sha512 = "cde56f2453d780a9d0debcc012e9a139d61c1d78fcb2a4a7823982321fd65ffe6b538fbaa7a0e5dd69db6f1f3139e5386bd6e02ca5c065510a936fe35583872b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gl/firefox-50.1.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-x86_64";
+      sha512 = "161ee7b027f64698c30bc5147599853c4fa6b8f8629d33e4f11380cf4431835489e834cc3a7b42a676d9da6d6231e1e1bdc5f81f410ccf8f55f33c5ec3e07b32";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gn/firefox-50.1.0.tar.bz2";
+      locale = "gn";
+      arch = "linux-x86_64";
+      sha512 = "b4637e7727bc726acf3c1aff2c199fef896eb98f95a04b5b899b9800d0fa2cc6b23ae0c7b5a5acb591e49b03dcab22ef73840f129d9e82dc49e5636234fa570e";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gu-IN/firefox-50.1.0.tar.bz2";
+      locale = "gu-IN";
+      arch = "linux-x86_64";
+      sha512 = "b8028122a8132110fb951175d51d07c685c212cc56128788c75bd0c0d21452752e4fd03e6345d80806c8babffeed04f7cdc89b1b338f7d56e539b847c0da7f72";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/he/firefox-50.1.0.tar.bz2";
+      locale = "he";
+      arch = "linux-x86_64";
+      sha512 = "57adfc574ca5160ca5f95f98c76542109dacef231ad8cbcd4c75467bb599e922d6590cb3214f4e4946a947b36e6130b25f12cf4c641b2ca91a36aab5e8489426";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hi-IN/firefox-50.1.0.tar.bz2";
+      locale = "hi-IN";
+      arch = "linux-x86_64";
+      sha512 = "3a71226d56c373663401d144388d5c74e583ae34b4d05bb444703426991162392e338f11e993707a83943c0fe85b8a5192099b932afa03b9d3ff6a17903b1271";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hr/firefox-50.1.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-x86_64";
+      sha512 = "f919ce865004a64bcfd834475917ba24c1bfe0bf573e578984199085c073abcfce38b4e838d684f4cdf5bbc2408f84758df9f81345da6e0824f290ad311dc6c3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hsb/firefox-50.1.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-x86_64";
+      sha512 = "4641225b3dcf328dfbe12af68698a4504d0882c1029a36aa617f57ddf11e0edd9cd10add1d887d2154a59e6fa60bb8b13bc185529df166c72195200ef94a5dd4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hu/firefox-50.1.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-x86_64";
+      sha512 = "1f34d1d52d28413a46d5f9efa8d8067c41ec5af861f9fca49a5b59f03e6e325455883a2ee4f9c5e3629d7a61a3f1106f24b4bf4f9a75e6659cad4ec511024ce7";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hy-AM/firefox-50.1.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-x86_64";
+      sha512 = "926a0a1e036303c53fb0a5c65ec2a0285d562c86eb7396f84fa5926a3b9e67ea7872af6d8d436322ca5a939d1626adad80230abfecdeefd51d5cb3b27e16cd5e";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/id/firefox-50.1.0.tar.bz2";
+      locale = "id";
+      arch = "linux-x86_64";
+      sha512 = "f3389014409d143a35c66d57974a77d1d811c3ff9d47f6f13b7c40c0f24154d42bb7e4908589de21b3430d44a108f3765792f7573c78e510292d824f96cc77e4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/is/firefox-50.1.0.tar.bz2";
+      locale = "is";
+      arch = "linux-x86_64";
+      sha512 = "58f320b32ba9a83a6a8a4f4d108c3bd87a4879da7205dfae59b24a3550e0bb90917b431b15a18e38da0d702ee8f2c8756179ea07082ff6e0aeae9f51a3820246";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/it/firefox-50.1.0.tar.bz2";
+      locale = "it";
+      arch = "linux-x86_64";
+      sha512 = "60acfa5b847b5390fb5b733f4a35a0a9c426c4126c53f517eae3e6fea3c6c7c88092063ae0d5d3be05a1dfbab32a1e392aff7f18c6566f827cdc6d21b0e22c7f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ja/firefox-50.1.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-x86_64";
+      sha512 = "3d668102a2f56547b49add2dacbfa1a8ac285007d47585325002cf4250465dae809b50ff1d1d13dcd3f05ce6afaf76b607a696004e60d33caf52d2d531297550";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kk/firefox-50.1.0.tar.bz2";
+      locale = "kk";
+      arch = "linux-x86_64";
+      sha512 = "c35217a07255fcac9bdbfb52777bae3609c22984733297722c62b8391350fe2d68bea20b542d6d2d7f55fc18aa662da226bf83a62e0017c315b92eb460021cac";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/km/firefox-50.1.0.tar.bz2";
+      locale = "km";
+      arch = "linux-x86_64";
+      sha512 = "fab7429671c3b866ddb7fd0d25101a4a83c6a1ee3822a57517b9c6288e35f6a4339f5a42d93f865a9c6ddf1a9bb5e2e23d8458b39acc34bc2701d68522feef03";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kn/firefox-50.1.0.tar.bz2";
+      locale = "kn";
+      arch = "linux-x86_64";
+      sha512 = "2ea7a6094ad8f9b8179028820d79d003f5c04e9bd223fd2df19c7b5daa08ba631176775e9586c7507291aa34fc1c39510bd8851b1fd9a7a08c1786f689949839";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ko/firefox-50.1.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-x86_64";
+      sha512 = "701a0873b860c62d18ab778d1b0e5c3719cd3e6b49ca37083983f9e3f988d54ebcb2ff27138d7a5e76c940f64f445f96143b0f836af4b9611999b3f49670b8c9";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lij/firefox-50.1.0.tar.bz2";
+      locale = "lij";
+      arch = "linux-x86_64";
+      sha512 = "b394da463400ebbcb77cda8ed102f42eca419e896f0b95432e565f126e9e20aee0d9790888c691b9f7291322a3f49d44a58349f611ffc159d514a5a68f7013f4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lt/firefox-50.1.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-x86_64";
+      sha512 = "55ac32604ec630d2540a7cd2d2a46c4161650f1a3607c2e45ee8006e6bbec0039dd4927ef28c9efd70961f7f5c4d9d6fdc83dd60b670aaaff26c31594c25c813";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lv/firefox-50.1.0.tar.bz2";
+      locale = "lv";
+      arch = "linux-x86_64";
+      sha512 = "df012ca9e5026661622b1d0a1230399e970809f2d8f9a3d81a9b05d438e7f20c706cbf739a229b82296db15bf8bda89c266051c56c7786a673e38600bfd81164";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mai/firefox-50.1.0.tar.bz2";
+      locale = "mai";
+      arch = "linux-x86_64";
+      sha512 = "df74e2c1465b74602ba834cedbc3e07671a813d5979e6a0d85c32e504e01136a05f4915253f785f0b03fa98a4c284d066ff2101737f40490bfe9e30165b712e0";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mk/firefox-50.1.0.tar.bz2";
+      locale = "mk";
+      arch = "linux-x86_64";
+      sha512 = "68d80303625c9bf86bc2b86a38d9a41643416bea77445630b10a4219d725a9800fbd973e683c7dad46941fa089df6bcf1d07ba5fcf2c3739eede865eed038a97";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ml/firefox-50.1.0.tar.bz2";
+      locale = "ml";
+      arch = "linux-x86_64";
+      sha512 = "bd1168a7b3e17edc28dbc051fb2951d134c85637b0e0bfa2ac2542211498a8018f8c8a74584d2ebfc24336dc803ec04bfdb11d5975f261f8ad92cdda6dbc1067";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mr/firefox-50.1.0.tar.bz2";
+      locale = "mr";
+      arch = "linux-x86_64";
+      sha512 = "d62ab5e147d55ef1b02b4b4fa5b10986f4a8db2c6154d519f4704a6ad4eee99235219b5d825571c8e08128ecac84c1ec0dc19d124c83d608b4afb4606786e474";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ms/firefox-50.1.0.tar.bz2";
+      locale = "ms";
+      arch = "linux-x86_64";
+      sha512 = "e254c8a787f2dda76cc2929665b261437d35351d6725af6d1dbdcca514638800d199827edc8cfeafd927d4f0f758cd246ac47b9cef3011aa68fb0baaaa17c882";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nb-NO/firefox-50.1.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-x86_64";
+      sha512 = "b9e53d23338b7d825e0eebce3764862abacaceb5bb40f66c3d0d67a3fffc2c1f60c168385537bb042bdc45d77453977ca3c95660cbe3a27c7c87b68d047ea782";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nl/firefox-50.1.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-x86_64";
+      sha512 = "0c8de38bdb5ee3636a7a633c57e9e3445374514014221086b9db106247ca08111c987aca889a416997ed6678cae81d1414636d0fc9ff4e490444041b53cb54d9";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nn-NO/firefox-50.1.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-x86_64";
+      sha512 = "4617abaa89c7caaf9481aca13e61629619b1b4a889a2ed652434c8c01d5b8ad9ad96de167f9d3687d303a8aca49492d7b6d7712f9497ae017200962cb229f855";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/or/firefox-50.1.0.tar.bz2";
+      locale = "or";
+      arch = "linux-x86_64";
+      sha512 = "27df7d794fa1693fb79aae60ec72004cdc3fffa9eeb0662e71aeb639e46b6a4c740e08227e5e334e6c0167aab95de6310f3142bcbd3eef089dedd5eeedd29f8e";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pa-IN/firefox-50.1.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-x86_64";
+      sha512 = "33101ba56588e23bb5cbd66bf8fd90e66e2fa382f4fa6b3b5d9fc6a1372957ff4e01a7a01b697ee694c589573c9a5f1e605f205bb17ac63c5b5faf8545879376";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pl/firefox-50.1.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-x86_64";
+      sha512 = "373d3355e980a3dbed1cdf8099ba31e370b270402181e61f6e1a829c2f2d9b7b73a9ebbe074e59f21ac3f934898c9c23adb0a5c09c7637fb6c67c3093bd46fbd";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-BR/firefox-50.1.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-x86_64";
+      sha512 = "ccd935e398095d3b79e2a86b8181e1aa1988fa6a1e12c879d50457756b62ab3dea3087e8de77c7cd98dead6b0078598d22ead36285559af041254bdb454eafad";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-PT/firefox-50.1.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-x86_64";
+      sha512 = "a8adaa40a2fa564663173641b3dc3d5642c8c3909a8c14904213c9e1cf9bdb4f03dbd44412bed023b02e6eae63bf56fcadfef0907a168879121811bffb9b9ac4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/rm/firefox-50.1.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-x86_64";
+      sha512 = "ce37bb7d969c0fc31c2bfed7ac143e5a6d7d8035a748c5b3eb9a23dc62917ed9ad9b028a9db0b5dca156eb99cb36c763eee39ca893e5a314233e5bf4ec4dbfee";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ro/firefox-50.1.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-x86_64";
+      sha512 = "339120884b8add14d36fdb3fc3ca1355074b0f8a0a87577d1616c392230342c7361859126edfd959e11ebabc6b86c496b440acea679c61e07df59e7e298c47ae";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ru/firefox-50.1.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-x86_64";
+      sha512 = "59ade7f2ef86f412fa376e4fa6a9d7e72cbfabc10e687c7c0bb7e4b4bc2324d7e97e86075c1d7e12480b9f1dd8bffb5e4723f4183882976cd35c4ccf6f2b4726";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/si/firefox-50.1.0.tar.bz2";
+      locale = "si";
+      arch = "linux-x86_64";
+      sha512 = "4a74944879e40876515e03b1dc2261998bfa2264e074874f886a979de5b48e453c7cbd9a020e8854089b77ca5b5182fe13c685b33991e81c7c533246f87825e4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sk/firefox-50.1.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-x86_64";
+      sha512 = "b1440e76e19ef3ed6786f9a40330881bff498c7ab20030189c3eaed293e1ffdf991172251da1ac5d512da4897f2a46f3e0921436d86d9178d96387e33e82708c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sl/firefox-50.1.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-x86_64";
+      sha512 = "abd4e6da09005698655e2fb2bb749be35f8b9e8302ba1068e20d27e158c4ae57a0f1cb277a87a2229e4e815cd9d4656ab32cdf0614c01deab572e6c8749d4fb2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/son/firefox-50.1.0.tar.bz2";
+      locale = "son";
+      arch = "linux-x86_64";
+      sha512 = "17d0444a559c7a5331b93bd314003d84f853fba791efc2df6867becabab9fb7d02bba964d208f44f31af1dfb292cfcbd4de7b48454a7e83668bec26139be40b4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sq/firefox-50.1.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-x86_64";
+      sha512 = "c416060454550ff04086aba74173500a41c4e592246eb524e682f082a75173a6752e982993df3ca096c176c0a75ed5f26a22414df5e794a042dbeb2a0de22413";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sr/firefox-50.1.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-x86_64";
+      sha512 = "f615964e4d87b74dadb841993b3c62d6d683a66ff6ed1634311f58e9c7dc522ed9f2a271a043f7ebaff37f3c1a563d862d7abf22af1015d720979f7459e2ceaa";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sv-SE/firefox-50.1.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-x86_64";
+      sha512 = "4aab1caa825e685923c7c3a32ecf664e2e8cfc2389f48980f51eddaf696cd9056afd944a950dc60987adbfe977d22fab4c994c3aebe1d14c7514369f6898aa7b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ta/firefox-50.1.0.tar.bz2";
+      locale = "ta";
+      arch = "linux-x86_64";
+      sha512 = "6e556f182e0652b79c338fb0d7bfc9da9eee5ef5c68115e748013404ba4409dbf743b03f8722b36ace38a8732924bb426e7a7af5059256ae1f0065096e68a661";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/te/firefox-50.1.0.tar.bz2";
+      locale = "te";
+      arch = "linux-x86_64";
+      sha512 = "ff201a9e66645e148ec740921a7bb1d1b9ffd4b6200d98d06be0f235e829c6a355be0615341f899b433836fc2f2976223a6e46c4f5172590b5254a26f4998959";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/th/firefox-50.1.0.tar.bz2";
+      locale = "th";
+      arch = "linux-x86_64";
+      sha512 = "0e9d0c10f21d3d41825194a3afe21cf4281cbf5825839f908d58821d40358ded4226b5dbe7a094b95aa087769de6179331a19a2fe780b4ee56c74ce137a33ac4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/tr/firefox-50.1.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-x86_64";
+      sha512 = "299f07161a3439902110d8929b5ffdc332562b956d25999235b3e212241d95ce94646ba3542d7138c6ac5bbbe274c614d2f49aca8a674d252b240265397fa48b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uk/firefox-50.1.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-x86_64";
+      sha512 = "f108296c0aee994d558cc422403f45c994d2878b69180d3cf526abe4f5b29d8dc59ed9c58f72a0d21d2550a4d32869b96ae43a1ed251e885bc7abc47b22c3894";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uz/firefox-50.1.0.tar.bz2";
+      locale = "uz";
+      arch = "linux-x86_64";
+      sha512 = "293e4d99572a22dc053cdc8f5ac40338eadcbd622ee1d47c2bab9914ee1d2507e89a8b4340a12d64c0c4b37f4ec312bcf94921184402852c2a7cb114da93983f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/vi/firefox-50.1.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-x86_64";
+      sha512 = "24355d25ecae3e5f18a0f3c7b87dcec8c18077292329a7ea38e5e9411c38812f394656d79f3fa653a70770ae136b3f5fbd1644a7657f448dfa78f8e795de5afb";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/xh/firefox-50.1.0.tar.bz2";
+      locale = "xh";
+      arch = "linux-x86_64";
+      sha512 = "0c917bc8cf0a5b66f85cf1511d3fb0b2f4c4bfaa10883d277e6d4bf399b4b359d8ec39c4fcdd6dd23ba3645047318eace530527796b4be58058cb15de69853f4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-CN/firefox-50.1.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-x86_64";
+      sha512 = "ceb0d7404aa7d8295920e99ccc77e2da7db6101af92d29dfc3c1f2cb4689b582542d154cbc749ad3b7a744f545ccc39e479db4fbe2c7d18c98bf3bf412eccc46";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-TW/firefox-50.1.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-x86_64";
+      sha512 = "e942d5d6b8891d062b452f1a083de2849cc69ac45801aee0b5c413a786ce9d67555d94416d65fb6bb6e4b74cf11ae75a1036dfc661b50fda10b95febd86a80a2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ach/firefox-50.1.0.tar.bz2";
+      locale = "ach";
+      arch = "linux-i686";
+      sha512 = "7546a3fb1cd0e06c9f6916c668cedcfa4671bc15a7ece8ed3ad8ebd1bce5c6ac84e2e024d7e2149844f1797d66374bb2c8769e67d1c4af941eb626c610c433f2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/af/firefox-50.1.0.tar.bz2";
+      locale = "af";
+      arch = "linux-i686";
+      sha512 = "a6981413d7974e2ca13ffce9fc65c0f69242d6c6bfaa6253fb13fd8fc7e62059df718b4722a7a879dc8e352fd94dcf74db41765dbafc277e8debdd7e35a1242c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/an/firefox-50.1.0.tar.bz2";
+      locale = "an";
+      arch = "linux-i686";
+      sha512 = "e123cd3a8c9c8657f09d198b7f113b84192174b021dd816b82ee4497e307794bda1399e5425456c2d990788340a58831cd261a4c5c67e5b0ea3daa3d0ac65f65";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ar/firefox-50.1.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-i686";
+      sha512 = "618b9c24d37f4b82b1e51a5ceb5b2d3981c764f906e7959eb346adc5c974e464d4a691e50acdad7f9e0cfa5855afb6157e8ab600d22266a31fa444db9b7886da";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/as/firefox-50.1.0.tar.bz2";
+      locale = "as";
+      arch = "linux-i686";
+      sha512 = "93e53546ca9fc554decc0c1d6590b5b84a433ab392abf9fff9712d4432bfd47a1cc57439fc65ae9be91da6d38dd462fbb81fdd7304424e42d08eeb600d298eab";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ast/firefox-50.1.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-i686";
+      sha512 = "e1115994008db11f3c69679372a3f07b6edde23dca20733b7f06a5b0c63dad2a264c02e9f94dc74976efbb3961155216111522c3f1ebca91929ae356f8218c87";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/az/firefox-50.1.0.tar.bz2";
+      locale = "az";
+      arch = "linux-i686";
+      sha512 = "93be21a2a79d2f4cb2fb5132856837b1ac8d44c699faf623d076b95b5e61126ea540bcabbf57e2752b49cc7b5116f3345a2a78cd07104d873afc2e2127f64224";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/be/firefox-50.1.0.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "ca41cbbe732e8e754cdb0c832ca7820d5320a8106bbb3e5d753f4a7f6eb30045b81cd84191f868076e0edca68e35b344d63ececa45eabff7102fe82c1ca19e61";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bg/firefox-50.1.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-i686";
+      sha512 = "4e0a3ff42a8502e07afca92ff98ae675213527e68c3907b177e53a580e0391c075a41ba4e5b87c27558f86b28c1abe2dcae191334c737d37bdbbfb25c33d0024";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bn-BD/firefox-50.1.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-i686";
+      sha512 = "602cffffa7ebf0f53f3e466d3aa5d8f203698db16089e83c893092e9a0841a9a8ec6a46aa5df1e2fec020cd8a7345e4fe86fc20797ad65bcca56bb2f391390ef";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bn-IN/firefox-50.1.0.tar.bz2";
+      locale = "bn-IN";
+      arch = "linux-i686";
+      sha512 = "2f7ab4b093b8be7dfdbdcf2faad88eb99e8b0e19ebc17efba44d46a332754fcf16e9317398e88c8eea73680ac85f08d2f0a99768fad160d79102e8e1fd6fb8f2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/br/firefox-50.1.0.tar.bz2";
+      locale = "br";
+      arch = "linux-i686";
+      sha512 = "abc0fb371ae3144fcb3a5130b13c376169d8a3c3051493fb5fece9a4682757c42bf4717b6494d4220daebc3f1560397f1263706e2a3871d7ee5c0135cdfbe1a5";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bs/firefox-50.1.0.tar.bz2";
+      locale = "bs";
+      arch = "linux-i686";
+      sha512 = "f62657ff653edae873269a4113a93dadbbb36920e9e30ff04407d28f755bc04e35223031a60018e69cd4c3b891511109b66e7baa83656b0ac37ef5e334f3a89b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ca/firefox-50.1.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-i686";
+      sha512 = "bcc4184d882075eb2ea875c7493ca4f276796672a029ab161b4f2168e879b46a6fef454e04e53531a32ed5bf82178d8d2ef15f9e43679625e4f7632e7cf51f32";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cak/firefox-50.1.0.tar.bz2";
+      locale = "cak";
+      arch = "linux-i686";
+      sha512 = "88448d8c17235e318628bed05d607f30ab9db4e05f181a36e39c02f2df840a10990a534d5d5f8e16fdaeecfbf3e51bc7cd9f45b8a84b3447132bb57a87c4e2d3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cs/firefox-50.1.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-i686";
+      sha512 = "acb9fe18d8a5fe97cdeeea24e8a6e56895a3be16c6a5f2099a69c32768e2f76a2c0fd081d3759a2c87d002ea5021dcc5f806195d3bed06e8514c383ee8bf998f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cy/firefox-50.1.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-i686";
+      sha512 = "89119e29496981f8ebc85d512e5d58d8bd3678cc8ea4c90e544bde60881cf5f768b4060d710f8ba4d61dfbd7299a4437f5e7aab1140a03cd498af18c480e0b4b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/da/firefox-50.1.0.tar.bz2";
+      locale = "da";
+      arch = "linux-i686";
+      sha512 = "285363c04cb6506400077f36867a65372fae80ca6b3fbed88be219c3814d3f38a650c78f36014ae205ba9e5167b5291353c799b918c8e2bca6f23374094db209";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/de/firefox-50.1.0.tar.bz2";
+      locale = "de";
+      arch = "linux-i686";
+      sha512 = "ea470ab934f49ff79b8cb04809f5605edb70d3ea9bc997c01802f09e3fbc8d045bb322b97b729916b6371b047f3b4ac14b25dca8e8befea401362c2024a2fa13";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/dsb/firefox-50.1.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-i686";
+      sha512 = "74bb1ab27970819fd9a368ac5f9a14add5378d9a7c39707e12146ae8082f39593ea53b5dd730708764515b0177d7ddb675b04a8a75f259303d30f281b44527cd";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/el/firefox-50.1.0.tar.bz2";
+      locale = "el";
+      arch = "linux-i686";
+      sha512 = "3d3eb83a16c94eaa0bcb8627239b74c0a261189b67b917d4e2fa9ac538ea353a998b691350797470ab8ab4a5effc65a35a36e4b3d372895bd691c63d439a4c9f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-GB/firefox-50.1.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-i686";
+      sha512 = "23a75b31d461ebb0a3960c6235b6c77471f3687e76f154c8d1fc8cce40ba571a9699e19a5310faa55c52b243e6fd88ec76ccbcb93dfa8b3521493805ca852d57";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-US/firefox-50.1.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-i686";
+      sha512 = "b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-ZA/firefox-50.1.0.tar.bz2";
+      locale = "en-ZA";
+      arch = "linux-i686";
+      sha512 = "78238141da05b61b797440a04973187bbfb4d3cff7830385e163e8ccaa603368910be89ee7f2f4e65a47a6917835dff8f840a77a507c3ff0242baaf1b7cfb4f4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/eo/firefox-50.1.0.tar.bz2";
+      locale = "eo";
+      arch = "linux-i686";
+      sha512 = "af424d87210909ad480823d56f20327b0e7879bb0ce7ab43994870a69e6e91b3181e480dcc2610064f276ccfccb71badca135f3d8e00ff16947c220dfe67ee82";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-AR/firefox-50.1.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-i686";
+      sha512 = "cca38288b4ef6de4c7469cdcbd7cc29715993ca69c39febb877691b2368182a0efbb0111b45bb5a7ddf47b7c70f20638bc6dc7d6fcd46f8d8127d36bc29da3e3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-CL/firefox-50.1.0.tar.bz2";
+      locale = "es-CL";
+      arch = "linux-i686";
+      sha512 = "104a3fa6bdf86e0e70c54bfdd8c0d388a8e91a9bae0ef973fc043247907295cc5f53c44f414fe8cd6e2f17a02eae14e366fa8c11ccbb45df2055813b17fd7712";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-ES/firefox-50.1.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-i686";
+      sha512 = "be847e51e78991ac739bc32fb29cc0cc166f12f02b5ada4d4656d3447379eb9cd10f80391433607fb63e971d54a48591d60baa5cb963421f1934033e08525d7a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-MX/firefox-50.1.0.tar.bz2";
+      locale = "es-MX";
+      arch = "linux-i686";
+      sha512 = "7a7464de3223e9cf1cd0f6b7767ea0fb7ee8db0b3b2c3eb9d284cd5ee8db77b9b0ec3c604625c8c6ffffc41bbac4ea47543c1508f7f8aadbaaeb9954b7e62247";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/et/firefox-50.1.0.tar.bz2";
+      locale = "et";
+      arch = "linux-i686";
+      sha512 = "907612ce5691ec5e4647e943ed58d437db872551da8490af3e5f7af44e7d9ac78a8c5eaf721f719af782c8b202aa24ee6a87640e54323b5eb823dbee39b2903b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/eu/firefox-50.1.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-i686";
+      sha512 = "29c76a0f49d87d162749f824e287f2c1b37cab465cdd5e5e991ce429273d492fc905772c25f4c812c6fb899249a9bb7346eefc91af9f642b4acdc70d3af6f338";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fa/firefox-50.1.0.tar.bz2";
+      locale = "fa";
+      arch = "linux-i686";
+      sha512 = "0deec5372d5876861af20a60d8db9d4c5aaef8c133c81bc3af6d85d2de528f96ae1da7f5fc78a9bf34bf06d9121fdb6d74e28ad40ae2b7fc23b4a0c161e09722";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ff/firefox-50.1.0.tar.bz2";
+      locale = "ff";
+      arch = "linux-i686";
+      sha512 = "07c87801154ce44d37b1a477850bf9568651beabb4004d7cfe427c0ecf75fc85da91cffbbd60af773c8b3b7cd30e10937c9ff2fcf65409faf2dd194694d9b6c1";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fi/firefox-50.1.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-i686";
+      sha512 = "310b71c8e46fd7ab3127cfc0743c1d98ede8adbfd01a645089cb6e5752e8ff4e3da9f8f47ab5fd7d06284b3fd76b9780d60c2898d0868e30a76dcebf35c24b05";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fr/firefox-50.1.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-i686";
+      sha512 = "1bc1e595f12d04067b9985be57fe4ec17de89069e4d6b780c16231c4ea195fa0cd8e6daece265335fa56ac3dae9d94c3b76f93199cf1e0946f6d6ac75bd01a1a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fy-NL/firefox-50.1.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-i686";
+      sha512 = "d07b171d615306c6de663f4592450dea92cd7298e6994ea7fb5d55f01f260c2b66d1b4bc4109f44c3d007107c78feccaa6540ddb14dc8666e0192ff3978d8f5f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ga-IE/firefox-50.1.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-i686";
+      sha512 = "1c234083d098c52a7597dd727c246ea6dfc177edd1e4fc021ad5868ce9082353036d78b9297503a5eb14dc8d500a7a2549d771ea2d3c849817ab791329925d25";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gd/firefox-50.1.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-i686";
+      sha512 = "0e88344c58c1b2e63b765949db63ed9e874b23e382f9fe833206cadde1d6c32d804d68a22f17741cc7964773858fa7adb6a6a42e7ed56dad54f2d7d0a71dce08";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gl/firefox-50.1.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-i686";
+      sha512 = "244cf85b95f4a1eed0369f4f41ba870f4a3fd48fd85979b005ffc19ab4c03e52da87ae8687f5e3048c33599baab46fa8ed8274db5b180936076fd63e02b955b2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gn/firefox-50.1.0.tar.bz2";
+      locale = "gn";
+      arch = "linux-i686";
+      sha512 = "20d51aefbc2f98f83fafd23a5800840d1bce7f0688f76d0ef322b2f1dfe44e75fd82c39fef23cc9afb15faa41514f29f8313748a2e969e2051b3824962de6e56";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gu-IN/firefox-50.1.0.tar.bz2";
+      locale = "gu-IN";
+      arch = "linux-i686";
+      sha512 = "b07adecbbf8aaa8dce8e7d8e03b86d5ce3bb97646404433d89d82832e692efeb532df86a5a4276dcf1f63c705507e0d87f3d72440c49e5d70c9a08968f75fbe7";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/he/firefox-50.1.0.tar.bz2";
+      locale = "he";
+      arch = "linux-i686";
+      sha512 = "a6d9a10704ad4097af79ee05aae504a9a6ff109192241cd99c3be665f0adaffa6e5b7b39da859d61d9294cf899a5496ce0c82ac4012a318ad4aa96d6418f380f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hi-IN/firefox-50.1.0.tar.bz2";
+      locale = "hi-IN";
+      arch = "linux-i686";
+      sha512 = "6d78b83b289abf37267b08c72c3b3c42005ddc2f2b13c846012f342b16a3bbf9a891fcd6e24af01160d1749c1b7e76a9f62060970d52144405e4162d4c6297e1";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hr/firefox-50.1.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-i686";
+      sha512 = "e70daf40c8a0885c344a01d1cde03b34af23a2d9c76450f0723cc5ec1b577251dfbb8bfacd3eba866953c5b3dcd2974456305a9e171025cfbd43416f679f1cc4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hsb/firefox-50.1.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-i686";
+      sha512 = "8c137a61cb020dbfb1d73a698d76c4921c9a1dff5f836185caba29c22c81c7c0683cb4139b0642d4bf408e01d498de46022c36de78a3c0413eae048f2be69e72";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hu/firefox-50.1.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-i686";
+      sha512 = "1630ad84eff835e1f56e424000515e37d52a268ce569ea12fe5abb8afde231f2aee2293046ee8aeb338ccd81ec98c92246f4b62e000ece032349eedb2ca3bb82";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hy-AM/firefox-50.1.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-i686";
+      sha512 = "dc2359753972d1eac82bc357461331d69e52bde41736ab5c4bd590491add2b592bd3e4f15f32db94922afee84af04500928ece6be14071b10ad1fc4c8b82314b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/id/firefox-50.1.0.tar.bz2";
+      locale = "id";
+      arch = "linux-i686";
+      sha512 = "61717f0c508b61b874080e21f7cf22283b1d123e2301490af409c710ee612ee8e0e7709f3bee20891c0a76b3b2de05b4ba94885d1b3813e6612a1dd1f871d34c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/is/firefox-50.1.0.tar.bz2";
+      locale = "is";
+      arch = "linux-i686";
+      sha512 = "57d649dd96889b533c336078b4d2380a8417a1f77e40379d51a80518ffe2024a303c2b9c42861436425098cbf2e328264972b82039b9fe13054ae3d33a93e737";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/it/firefox-50.1.0.tar.bz2";
+      locale = "it";
+      arch = "linux-i686";
+      sha512 = "b8bb4e379f4e21bdea2190695b0f74c23b72af5c6149e8790a433c09cbe3ee170fc68a375b71ea112d15eb00b948b6c30466fe382f86e8c5da85ea7479b355ed";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ja/firefox-50.1.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-i686";
+      sha512 = "287d4ba06988e7a6022fead8af2d921fb761222cd0cbaacb7136c44e397b4620a6129f59f97d98d8a992caaf203e7c8fc130aa4e5e9c58b13a2700f63d786497";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/kk/firefox-50.1.0.tar.bz2";
+      locale = "kk";
+      arch = "linux-i686";
+      sha512 = "f96a9b418849234b41d181ad141dbb030a8b2f26e73944694c5a805a21778d708862df988dda8ab8fe28eca0aa342153db84d6af971461f0eb8072590445ac15";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/km/firefox-50.1.0.tar.bz2";
+      locale = "km";
+      arch = "linux-i686";
+      sha512 = "63af9259f4326d4dc356513203646712f26dd992d2150d58c4f1892d76f0a3944063dbfec0db68f67d20538aea3247313357e5a822e0a8507bfad2a7209067d4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/kn/firefox-50.1.0.tar.bz2";
+      locale = "kn";
+      arch = "linux-i686";
+      sha512 = "afa965fd87ca7dcf5217011cf0aa53d89e1656d64cb8ad973a149eed3897eb577bdbe3359a5310bf9e11dc6e927883c08fb7ef069756313dfc75850378ae7820";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ko/firefox-50.1.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-i686";
+      sha512 = "724726e85066350ba9fb0254462b198e198c20970664737c925ca41a474ac4070d2e746b671e8583339fb1935e9a05d6191856f5abaa6e23413efdb707d34d19";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lij/firefox-50.1.0.tar.bz2";
+      locale = "lij";
+      arch = "linux-i686";
+      sha512 = "e17504c60dcf3eea34c9525b3ca537656fabf90a7d888284cd5ac014a939565ba50e8b3d0fd1c936dd5be1ac59ee9f61e2de22b5b1eaeb12fca0f59a094a06eb";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lt/firefox-50.1.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-i686";
+      sha512 = "00689c1e19f748e5676ea3b8ed0076f6a63698c57b171eb771d45e9d9ba5bcf359eeb827f5791c96ca6a31eb9ca166208fc63b4a211676b466656e537323719d";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lv/firefox-50.1.0.tar.bz2";
+      locale = "lv";
+      arch = "linux-i686";
+      sha512 = "1218ec478e28229f0ef8d5a7a669ed6f69722602f75185c4817a9870b35b6955f87f004317bb32cdada379075115c12ad92f73f74818c182a480393961a85bf4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mai/firefox-50.1.0.tar.bz2";
+      locale = "mai";
+      arch = "linux-i686";
+      sha512 = "6fe97505743b8aa14b9bb3be57077c9da14c2049b2d0d455fc2b777b09bc42924f04c781073188fcdb3130bd5d1cba2cbc5c2ebd04fecc7e73ddb8f20f61c716";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mk/firefox-50.1.0.tar.bz2";
+      locale = "mk";
+      arch = "linux-i686";
+      sha512 = "e0bbe68d53a08df8e2ac46b9b51567f69fcd11b03d19b6e84f86ca9f255c0920f89b011df5fd4ff300cb3fda65470fc15ad779757421eea2b3b6db6bc7ae9c1d";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ml/firefox-50.1.0.tar.bz2";
+      locale = "ml";
+      arch = "linux-i686";
+      sha512 = "0e6560b60dc8c0fa309c3a73c1aa3331aec82556e3ee5eec9014d8787c9a5f8311049fc7939ec69569abf689e349be08bce040bfab8bd2ee3ac0042753ce2860";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mr/firefox-50.1.0.tar.bz2";
+      locale = "mr";
+      arch = "linux-i686";
+      sha512 = "cc31171f3ee669fb47dfe4e416c84ed58125b1a4787a92588c3650a2062e4e7fed28f2cc5c784fcf1d804c64fb335c2e16340d46f2d879b73e4465f8c662350a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ms/firefox-50.1.0.tar.bz2";
+      locale = "ms";
+      arch = "linux-i686";
+      sha512 = "12d3bfa0c956b342604a043beefadbe5bff639fbe4b12614832ca36ac11a4046987f3be34dfeb5d3dbb4e9c1d8533645a8d78c3413f9730a72ae952bb07fd703";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nb-NO/firefox-50.1.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-i686";
+      sha512 = "b144e104f01a075bd0d107f77af39664323eed78987ebc78a7a2917b86d83c2d6ff3bb35b6c5230e27c8164246fb32defea91e5b84672e20f5071e0d52456726";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nl/firefox-50.1.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-i686";
+      sha512 = "da466f3dc573096be1d55bdb03f926f0b94ee2ad8e326a3fdc29d519d00f5c0c9166b85c0c8c191d1ca7c992b05b68abff5f33882e52e43be3015a35333be3d8";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nn-NO/firefox-50.1.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-i686";
+      sha512 = "85f83572953a0b54805b22f3a21cea70343092912c3b988f8408ac1df1931dda52a8686c32cdd7c91e776a17af0a390d6394b22fdf46ae1205a01499f390dc5a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/or/firefox-50.1.0.tar.bz2";
+      locale = "or";
+      arch = "linux-i686";
+      sha512 = "1a0b08aa675bfe8b26675f1eac53389f34d02b0c28287d1a73e663ce5d747efd0bc4db5f0f29e3e864c99447e759fdf35ff573235a7ac9b815fe8b749f0a0e88";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pa-IN/firefox-50.1.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-i686";
+      sha512 = "ee9c1c9cc27cd8470cee9a1600951274f9a663e4562cacf7452426c562815f393b726402b1356f9a60095e85278030d64f35cb1fdadd5c8cd11d6917f9c70d60";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pl/firefox-50.1.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-i686";
+      sha512 = "a326d11cb0df567ad13e6d543426c0a28d9158f7d8f0f519b208bddad26145e3eee6350dfb54735cfc05d656ed40b022fa132991a91f1de78eb36ee4f7333fcc";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pt-BR/firefox-50.1.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-i686";
+      sha512 = "cb99dec511614bfdccf43b06e4babd28dbe0dfac464147aadccbf69bdedf3a093e625e4fcdfe0cf8db867b5854ce4c3c5d399a6e9ba932a9fd8574928962360c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pt-PT/firefox-50.1.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-i686";
+      sha512 = "2c4215b8bd5ee9ff78fdfda763c5506fb6a3c7056c9b4494d89f77ff4255c86617f4102f36bf534c0e3ff24ed27ef4a0853d24578bb39ae0a04f741422e6eba3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/rm/firefox-50.1.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-i686";
+      sha512 = "470b3ce93cd25c24c0c9a1581da7a48c101d7a93764423073b1934dbeb5a0fc401150009a622feba1f2f799501fb03e0af79a308c4fef08ac942c5adcaaf0d91";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ro/firefox-50.1.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-i686";
+      sha512 = "7cfaa6b7b2dbe4dadc464591ffbb508e66b724eba76b6fa8e9547ef1092f1aa51f1846e9392a8531c7ba24aedb4ba49e7a2e0c1f41a0b97e6dbacdf1d6c34c75";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ru/firefox-50.1.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-i686";
+      sha512 = "5915a55e881a57797a67d59b4ae9fd95da8bcc4caaa1ad7decb78a6de7a5da7ff35139ff33f7e4ed171615ba9c25ab7df43677a58cecbee530eed25d8a7cc8ca";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/si/firefox-50.1.0.tar.bz2";
+      locale = "si";
+      arch = "linux-i686";
+      sha512 = "a1702939f705a7c2b3b66efdd6dc27a4320ed019dcd62b59da67ef3f078be0afab91ee5158e67cb62691b1a4a002783f807d6133885bd0ac9bb05401268d5f24";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sk/firefox-50.1.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-i686";
+      sha512 = "43b72dd5ebcb1524c5b633cbfb73eed21aaf466227f29f4ffdd93f1c49dcc2295a38b57b3ce072c40da72184e1fb954a9097ea6d6d6df6807dfc5d04ff48b327";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sl/firefox-50.1.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-i686";
+      sha512 = "24840e76f00d6a07de581d06050f924018ae2613a6e4cba993073859dd05007b6c97a7d518a6c4b111740945357621c7325c4cd7f45adddceea270e08c1a09c3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/son/firefox-50.1.0.tar.bz2";
+      locale = "son";
+      arch = "linux-i686";
+      sha512 = "004f8732e194d9c1972390d0ce0d04f9e8f91583676fa5d65bcfb1ee58a6b52db5176ce8a281a3ac94391b43aa637ed157128950e589a0f0a354622da6f04132";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sq/firefox-50.1.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-i686";
+      sha512 = "3dead0e008b4255585d22dacb6fa0aec125da6581b7ef4b1ccc6697e03a5afacd14d340bd8eb7bc0b38478bc6ca20f09364e9180313ceedf1853739ee181d125";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sr/firefox-50.1.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-i686";
+      sha512 = "cdbf5fa9d085829828f5a395114c3efae9b82e77e34aa69b622e611de8aaf54c525ad12ca445190ba5cc9c22d979be902e4f1f6e6a746b5f97570326cd90009b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sv-SE/firefox-50.1.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-i686";
+      sha512 = "ef8a625973d0286799e2a9ea3a5a10078d912a65521be8f935ec6eb207ba53942ec5d0e0c4c5c013ea2705307dafda12294fdf708dca35f72d5ba3eb48733238";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ta/firefox-50.1.0.tar.bz2";
+      locale = "ta";
+      arch = "linux-i686";
+      sha512 = "64652e5c68680f1ab15bdb5ec6487387789bd4b1a1537daa215094e57156fd4a1272311d8084435994151aff5e7ddffb16b93c2048989d9c2dc455f98d072b06";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/te/firefox-50.1.0.tar.bz2";
+      locale = "te";
+      arch = "linux-i686";
+      sha512 = "e516ee1f536dd98ab95a9a621cf4634f1ac70a3b5952cd8c6498890536b1630b362ebda8e69577eda4c0a6224f1a9cbf19453e5709dbca467e37597016eb5fe3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/th/firefox-50.1.0.tar.bz2";
+      locale = "th";
+      arch = "linux-i686";
+      sha512 = "0b9ae06d78e94d6f9ee5861dc911eca02f39671d8f13f2119323ed7dc394dffbe99f2d23dd3eba955d46f7d4b9775cd9fc3311337d4339748c178aa67d7467eb";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/tr/firefox-50.1.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-i686";
+      sha512 = "31be512e591504d3e8a776933f0926ae54a7797fa037e53a4627b1bb39ed61e4689cafee7d84dfb6b930ee2e4a84df158a97c1c5b201a3a8ea112e2910e65846";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/uk/firefox-50.1.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-i686";
+      sha512 = "19614a4999f5c7509a3c0b1c6bb2bc3d9f408ff6727bcf9bf93bf91a59ec8d3c04206719fe2aa2319a0e62687df871bfa2fe67117219398e19aa5a6e0782c15c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/uz/firefox-50.1.0.tar.bz2";
+      locale = "uz";
+      arch = "linux-i686";
+      sha512 = "22bb3b4a3a5a98ad8da002a220dd2779a46fd50a3d0ff41bec8312186ae34543da44fc49518fee160aa4b48176a0d3ba0dd0c4853fea9befc66911684b83ddb1";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/vi/firefox-50.1.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-i686";
+      sha512 = "99140a71208a7912dc8b9fd3bd7f5454a0b032dee4d903304dfd14aa9abec0722fdcc6624f3c0a1c6e753bc6ab6ea512d6f8c55b5482069ed6c65d5579f562e0";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/xh/firefox-50.1.0.tar.bz2";
+      locale = "xh";
+      arch = "linux-i686";
+      sha512 = "440573a5e364ecd59121b30f664ed23bd2fa80945562d1e5cc04303f12dfff23c96ef53ce07cf689d247a5120b9d7679533ccb6e17c27b29898154f0fc9fc581";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/zh-CN/firefox-50.1.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-i686";
+      sha512 = "4a2f5550c130d0992408d328afa3dbd37f80e5b63c2b33c095ab74e397ea394cb33f87214f1b0d3650c60450738fe3eca636ed51ca1c4e5dce9b58e0f09c30f6";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/zh-TW/firefox-50.1.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-i686";
+      sha512 = "6417da7af1792f241c8d57dd5bb05dac974db2b73a6274fe3159037bcf8ae8a23b3f1849f5b42a0bfc09f1dcbf949bcaa8b1e9cc633fd3726c12cde7e3cf542f";
+    }
+    ];
 }

From 8faa589a904043bb256b69fc917619bd05ea7b35 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 13 Dec 2016 17:53:43 -0600
Subject: [PATCH 152/295] kde5.frameworks: 5.28 -> 5.29

---
 .../libraries/kde-frameworks/default.nix      |   1 +
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../kde-frameworks/frameworkintegration.nix   |   6 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |   4 +-
 .../kde-frameworks/plasma-framework.nix       |   4 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 .../kde-frameworks/syntax-highlighting.nix    |   9 +
 7 files changed, 318 insertions(+), 300 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 397d59f8b24..936a3953a51 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -139,6 +139,7 @@ let
     plasma-framework = callPackage ./plasma-framework.nix {};
     solid = callPackage ./solid.nix {};
     sonnet = callPackage ./sonnet.nix {};
+    syntax-highlighting = callPackage ./syntax-highlighting.nix {};
     threadweaver = callPackage ./threadweaver.nix {};
   };
 
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 20d63af5126..5ca0631730b 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.28/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 0a782ae177d..161ce52d4f2 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, ecm, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage
 , kwidgetsaddons, libXcursor, qtx11extras
 }:
 
@@ -8,7 +8,7 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
-    kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
-    kiconthemes kwidgetsaddons libXcursor qtx11extras
+    kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
+    knotifications kpackage kwidgetsaddons libXcursor qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 8cd7e95b659..0e444cc8db6 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -3,7 +3,7 @@
 , karchive, kconfig, kguiaddons, kiconthemes, kparts
 , libgit2
 , qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
+, ki18n, kio, sonnet, syntax-highlighting
 }:
 
 kdeFramework {
@@ -12,6 +12,6 @@ kdeFramework {
   nativeBuildInputs = [ ecm perl ];
   propagatedBuildInputs = [
     karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
-    qtxmlpatterns sonnet
+    qtxmlpatterns sonnet syntax-highlighting
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 389b7fc452b..963e9322727 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,7 +1,7 @@
 { kdeFramework, lib, fetchurl, ecm, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
+, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
 , qtscript, qtx11extras
 }:
 
@@ -12,6 +12,6 @@ kdeFramework {
   propagatedBuildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
-    kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras
+    kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index eebba2d6a8c..e8ecb3d058f 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,587 +3,595 @@
 
 {
   attica = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/attica-5.28.0.tar.xz";
-      sha256 = "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks";
-      name = "attica-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/attica-5.29.0.tar.xz";
+      sha256 = "1xiaqqq77w0hxr79rpixvy5kak2xgxwi5860qf3bbpz89bpyi5d1";
+      name = "attica-5.29.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/baloo-5.28.0.tar.xz";
-      sha256 = "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5";
-      name = "baloo-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/baloo-5.29.0.tar.xz";
+      sha256 = "06zq0nnqm8qs4dx548l952i5hi6yazi4c3kb75d0k6jvjsfhgh3n";
+      name = "baloo-5.29.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/bluez-qt-5.28.0.tar.xz";
-      sha256 = "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9";
-      name = "bluez-qt-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/bluez-qt-5.29.0.tar.xz";
+      sha256 = "15rnh8vnmxrq6phvk3g7x69pvsblhrr91z4ldd8x4q895dpwk3vg";
+      name = "bluez-qt-5.29.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/breeze-icons-5.28.0.tar.xz";
-      sha256 = "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2";
-      name = "breeze-icons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/breeze-icons-5.29.0.tar.xz";
+      sha256 = "1bpvpza0hm3krr4b6pp9aakmjs4vnmk2bbl9zirzsj7rg2nnrb8b";
+      name = "breeze-icons-5.29.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/extra-cmake-modules-5.28.0.tar.xz";
-      sha256 = "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h";
-      name = "extra-cmake-modules-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz";
+      sha256 = "1n4q1s9q3gnxp050s0kddabbhgl0rfxrpsmfci5vsd92dri6xxs8";
+      name = "extra-cmake-modules-5.29.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/frameworkintegration-5.28.0.tar.xz";
-      sha256 = "1bcjryngmmyransd5y3zd5ygri13fyy6z7piz3ai9lqmcdbwf7qn";
-      name = "frameworkintegration-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/frameworkintegration-5.29.0.tar.xz";
+      sha256 = "0ljsrz1yyj09k00q0xx0zps3wi6wrmkqvxrc81kw0qv14d5rxf7b";
+      name = "frameworkintegration-5.29.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kactivities-5.28.0.tar.xz";
-      sha256 = "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb";
-      name = "kactivities-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kactivities-5.29.0.tar.xz";
+      sha256 = "1mnpqwz6rfv07fmpdccp2fxxf0pdjp2b8jamjfn51zk4krz0vjrr";
+      name = "kactivities-5.29.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kactivities-stats-5.28.0.tar.xz";
-      sha256 = "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v";
-      name = "kactivities-stats-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kactivities-stats-5.29.0.tar.xz";
+      sha256 = "16cxmp9pzmcap722fclx8xjap56ldslghcn8qj0n8ds5crcd6h80";
+      name = "kactivities-stats-5.29.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kapidox-5.28.0.tar.xz";
-      sha256 = "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq";
-      name = "kapidox-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kapidox-5.29.0.tar.xz";
+      sha256 = "184jjm3kyb1m1mdqac8h37g4cibni86zan4d52ac00mz7lmibmhp";
+      name = "kapidox-5.29.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/karchive-5.28.0.tar.xz";
-      sha256 = "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7";
-      name = "karchive-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/karchive-5.29.0.tar.xz";
+      sha256 = "11i9kj890n2y4mgs3vykfg0r5iva4g3ydk3ywbkcmvryd2hvp4ch";
+      name = "karchive-5.29.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kauth-5.28.0.tar.xz";
-      sha256 = "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40";
-      name = "kauth-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kauth-5.29.0.tar.xz";
+      sha256 = "0789q90sk4203x94y508sd03zzd7pll9yg480kbfavqr8bxivigj";
+      name = "kauth-5.29.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kbookmarks-5.28.0.tar.xz";
-      sha256 = "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65";
-      name = "kbookmarks-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kbookmarks-5.29.0.tar.xz";
+      sha256 = "1ipziszcf7hddzi0kd41ddz56m79dy6jz325k37byzmc4xj15abi";
+      name = "kbookmarks-5.29.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kcmutils-5.28.0.tar.xz";
-      sha256 = "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa";
-      name = "kcmutils-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kcmutils-5.29.0.tar.xz";
+      sha256 = "1winmnr1pdspj3i3qwlblqsppb641yj3bcvl50xy8gh47w1n39q2";
+      name = "kcmutils-5.29.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kcodecs-5.28.0.tar.xz";
-      sha256 = "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3";
-      name = "kcodecs-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kcodecs-5.29.0.tar.xz";
+      sha256 = "0ki9aws9kfhcchp8qwl696qwcgz4a2z4w1f9rarl7hblhlly0mx7";
+      name = "kcodecs-5.29.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kcompletion-5.28.0.tar.xz";
-      sha256 = "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f";
-      name = "kcompletion-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kcompletion-5.29.0.tar.xz";
+      sha256 = "1h2yd5gsb24h7k41fcmmbg96i4k3rmqc5pgp6vnb7m767mlcy6kb";
+      name = "kcompletion-5.29.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kconfig-5.28.0.tar.xz";
-      sha256 = "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy";
-      name = "kconfig-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kconfig-5.29.0.tar.xz";
+      sha256 = "0izss1hz41pbmfsxa8xlj5f6hx4r5jjpapp1km9926yy104jxhfn";
+      name = "kconfig-5.29.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kconfigwidgets-5.28.0.tar.xz";
-      sha256 = "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d";
-      name = "kconfigwidgets-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz";
+      sha256 = "0xay4kfz3cfhs82h0qp707qflb4vxrar7sh7b7wwkp4s0yhq15fa";
+      name = "kconfigwidgets-5.29.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kcoreaddons-5.28.0.tar.xz";
-      sha256 = "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb";
-      name = "kcoreaddons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kcoreaddons-5.29.0.tar.xz";
+      sha256 = "1xmk9hqrzfn7bix9ch5v7nrl7ff16z1pmz3rghyb06cvvbx3k2z2";
+      name = "kcoreaddons-5.29.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kcrash-5.28.0.tar.xz";
-      sha256 = "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv";
-      name = "kcrash-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kcrash-5.29.0.tar.xz";
+      sha256 = "097294n52ac2mh55i8cwvx75rfgr12kvpf5zszha97whn0hm9nrv";
+      name = "kcrash-5.29.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdbusaddons-5.28.0.tar.xz";
-      sha256 = "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8";
-      name = "kdbusaddons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdbusaddons-5.29.0.tar.xz";
+      sha256 = "15is9d0kmcwd7qy8annf2y1bqwq3vwcrlqym1pjsifyc5n226b0j";
+      name = "kdbusaddons-5.29.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdeclarative-5.28.0.tar.xz";
-      sha256 = "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn";
-      name = "kdeclarative-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdeclarative-5.29.0.tar.xz";
+      sha256 = "0ki58bd97a7vw90989msxy9npgha6652qhydn8ks0x8gxd9zwcq3";
+      name = "kdeclarative-5.29.0.tar.xz";
     };
   };
   kded = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kded-5.28.0.tar.xz";
-      sha256 = "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5";
-      name = "kded-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kded-5.29.0.tar.xz";
+      sha256 = "092j7a7jm0h4lc0yphy5z6mg3r29fxjvghajcdla5vfqha33j8pb";
+      name = "kded-5.29.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/kdelibs4support-5.28.0.tar.xz";
-      sha256 = "1l6r2812173p8svazq7sam8c2pgh83hdwf35hv3qn7qw30dpg8jl";
-      name = "kdelibs4support-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz";
+      sha256 = "1wiilwgyk3rdxha076mz2wpwmpgaprv7j0c8bzk2qqmxph5n9hz1";
+      name = "kdelibs4support-5.29.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdesignerplugin-5.28.0.tar.xz";
-      sha256 = "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3";
-      name = "kdesignerplugin-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz";
+      sha256 = "01x8i7rm0c71cql57s7ikwdb03n1i0hkhgf88w24dzwnv7b6l2yg";
+      name = "kdesignerplugin-5.29.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdesu-5.28.0.tar.xz";
-      sha256 = "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp";
-      name = "kdesu-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdesu-5.29.0.tar.xz";
+      sha256 = "1lkxfss8i641k09h4b5qcf7xiybskfrp8z1zzllcmjfaqfcwwk45";
+      name = "kdesu-5.29.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdewebkit-5.28.0.tar.xz";
-      sha256 = "19nq6dghnxdzq6xbry283gijsvnzpgp4sl5l3b6xi9n1iq4f91w9";
-      name = "kdewebkit-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdewebkit-5.29.0.tar.xz";
+      sha256 = "0xg41ij5in3n08np65wgf5h4qwy4p7y8nlrcn4qakiincif7xqs0";
+      name = "kdewebkit-5.29.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdnssd-5.28.0.tar.xz";
-      sha256 = "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r";
-      name = "kdnssd-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdnssd-5.29.0.tar.xz";
+      sha256 = "1bg3z5ng43iy2v081n5ma8lk9qnhks2m95hmfn82wc19jb5lgvja";
+      name = "kdnssd-5.29.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kdoctools-5.28.0.tar.xz";
-      sha256 = "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c";
-      name = "kdoctools-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kdoctools-5.29.0.tar.xz";
+      sha256 = "0zd3zc42avw4ml0i4ayvzif1s0lrg5770q8hvi7m2ycxip2xrfk0";
+      name = "kdoctools-5.29.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kemoticons-5.28.0.tar.xz";
-      sha256 = "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv";
-      name = "kemoticons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kemoticons-5.29.0.tar.xz";
+      sha256 = "0xxm4haxkyqb3sbifbp9k58vb9n79y8h3c5xfxwc3y7xiwbswaba";
+      name = "kemoticons-5.29.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kfilemetadata-5.28.0.tar.xz";
-      sha256 = "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6";
-      name = "kfilemetadata-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kfilemetadata-5.29.0.tar.xz";
+      sha256 = "1hliggn5h3mi81hz6d4flrv5d25bqbih6xq6miysrr7ws5vg07c2";
+      name = "kfilemetadata-5.29.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kglobalaccel-5.28.0.tar.xz";
-      sha256 = "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc";
-      name = "kglobalaccel-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kglobalaccel-5.29.0.tar.xz";
+      sha256 = "0wsmnwxnmcgi7rnkvh4vfcvv9pwq1kcd98j5l6h9xwbirz247caz";
+      name = "kglobalaccel-5.29.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kguiaddons-5.28.0.tar.xz";
-      sha256 = "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f";
-      name = "kguiaddons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kguiaddons-5.29.0.tar.xz";
+      sha256 = "1cgq04k66xzmawqrgh2xhyl1dmylkcfsf1mgbilanq46niv6v47k";
+      name = "kguiaddons-5.29.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/khtml-5.28.0.tar.xz";
-      sha256 = "17dgxicfbpik65m2bjc07qnp2s54wj4zx4czci7v9chfy23d52sb";
-      name = "khtml-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz";
+      sha256 = "1rrhpx5ny868nhd2z52zf4n2kybxv8lciyi3wla0k87gwcdm3ryv";
+      name = "khtml-5.29.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/ki18n-5.28.0.tar.xz";
-      sha256 = "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw";
-      name = "ki18n-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/ki18n-5.29.0.tar.xz";
+      sha256 = "0w4nqyqi9p92vfi5b07s9k8hjmkj2qdclnyclsdy7lshkxsqfbm7";
+      name = "ki18n-5.29.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kiconthemes-5.28.0.tar.xz";
-      sha256 = "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc";
-      name = "kiconthemes-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kiconthemes-5.29.0.tar.xz";
+      sha256 = "09dj6v7mvmhbkax35884g729ikfdvazvnhz327vgsb3ybbmx475h";
+      name = "kiconthemes-5.29.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kidletime-5.28.0.tar.xz";
-      sha256 = "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7";
-      name = "kidletime-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kidletime-5.29.0.tar.xz";
+      sha256 = "0nnrgi38jn5r2gvmsg3425y1k53g5n5bzbhcf71d484d00740rix";
+      name = "kidletime-5.29.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kimageformats-5.28.0.tar.xz";
-      sha256 = "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra";
-      name = "kimageformats-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kimageformats-5.29.0.tar.xz";
+      sha256 = "0385al48zdnpv2d2g59ls8y8fljlfyflpvrladxcqr75ywsap7xa";
+      name = "kimageformats-5.29.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kinit-5.28.0.tar.xz";
-      sha256 = "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912";
-      name = "kinit-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kinit-5.29.0.tar.xz";
+      sha256 = "0cqh8dljgr72zny4hhypc4j7mc6lrplbdvw262vszq5hqn25dn6n";
+      name = "kinit-5.29.0.tar.xz";
     };
   };
   kio = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kio-5.28.0.tar.xz";
-      sha256 = "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia";
-      name = "kio-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kio-5.29.0.tar.xz";
+      sha256 = "0sswjmbjnfi7sh6j3qzc98jkpp3bwgmfmvg61r484sj65900xkjj";
+      name = "kio-5.29.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kitemmodels-5.28.0.tar.xz";
-      sha256 = "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z";
-      name = "kitemmodels-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kitemmodels-5.29.0.tar.xz";
+      sha256 = "1ss291hkvyhkzm5v1klrbhkkvw0f35acdf7q2x04ggs06cvryxw3";
+      name = "kitemmodels-5.29.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kitemviews-5.28.0.tar.xz";
-      sha256 = "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p";
-      name = "kitemviews-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kitemviews-5.29.0.tar.xz";
+      sha256 = "1872rynqi9pgc0670vhxa5n7r63arh4q1g62sw76xp5s0kzgxpvh";
+      name = "kitemviews-5.29.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kjobwidgets-5.28.0.tar.xz";
-      sha256 = "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a";
-      name = "kjobwidgets-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kjobwidgets-5.29.0.tar.xz";
+      sha256 = "0sim3sxz02sg9y1vlp9d5xxby9anx2s10z80iys2mbhw1hw1ivn8";
+      name = "kjobwidgets-5.29.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/kjs-5.28.0.tar.xz";
-      sha256 = "0w6zijdk4rabsda9msp5dd2kgg8xrh000chmx17xjqa661bgsfql";
-      name = "kjs-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz";
+      sha256 = "196lnlynnc4kf7hy2zw2dyba5h1mn6l5d1000h50g62fbg8xwh7k";
+      name = "kjs-5.29.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/kjsembed-5.28.0.tar.xz";
-      sha256 = "0mgcdpmk7sprxk58c63b9c5maz9pyi4b77332ci4ixz9pi94899j";
-      name = "kjsembed-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz";
+      sha256 = "1g5ppari446fa4ybjgj5j63fz4grj341019w2s4dqyp05l5sf197";
+      name = "kjsembed-5.29.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/kmediaplayer-5.28.0.tar.xz";
-      sha256 = "139fbhqdhg2pgqadfbig27cnh2p9bds50c0nc9b6pnrwlirl7sm2";
-      name = "kmediaplayer-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz";
+      sha256 = "0hs6vy28c0f41c8s0ip5ggy96rhrf3p3kb1d69v8z9yi1jd9jhaw";
+      name = "kmediaplayer-5.29.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/knewstuff-5.28.0.tar.xz";
-      sha256 = "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3";
-      name = "knewstuff-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/knewstuff-5.29.0.tar.xz";
+      sha256 = "1cfkppd1p40lbadrj34lh7msix0bpqmnnc1xwh2wx35va58phrc1";
+      name = "knewstuff-5.29.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/knotifications-5.28.0.tar.xz";
-      sha256 = "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s";
-      name = "knotifications-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/knotifications-5.29.0.tar.xz";
+      sha256 = "0bb6s72p78wiq172fx5f07c55zvd3rackgh1fcgkzg84lnvzx938";
+      name = "knotifications-5.29.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/knotifyconfig-5.28.0.tar.xz";
-      sha256 = "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f";
-      name = "knotifyconfig-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/knotifyconfig-5.29.0.tar.xz";
+      sha256 = "1kab22gfb12bc2dl87m13crcrwhf8djdr8cmwrykjdm1ln2a1d4w";
+      name = "knotifyconfig-5.29.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.28.1";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kpackage-5.28.1.tar.xz";
-      sha256 = "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp";
-      name = "kpackage-5.28.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.0.tar.xz";
+      sha256 = "1hgzwfb0yxd6n8dc8hrkdsrf21s2xzrka69mhzq0giskpbd2m8fs";
+      name = "kpackage-5.29.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kparts-5.28.0.tar.xz";
-      sha256 = "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik";
-      name = "kparts-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kparts-5.29.0.tar.xz";
+      sha256 = "0arpaz5qdswyj47z9craijsf4zafh50bw8vvklg1jc385bbgxhv1";
+      name = "kparts-5.29.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kpeople-5.28.0.tar.xz";
-      sha256 = "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp";
-      name = "kpeople-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kpeople-5.29.0.tar.xz";
+      sha256 = "19sb0j5qbi299f752z589cbbh3rjxkzm074v3rj9sqgah1hdssg8";
+      name = "kpeople-5.29.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kplotting-5.28.0.tar.xz";
-      sha256 = "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2";
-      name = "kplotting-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kplotting-5.29.0.tar.xz";
+      sha256 = "07yz1f5ifjvxsaphbyvbvqzvmc1w6rkb9fh8xglf8z9p9drz23qb";
+      name = "kplotting-5.29.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kpty-5.28.0.tar.xz";
-      sha256 = "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn";
-      name = "kpty-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kpty-5.29.0.tar.xz";
+      sha256 = "08b8qg35g9g4rkfn6zwv2kggh6y5wlg33zbj28n1idszq6qpgh7i";
+      name = "kpty-5.29.0.tar.xz";
     };
   };
   kross = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/portingAids/kross-5.28.0.tar.xz";
-      sha256 = "06qx87v090d5wxbpqj2sgwhpha7gqmamdx4zffdvc0xa6g1mm6x4";
-      name = "kross-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/portingAids/kross-5.29.0.tar.xz";
+      sha256 = "1q6pm6iv3896y1sj7b8p7agjlzfi9f5qmpbadk499d0rn9c6520v";
+      name = "kross-5.29.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/krunner-5.28.0.tar.xz";
-      sha256 = "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9";
-      name = "krunner-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/krunner-5.29.0.tar.xz";
+      sha256 = "1kjzl239a136p6zpkgj570s5i649hzwrgylq213jh31h251a93qx";
+      name = "krunner-5.29.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kservice-5.28.0.tar.xz";
-      sha256 = "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l";
-      name = "kservice-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kservice-5.29.0.tar.xz";
+      sha256 = "0440hgcwm8p421y8xrlill9n2bzfrr0v8ln7pcm45b09bwsgz5l7";
+      name = "kservice-5.29.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/ktexteditor-5.28.0.tar.xz";
-      sha256 = "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq";
-      name = "ktexteditor-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/ktexteditor-5.29.0.tar.xz";
+      sha256 = "19krz968bxyv9r43gw1nh7fkkfsgsidhg2k9z0p7cplm6asqvdas";
+      name = "ktexteditor-5.29.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/ktextwidgets-5.28.0.tar.xz";
-      sha256 = "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp";
-      name = "ktextwidgets-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/ktextwidgets-5.29.0.tar.xz";
+      sha256 = "11iwcak2r12wxbkj8i7pg3g1cnymmgh8lvkpbsszkmyisqbyrz27";
+      name = "ktextwidgets-5.29.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kunitconversion-5.28.0.tar.xz";
-      sha256 = "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q";
-      name = "kunitconversion-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kunitconversion-5.29.0.tar.xz";
+      sha256 = "1vzmx3wiphi88xc5dh69vj5jdmz0pxzbiiqiqyi38a1nkq7a9pv7";
+      name = "kunitconversion-5.29.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kwallet-5.28.0.tar.xz";
-      sha256 = "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm";
-      name = "kwallet-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kwallet-5.29.0.tar.xz";
+      sha256 = "15jcn8zg7bz2vn6kwxvj0b6k9kpnx48zrcfa2ibb1rjp71cxgwc1";
+      name = "kwallet-5.29.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kwayland-5.28.0.tar.xz";
-      sha256 = "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k";
-      name = "kwayland-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kwayland-5.29.0.tar.xz";
+      sha256 = "0mz9v7g91im2xwdh5f4ym8z52ylva7kyr0hxl5p88b7y6azxqmz9";
+      name = "kwayland-5.29.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kwidgetsaddons-5.28.0.tar.xz";
-      sha256 = "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn";
-      name = "kwidgetsaddons-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz";
+      sha256 = "19hvs3jqmj0jwsjszq6fn7m6d5d80bsd5wz4x8m39w1nmsgj032d";
+      name = "kwidgetsaddons-5.29.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kwindowsystem-5.28.0.tar.xz";
-      sha256 = "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i";
-      name = "kwindowsystem-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kwindowsystem-5.29.0.tar.xz";
+      sha256 = "19bzirhkjqn41f9n540wnhrc0y5qvxcbgi87np9ijc3mpkzfn7in";
+      name = "kwindowsystem-5.29.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kxmlgui-5.28.0.tar.xz";
-      sha256 = "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac";
-      name = "kxmlgui-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kxmlgui-5.29.0.tar.xz";
+      sha256 = "1h85hiy58jl25r7d9z43kkybfvd2hjk5l4nmcy9jw5lrmmgnrgq0";
+      name = "kxmlgui-5.29.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/kxmlrpcclient-5.28.0.tar.xz";
-      sha256 = "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1";
-      name = "kxmlrpcclient-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz";
+      sha256 = "09rw4id0lg5j4ql46vj2pvwnjcn5nk40s0bl03z8jkqygg8w57b2";
+      name = "kxmlrpcclient-5.29.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/modemmanager-qt-5.28.0.tar.xz";
-      sha256 = "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq";
-      name = "modemmanager-qt-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz";
+      sha256 = "08imlqr8xxah58gcyqv968gbmamf2xkjg31cs32h79yqcddjpvrd";
+      name = "modemmanager-qt-5.29.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/networkmanager-qt-5.28.0.tar.xz";
-      sha256 = "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602";
-      name = "networkmanager-qt-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz";
+      sha256 = "0km2yv0gpl584n6vh27d0q0lrrmc79hpcfxwihwk6g5rrlv5qnba";
+      name = "networkmanager-qt-5.29.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/oxygen-icons5-5.28.0.tar.xz";
-      sha256 = "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp";
-      name = "oxygen-icons5-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz";
+      sha256 = "1j9jxlfzndzimvk0zvk5nqqnic5bj04yg4a0v9kqlmr8l1mj4g4k";
+      name = "oxygen-icons5-5.29.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/plasma-framework-5.28.0.tar.xz";
-      sha256 = "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q";
-      name = "plasma-framework-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/plasma-framework-5.29.0.tar.xz";
+      sha256 = "1c341i5gvm65mk8dhwn61fmw0hc1npvj3mcwz0gy1ynkgch6afrh";
+      name = "plasma-framework-5.29.0.tar.xz";
+    };
+  };
+  prison = {
+    version = "5.29.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.29/prison-5.29.0.tar.xz";
+      sha256 = "0hc7gk1xxhk5s6fk6rm822kpbr2k0kc40xpjg07gpglbvnxdbr7l";
+      name = "prison-5.29.0.tar.xz";
     };
   };
   solid = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/solid-5.28.0.tar.xz";
-      sha256 = "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy";
-      name = "solid-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/solid-5.29.0.tar.xz";
+      sha256 = "01y9fqar113bjh5l8mh03xwgv1j88ivnb1rxjcpgilv63qx2cw9k";
+      name = "solid-5.29.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/sonnet-5.28.0.tar.xz";
-      sha256 = "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8";
-      name = "sonnet-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/sonnet-5.29.0.tar.xz";
+      sha256 = "0rb9fslf6y694cwbng198r21nrid07gzirn3c11g91skskh8sd90";
+      name = "sonnet-5.29.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/syntax-highlighting-5.28.0.tar.xz";
-      sha256 = "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy";
-      name = "syntax-highlighting-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz";
+      sha256 = "0fbqkj3qsai3m322d2qmvh93h35sx7wdc28jxp8v8yddl59a1k6b";
+      name = "syntax-highlighting-5.29.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.28.0";
+    version = "5.29.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.28/threadweaver-5.28.0.tar.xz";
-      sha256 = "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5";
-      name = "threadweaver-5.28.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/threadweaver-5.29.0.tar.xz";
+      sha256 = "0sl9r6dz4l63f40a15kzsgqrsvdaxnm1rqkj61za8cbdbk2q42g6";
+      name = "threadweaver-5.29.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
new file mode 100644
index 00000000000..24b1bbc4f67
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -0,0 +1,9 @@
+{ kdeFramework, lib
+, ecm, perl
+}:
+
+kdeFramework {
+  name = "syntax-highlighting";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ ecm perl ];
+}

From 8e7ea1795a4cb5879f3d678004115d1a50f1b555 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Dec 2016 08:53:49 +0900
Subject: [PATCH 153/295] firefox-bin: fix updateScript

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 219f208af71..c640266539a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -223,7 +223,7 @@ stdenv.mkDerivation {
                        tr " " ":"`; do
             # create an entry for every locale
             cat >> $tmpfile <<EOF
-            { url = "$url$version/$arch/`echo $line | cut -d":" -f3`";
+            { url = "$url$version/`echo $line | cut -d":" -f3`";
               locale = "`echo $line | cut -d":" -f3 | sed "s/$arch\///" | sed "s/\/.*//"`";
               arch = "$arch";
               sha512 = "`echo $line | cut -d":" -f1`";

From 86cf682cda6c3fc6bfbf783d20d93b75773ec1b1 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Dec 2016 09:03:56 +0900
Subject: [PATCH 154/295] firefox: 50.0.2 -> 50.1.0, firefox-esr: 45.5.1esr ->
 45.6.0esr

---
 pkgs/applications/networking/browsers/firefox/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 6000f260231..a170b7fbab8 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -147,14 +147,14 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "50.0.2";
-    sha512 = "cfcc3e5a703e4d3284e3b3dcb34e5f77825e5a98b49a75bf22f8ac431c0429e6cd21c4e1f5e046fe82899cb4d2bc5b7a432b306c4af35034d83a9f351393f7fd";
+    version = "50.1.0";
+    sha512 = "2jwpk3aymkcq9f4xhzc31sb1c90vy3dvyqq2hvw97vk9dw7rgvv2cki10ns5cshbc4k57yd3j8nm7ppy2kw6na6771mj6sbijdjw39p";
   };
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "45.5.1esr";
-    sha512 = "36c56e1486a6a35f71526bd81d01fb4fc2b9df852eb2feb39b77c902fcf90d713d8fcdcd6113978630345e1ed36fa5cf0df6da7b6bf7e85a84fe014cb11f9a03";
+    version = "45.6.0esr";
+    sha512 = "086ci461hmz6kdn0ly9dlc723gc117si4a11a1c51gh79hczhahdaxg5s4r3k59rb43gpwxrlvm4wx1aka36bsihnh8a4caxnp72v5r";
   };
 
 }

From 7d134fc8368a66824a440c8f97435401d7141c75 Mon Sep 17 00:00:00 2001
From: Leonardo Taglialegne <cmt.miniBill@gmail.com>
Date: Wed, 14 Dec 2016 01:05:14 +0100
Subject: [PATCH 155/295] Fix typo in configuration-hackage2nix.yaml (#21129)

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 265edae2157..24c9c50e850 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -33,7 +33,7 @@ core-packages:
 
   # Hack: The following package is a core package of GHCJS. If we don't declare
   # it, then hackage2nix will generate a Hackage database where all dependants
-  # if this library are maked as "broken".
+  # of this library are maked as "broken".
   - ghcjs-base-0
 
 default-package-overrides:

From 96be6a11a85e9e253cf733e57ce7c67fd1a3b81c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Dec 2016 02:54:13 +0100
Subject: [PATCH 156/295] torbrowser: support H.264 playback

Fixes https://github.com/NixOS/nixpkgs/issues/20840

Some notes for future reference:
- Firefox only supports legacy gstreamer (0.10)
- gmp and ffmpeg are appearantly used by gst-ffmpeg so must be in the
  library search path
- Setting GST_DEBUG="*:3" or so was useful in figuring out what to add
---
 pkgs/tools/security/tor/torbrowser.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index d0484b251a4..0368d9d7a0b 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,13 +1,20 @@
 { stdenv, fetchurl, makeDesktopItem
 , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
+, gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg
 }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
     fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
+    gstreamer gst_plugins_base gmp ffmpeg
   ];
+
+  gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ];
+
+  gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
+    "${x}/lib/gstreamer-0.10") gstPlugins;
 in
 
 stdenv.mkDerivation rec {
@@ -66,6 +73,7 @@ stdenv.mkDerivation rec {
     fi
     export FONTCONFIG_PATH=\$HOME/Data/fontconfig
     export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
+    export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
     exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
     EOF
     chmod +x $out/bin/tor-browser

From 22211307104f10ab788c4c3afee7aa81a82239de Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Dec 2016 03:09:44 +0100
Subject: [PATCH 157/295] torbrowser: support pulseaudio playback

---
 pkgs/tools/security/tor/torbrowser.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 0368d9d7a0b..6354d3c538e 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -2,6 +2,7 @@
 , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
 , gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg
+, libpulseaudio
 }:
 
 let
@@ -9,7 +10,8 @@ let
     stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
     fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
     gstreamer gst_plugins_base gmp ffmpeg
-  ];
+    libpulseaudio
+  ] ;
 
   gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ];
 

From 05fb82732c97582ecf0a35ed81111ab5d1c088d4 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 13 Dec 2016 21:23:16 -0500
Subject: [PATCH 158/295] use symlink to ensure cupsd.conf PATH always points
 to a valid store path

even if cups rewrites its config file due to config changes made through
its web-based management UI, we need to keep the PATH pointing to
currently-live nix store directories.  fixes #20806.
---
 nixos/modules/services/printing/cupsd.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 368d7ac761a..3041dccfd15 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -75,7 +75,7 @@ let
     '') cfg.listenAddresses}
     Listen /var/run/cups/cups.sock
 
-    SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin
+    SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin
 
     DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
 
@@ -310,6 +310,13 @@ in
             for i in *; do
               [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i"
             done
+
+            #update path reference
+            [ -L /var/lib/cups/path ] && \
+              rm /var/lib/cups/path
+            [ ! -e /var/lib/cups/path ] && \
+              ln -s ${bindir} /var/lib/cups/path
+
             ${optionalString cfg.gutenprint ''
               if [ -d /var/lib/cups/ppd ]; then
                 ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd

From b55cef75149cd9cf71e9d0da8fbf87cbdbfefb52 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Dec 2016 03:43:47 +0100
Subject: [PATCH 159/295] torbrowser: prefer local builds

The build consists of downloading some stuff & writing a wrapper, the
additional Hydra load is hardly justified.
---
 pkgs/tools/security/tor/torbrowser.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 6354d3c538e..f08d741f693 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
       "0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97";
   };
 
+  preferLocalBuild = true;
+
   desktopItem = makeDesktopItem {
     name = "torbrowser";
     exec = "tor-browser";

From 52cb1df30c0413752a85a9fb01d48c1a3dba69ce Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Dec 2016 03:48:20 +0100
Subject: [PATCH 160/295] kodi/wrapper: fix typo, preferLocalBuilds ->
 preferLocalBuild

---
 pkgs/applications/video/kodi/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index efd0f257ca0..e6d3fbb090f 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     done)
   '';
 
-  preferLocalBuilds = true;
+  preferLocalBuild = true;
 
   meta = with kodi.meta; {
     inherit license homepage;

From b26b37d8663371529dee39bc649ff0c78249d4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 4 Dec 2016 22:10:24 +0000
Subject: [PATCH 161/295] glide: 0.12.2 -> 0.12.3

---
 pkgs/development/tools/glide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 66335412b49..4f853e900b3 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "glide-${version}";
-  version = "0.12.2";
-  
+  version = "0.12.3";
+
   goPackagePath = "github.com/Masterminds/glide";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "Masterminds";
     repo = "glide";
-    sha256 = "15cdrcslkiggd6sg5j40amflydpqz1s63f13mvlg309adfhsk4qz";
+    sha256 = "0hvfikvxfk94aqms1bdxqxqpamzy0v8binv5jwglzw2sf2437ww0";
   };
 
   meta = with stdenv.lib; {

From e065861a4f3adb07df55f756a7bcaf894a0383ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Dec 2016 10:26:20 +0100
Subject: [PATCH 162/295] buildGoPackage: reduce the default meta.platforms

platforms.all makes no sense as go.meta.platforms is smaller.  Discussion:
https://github.com/NixOS/nixpkgs/pull/20923#issuecomment-266763319
---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index d3a31f32189..c707592e4ae 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -211,7 +211,7 @@ go.stdenv.mkDerivation (
 
   meta = {
     # Add default meta information
-    platforms = lib.platforms.all;
+    platforms = go.meta.platforms or lib.platforms.all;
   } // meta // {
     # add an extra maintainer to every package
     maintainers = (meta.maintainers or []) ++

From f8a28b8f69ff77ac2ec883cdd134504ce5b95834 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Wed, 14 Dec 2016 10:56:20 +0100
Subject: [PATCH 163/295] terraform 0.7.11 -> 0.7.13

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 1c481adcf1e..119e33e4d1e 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.7.11";
+  version = "0.7.13";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "0rmzhf2rwxci57ll5nv2vvmic9cn64dbbg1fb5g78njljzpsc5qw";
+    sha256 = "0s23gc9rlnsg6x8llxnnw30b9c5kndy73jimrfxpqb4mha7mjn5n";
   };
 
   postInstall = ''

From 08b3e3944ba6fcbf24ebb1a50482a59f9ad6eded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 14 Dec 2016 11:05:01 +0100
Subject: [PATCH 164/295] telegraf: 1.1.1 -> 1.1.2

---
 pkgs/servers/monitoring/telegraf/default.nix                  | 4 ++--
 .../monitoring/telegraf/{deps-1.1.1.nix => deps-1.1.2.nix}    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.1.1.nix => deps-1.1.2.nix} (99%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index a29c6e16fa8..996c839acff 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0i3bmfs54s6m8im5gjm5ccyz31gpvp9cghxjxj46l0g77ncij7dj";
+    sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2";
   };
 
   goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
similarity index 99%
rename from pkgs/servers/monitoring/telegraf/deps-1.1.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
index c7c2468f9a1..b62ae44dbc9 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
@@ -446,8 +446,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8";
-      sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv";
+      rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08";
+      sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni";
     };
   }
   {

From 321987a1b80f02e80437fcd0541dd3d582e6222e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Dec 2016 07:06:19 -0600
Subject: [PATCH 165/295] kpackage: patch for package name collisions

---
 .../kde-frameworks/kpackage/default.nix         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 76ab7dbe013..c3b89a05d19 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, copyPathsToStore
+{ kdeFramework, fetchurl, lib, copyPathsToStore
 , ecm
 , karchive
 , kconfig
@@ -12,5 +12,18 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches =
+    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ [
+      (fetchurl {
+        url = "https://cgit.kde.org/kpackage.git/patch/?id=26e59d58438cc777873a6afc7817418ec735aaa3";
+        sha256 = "05ad3awdq8cz1bmnhnf1lapvm70z5qc8sbdzrcgxlka7wzdbm5lw";
+        name = "fix-cmake-failure-package-id-collision.patch";
+      })
+      (fetchurl {
+        url = "https://cgit.kde.org/kpackage.git/patch/?id=17915200921836d61266ad93dd6c3b87db1dc9e4";
+        sha256 = "07irfx297lf39cyrv10i3q4z04fr8msm6pcp8mcwvss4gih05b74";
+        name = "fix-cmake-failure-package-id-collision.patch";
+      })
+    ];
 }

From fa0a63ec13bcd87710c10a29ba3489374333c4ef Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 14 Dec 2016 14:58:02 +0100
Subject: [PATCH 166/295] fail2ban service : improve ssh jail (#21131)

Improvement to the ssh-iptables to block the port(s) actually defined
for sshd in config.services.openssh.ports
---
 nixos/modules/services/security/fail2ban.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 22e3bb0066c..716ae7a2d2f 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -143,7 +143,7 @@ in
     services.fail2ban.jails.ssh-iptables =
       ''
         filter   = sshd
-        action   = iptables[name=SSH, port=ssh, protocol=tcp]
+        action   = iptables-multiport[name=SSH, port="${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}", protocol=tcp]
         maxretry = 5
       '';
 

From 88f53c989e8aa92f2b5bebb4af7e37470445d838 Mon Sep 17 00:00:00 2001
From: bnikolic <bojan@bnikolic.co.uk>
Date: Wed, 14 Dec 2016 14:03:54 +0000
Subject: [PATCH 167/295] bazaar: enable sftp transport (#21132)

SFTP transport needs python paramiko package, which is now an optional
input
---
 pkgs/applications/version-management/bazaar/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index a397acddbcf..47d667a0c06 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages
+, withSFTP ? true
+ }:
 
 python2Packages.buildPythonApplication rec {
   version = "2.7";
@@ -12,6 +14,9 @@ python2Packages.buildPythonApplication rec {
 
   doCheck = false;
 
+  propagatedBuildInputs = []
+  ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ];
+
   # Bazaar can't find the certificates alone
   patches = [ ./add_certificates.patch ];
   postPatch = ''

From 4d2406c7d5b49632b390cc3bb4f41c99a0c330d9 Mon Sep 17 00:00:00 2001
From: Joris Guyonvarch <joris@guyonvarch.me>
Date: Wed, 14 Dec 2016 15:22:00 +0100
Subject: [PATCH 168/295] ffcast: init at 2.5.0 (#21141)

---
 lib/maintainers.nix               |  1 +
 pkgs/tools/X11/ffcast/default.nix | 32 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/X11/ffcast/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 664c50dd579..a1a61f97e29 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -188,6 +188,7 @@
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>";
+  guyonvarch = "Joris Guyonvarch <joris@guyonvarch.me>";
   hakuch = "Jesse Haber-Kucharsky <hakuch@gmail.com>";
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
new file mode 100644
index 00000000000..936805ed17c
--- /dev/null
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, autoconf, automake, perl, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "ffcast-${version}";
+  version = "2.5.0";
+  rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9";
+
+  src = fetchgit {
+    url = https://github.com/lolilolicon/FFcast;
+    sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj";
+  };
+
+  buildInputs = [ autoconf automake perl libX11 ];
+
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  configureFlags = [ "--enable-xrectsel" ];
+
+  postBuild = ''
+    make DESTDIR="$out" install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Run commands on rectangular screen regions";
+    homepage = https://github.com/lolilolicon/FFcast;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.guyonvarch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1882397933..48cf5d105bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6958,6 +6958,8 @@ in
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
+  ffcast = callPackage ../tools/X11/ffcast { };
+
   fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {};
   fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
 

From b139b17fa88132df2c0afd9f614ca44bf2fd4448 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 14 Dec 2016 09:30:31 -0500
Subject: [PATCH 169/295] subversion: 1.9.4 -> 1.9.5

---
 pkgs/applications/version-management/subversion/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 034bde6911e..1fbedcaf9d7 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -103,15 +103,13 @@ let
   });
 
 in {
-
   subversion18 = common {
     version = "1.8.16";
     sha256 = "0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi";
   };
 
   subversion19 = common {
-    version = "1.9.4";
-    sha256 = "16cjkvvq628hbznkhqkppzs8nifcr7k43s5y4c32cgwqmgigjrqj";
+    version = "1.9.5";
+    sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa";
   };
-
 }

From a21a11bae2e1cb72bead14825037f1cf0451677f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Dec 2016 20:44:56 +0100
Subject: [PATCH 170/295] LTS Haskell 7.13

---
 .../configuration-hackage2nix.yaml            | 137 +++++++++---------
 1 file changed, 70 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 24c9c50e850..220b7bc8dc2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.11
+  # LTS Haskell 7.13
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -146,7 +146,7 @@ default-package-overrides:
   - app-settings ==0.2.0.9
   - appar ==0.1.4
   - apply-refact ==0.3.0.0
-  - arbtt ==0.9.0.10
+  - arbtt ==0.9.0.11
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
   - arrow-list ==0.7
@@ -170,7 +170,7 @@ default-package-overrides:
   - auto-update ==0.1.4
   - autoexporter ==0.2.2
   - aws ==0.14.1
-  - b9 ==0.5.21
+  - b9 ==0.5.30
   - bake ==0.4
   - bank-holidays-england ==0.1.0.5
   - base-compat ==0.9.1
@@ -197,7 +197,7 @@ default-package-overrides:
   - binary-orphans ==0.1.5.1
   - binary-parser ==0.5.2
   - binary-search ==1.0.0.3
-  - binary-tagged ==0.1.4.1
+  - binary-tagged ==0.1.4.2
   - binary-typed ==1.0
   - bindings-DSL ==1.0.23
   - bindings-GLFW ==3.1.2.2
@@ -223,8 +223,8 @@ default-package-overrides:
   - 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-html ==0.8.1.3
+  - blaze-markup ==0.7.1.1
   - blaze-svg ==0.3.6
   - blaze-textual ==0.2.1.0
   - bloodhound ==0.11.0.0
@@ -236,7 +236,7 @@ default-package-overrides:
   - both ==0.1.1.0
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
-  - bower-json ==0.8.0
+  - bower-json ==0.8.1
   - boxes ==0.1.4
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
@@ -251,7 +251,7 @@ default-package-overrides:
   - byteset ==0.1.1.0
   - bytestring-builder ==0.10.8.1.0
   - bytestring-conversion ==0.3.1
-  - bytestring-handle ==0.1.0.4
+  - bytestring-handle ==0.1.0.5
   - bytestring-lexing ==0.5.0.2
   - bytestring-progress ==1.0.7
   - bytestring-tree-builder ==0.2.7.1
@@ -259,12 +259,12 @@ default-package-overrides:
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.2.1.4
   - c2hs ==0.28.1
-  - Cabal ==1.24.1.0
+  - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.1.2.0
-  - cabal-file-th ==0.2.3
+  - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.2.0
   - cabal-install ==1.24.0.1
-  - cabal-rpm ==0.10.0
+  - cabal-rpm ==0.10.1
   - cabal-sort ==0.0.5.3
   - cabal-src ==0.3.0.2
   - cache ==0.1.0.0
@@ -281,7 +281,7 @@ default-package-overrides:
   - cassava-conduit ==0.3.2
   - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
-  - cayley-client ==0.2.1.0
+  - cayley-client ==0.2.1.1
   - cereal ==0.5.4.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -314,9 +314,9 @@ default-package-overrides:
   - clash-systemverilog ==0.6.10
   - clash-verilog ==0.6.10
   - clash-vhdl ==0.6.16
-  - classy-prelude ==1.0.1
-  - classy-prelude-conduit ==1.0.1
-  - classy-prelude-yesod ==1.0.1
+  - classy-prelude ==1.0.2
+  - classy-prelude-conduit ==1.0.2
+  - classy-prelude-yesod ==1.0.2
   - clay ==0.11
   - clckwrks ==0.23.19.2
   - clckwrks-cli ==0.2.16
@@ -351,7 +351,7 @@ default-package-overrides:
   - concurrent-output ==1.7.7
   - concurrent-supply ==0.1.8
   - conduit ==1.2.8
-  - conduit-combinators ==1.0.8.2
+  - conduit-combinators ==1.0.8.3
   - conduit-extra ==1.1.15
   - conduit-iconv ==0.1.1.1
   - conduit-parse ==0.1.2.0
@@ -454,7 +454,7 @@ default-package-overrides:
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.0.1.3
-  - direct-sqlite ==2.3.18
+  - direct-sqlite ==2.3.19
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
@@ -491,7 +491,7 @@ default-package-overrides:
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - ed25519 ==0.0.5.0
-  - ede ==0.2.8.5
+  - ede ==0.2.8.6
   - EdisonAPI ==1.3.1
   - EdisonCore ==1.3.1.1
   - edit-distance ==0.2.2.1
@@ -515,7 +515,7 @@ default-package-overrides:
   - eq ==4.0.4
   - equivalence ==0.3.1
   - erf ==2.0.0.0
-  - errors ==2.1.2
+  - errors ==2.1.3
   - ersatz ==0.3.1
   - etcd ==1.0.5
   - ether ==0.4.0.2
@@ -525,7 +525,7 @@ default-package-overrides:
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
   - exception-mtl ==0.4.0.1
-  - exception-transformers ==0.4.0.4
+  - exception-transformers ==0.4.0.5
   - exceptional ==0.3.0.0
   - exceptions ==0.8.3
   - executable-hash ==0.2.0.2
@@ -587,7 +587,7 @@ default-package-overrides:
   - foreign-store ==0.2
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - Frames ==0.1.6
+  - Frames ==0.1.8
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
@@ -607,9 +607,11 @@ default-package-overrides:
   - 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
+  - generics-sop ==0.2.3.0
+  - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
+  - genvalidity ==0.2.0.4
+  - genvalidity-hspec ==0.2.0.5
   - getopt-generics ==0.13
   - ghc-events ==0.4.4.0
   - ghc-exactprint ==0.5.2.1
@@ -798,7 +800,7 @@ default-package-overrides:
   - hashable ==1.2.4.0
   - hashable-extras ==0.2.3
   - hashable-time ==0.2
-  - hashmap ==1.3.1.1
+  - hashmap ==1.3.2
   - hashtables ==1.2.1.0
   - haskeline ==0.7.2.3
   - haskell-gi ==0.18
@@ -817,7 +819,7 @@ default-package-overrides:
   - haskoin-core ==0.4.0
   - hasql ==0.19.15.2
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.1.4
+  - hasty-hamiltonian ==1.1.5
   - HaTeX ==3.17.0.2
   - hatex-guide ==1.3.1.5
   - hbayes ==0.5.2
@@ -831,7 +833,7 @@ default-package-overrides:
   - heap ==1.0.3
   - heaps ==0.3.3
   - hebrew-time ==0.1.1
-  - hedis ==0.9.4
+  - hedis ==0.9.5
   - here ==1.2.9
   - heredoc ==0.2.0.0
   - hex ==0.1.2
@@ -844,7 +846,7 @@ default-package-overrides:
   - hidapi ==0.1.4
   - hierarchical-clustering ==0.4.6
   - highlighting-kate ==0.6.3
-  - hinotify ==0.3.8.1
+  - hinotify ==0.3.9
   - hint ==0.6.0
   - histogram-fill ==0.8.4.1
   - hit ==0.6.3
@@ -874,7 +876,6 @@ default-package-overrides:
   - 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
@@ -994,7 +995,7 @@ default-package-overrides:
   - inline-r ==0.9.0.0
   - insert-ordered-containers ==0.1.0.1
   - integration ==0.2.1
-  - intero ==0.1.19
+  - intero ==0.1.20
   - interpolate ==0.1.0
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.2.0
@@ -1033,7 +1034,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
-  - json-autotype ==1.0.14
+  - json-autotype ==1.0.15
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - JuicyPixels ==3.2.8
@@ -1053,7 +1054,7 @@ default-package-overrides:
   - kraken ==0.0.3
   - lackey ==0.4.1
   - language-c ==0.5.0
-  - language-c-quote ==0.11.7
+  - language-c-quote ==0.11.7.1
   - language-dockerfile ==0.3.5.0
   - language-ecmascript ==0.17.1.0
   - language-fortran ==0.5.1
@@ -1091,6 +1092,7 @@ default-package-overrides:
   - lift-generics ==0.1.1
   - lifted-async ==0.9.0
   - lifted-base ==0.2.3.8
+  - line ==1.0.1.0
   - linear ==1.20.5
   - linear-accelerate ==0.2
   - linux-file-extents ==0.2.0.0
@@ -1120,18 +1122,18 @@ default-package-overrides:
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
-  - math-functions ==0.2.0.2
-  - matrices ==0.4.3
+  - math-functions ==0.2.1.0
+  - matrices ==0.4.4
   - matrix ==0.3.5.0
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
-  - mcmc-types ==1.0.2
+  - mcmc-types ==1.0.3
   - 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 ==0.5.4
   - messagepack-rpc ==0.5.1
   - metrics ==0.3.0.2
   - MFlow ==0.4.6.0
@@ -1143,8 +1145,8 @@ default-package-overrides:
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.7.0
   - microlens-th ==0.4.1.0
-  - mighty-metropolis ==1.0.3
-  - mime-mail ==0.4.11
+  - mighty-metropolis ==1.0.4
+  - mime-mail ==0.4.12
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
   - misfortune ==0.1.1.2
@@ -1163,7 +1165,7 @@ default-package-overrides:
   - monad-logger ==0.3.20.1
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.6
-  - monad-logger-syslog ==0.1.2.0
+  - monad-logger-syslog ==0.1.3.0
   - monad-loops ==0.4.3
   - monad-par ==0.3.4.8
   - monad-par-extras ==0.3.3
@@ -1205,7 +1207,7 @@ default-package-overrides:
   - mustache ==2.1.2
   - mutable-containers ==0.3.3
   - mwc-probability ==1.2.2
-  - mwc-random ==0.13.4.0
+  - mwc-random ==0.13.5.0
   - mwc-random-monad ==0.7.3.1
   - nagios-check ==0.3.2
   - names-th ==0.2.0.2
@@ -1261,7 +1263,7 @@ default-package-overrides:
   - opaleye-trans ==0.3.3
   - open-browser ==0.2.1.0
   - OpenGL ==3.0.1.0
-  - OpenGLRaw ==3.2.3.0
+  - OpenGLRaw ==3.2.4.0
   - openpgp-asciiarmor ==0.1
   - opensource ==0.1.0.0
   - openssl-streams ==1.2.1.0
@@ -1284,16 +1286,16 @@ default-package-overrides:
   - pagination ==0.1.1
   - palette ==0.1.0.4
   - pandoc ==1.17.1
-  - pandoc-citeproc ==0.10.2.2
+  - pandoc-citeproc ==0.10.3
   - pandoc-types ==1.16.1.1
   - pango ==0.13.3.1
   - parallel ==3.2.1.0
   - parallel-io ==0.3.3
-  - parseargs ==0.2.0.7
+  - parseargs ==0.2.0.8
   - parsec ==3.1.11
   - parsers ==0.12.4
   - partial-handler ==1.0.2
-  - path ==0.5.9
+  - path ==0.5.11
   - path-extra ==0.0.3
   - path-io ==1.2.0
   - path-pieces ==0.2.1
@@ -1329,22 +1331,22 @@ default-package-overrides:
   - pipes-aeson ==0.4.1.7
   - pipes-attoparsec ==0.5.1.4
   - pipes-bgzf ==0.2.0.1
-  - pipes-bytestring ==2.1.3
+  - pipes-bytestring ==2.1.4
   - pipes-cacophony ==0.4.0
   - pipes-cliff ==0.12.0.0
-  - pipes-concurrency ==2.0.6
+  - pipes-concurrency ==2.0.7
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.7
+  - pipes-extras ==1.0.8
   - pipes-fastx ==0.3.0.0
-  - pipes-group ==1.0.5
+  - pipes-group ==1.0.6
   - 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-parse ==3.0.8
+  - pipes-random ==1.0.0.2
   - pipes-safe ==2.2.4
-  - pipes-text ==0.0.2.4
+  - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
   - pixelated-avatar-generator ==0.1.3
   - pkcs10 ==0.1.1.0
@@ -1398,7 +1400,7 @@ default-package-overrides:
   - proxied ==0.2
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.2.2
+  - psqueues ==0.2.2.3
   - publicsuffix ==0.20160716
   - pure-cdb ==0.1.2
   - pure-io ==0.2.1
@@ -1439,7 +1441,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==0.1.0.1
   - readable ==0.3.1
-  - ReadArgs ==1.2.2
+  - ReadArgs ==1.2.3
   - readline ==1.0.3.0
   - rebase ==1.0.6
   - redis-io ==0.7.0
@@ -1584,9 +1586,9 @@ default-package-overrides:
   - smallcaps ==0.6.0.3
   - smallcheck ==1.1.1
   - smoothie ==0.4.2.3
-  - smsaero ==0.6.1
+  - smsaero ==0.6.2
   - smtLib ==1.0.8
-  - smtp-mail ==0.1.4.5
+  - smtp-mail ==0.1.4.6
   - snap-core ==1.0.1.0
   - snap-server ==1.0.1.1
   - snowflake ==0.1.1.1
@@ -1601,7 +1603,7 @@ default-package-overrides:
   - sourcemap ==0.1.6
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
-  - speedy-slice ==0.1.4
+  - speedy-slice ==0.1.5
   - sphinx ==0.6.0.2
   - Spintax ==0.1.0.1
   - splice ==0.6.1.1
@@ -1615,11 +1617,11 @@ default-package-overrides:
   - spool ==0.1
   - spoon ==0.3.1
   - sql-words ==0.1.4.1
-  - sqlite-simple ==0.4.10.0
+  - sqlite-simple ==0.4.12.0
   - srcloc ==0.5.1.0
   - stache ==0.1.8
   - stack-run-auto ==0.1.1.4
-  - stackage-curator ==0.14.1.1
+  - stackage-curator ==0.14.3
   - stackage-types ==1.2.0
   - state-plus ==0.1.2
   - stateref ==0.3
@@ -1738,7 +1740,7 @@ default-package-overrides:
   - th-expand-syns ==0.4.1.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.6
-  - th-lift-instances ==0.1.10
+  - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
   - th-printf ==0.3.1
   - th-reify-compat ==0.0.1.1
@@ -1824,7 +1826,7 @@ default-package-overrides:
   - 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-compat ==0.4.3.1
   - unix-time ==0.3.7
   - Unixutils ==1.54.1
   - unordered-containers ==0.2.7.1
@@ -1847,6 +1849,7 @@ default-package-overrides:
   - vado ==0.0.7
   - validate-input ==0.4.0.0
   - validation ==0.5.4
+  - validity ==0.3.0.4
   - varying ==0.5.0.3
   - vault ==0.3.0.6
   - vcswrapper ==0.1.3
@@ -1906,7 +1909,7 @@ default-package-overrides:
   - webkitgtk3-javascriptcore ==0.14.2.1
   - webpage ==0.0.4
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.9.7.0
+  - websockets ==0.9.8.2
   - weigh ==0.0.3
   - werewolf ==1.5.1.1
   - werewolf-slack ==1.0.2.0
@@ -1930,9 +1933,9 @@ default-package-overrides:
   - wreq ==0.4.1.0
   - writer-cps-mtl ==0.1.1.0
   - writer-cps-transformers ==0.1.1.0
-  - wuss ==1.1.1
+  - wuss ==1.1.3
   - X11 ==1.6.1.2
-  - x509 ==1.6.4
+  - x509 ==1.6.5
   - x509-store ==1.6.2
   - x509-system ==1.6.4
   - x509-validation ==1.6.5
@@ -1958,19 +1961,19 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.1.0.0
-  - yaml ==0.8.20
+  - yaml ==0.8.21.1
   - Yampa ==0.10.5
   - YampaSynth ==0.2
   - yarr ==1.4.0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.3.1
-  - yesod-auth ==1.4.13.5
+  - yesod-auth ==1.4.15
   - 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.7
-  - yesod-core ==1.4.26
+  - yesod-core ==1.4.30
   - yesod-eventsource ==1.4.0.1
   - yesod-fay ==0.8.0
   - yesod-fb ==0.3.4
@@ -1985,8 +1988,8 @@ default-package-overrides:
   - yesod-static ==1.5.1.1
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.3
-  - yesod-websockets ==0.2.4
+  - yesod-test ==1.5.4.1
+  - yesod-websockets ==0.2.4.1
   - yi ==0.12.6
   - yi-fuzzy-open ==0.1.0.1
   - yi-language ==0.2.1

From 7c3839b90c8903e63bc81c99174d83c82f43143c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Dec 2016 20:34:55 +0100
Subject: [PATCH 171/295] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.3-13-gcb8e8a4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c76f2cde8dabf0805cba8f05d3dc1b3d482788e2.
---
 .../haskell-modules/hackage-packages.nix      | 3985 ++++++++++-------
 1 file changed, 2452 insertions(+), 1533 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4640b607e7c..840c45d3d01 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -919,8 +919,8 @@ self: {
     ({ mkDerivation, base, mtl, multirec, parsec }:
      mkDerivation {
        pname = "Annotations";
-       version = "0.2.1";
-       sha256 = "12e2c8ad03795c5bceffc8f421655097f96bcde1ff68d98dbe2bd2990f790cc7";
+       version = "0.2.2";
+       sha256 = "31c0d4765aba5d21df0e2b38521828fda860139609c2f6a6947423650f66161c";
        libraryHaskellDepends = [ base mtl multirec parsec ];
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
@@ -1744,8 +1744,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.4.2";
-       sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1";
+       version = "0.8.4.3";
+       sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1768,8 +1768,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately-diagrams";
-       version = "0.2.0.4";
-       sha256 = "392de367b3caaa293a6a1d341217c8c08e58c14b3cddd3943b88b59a3b848b6e";
+       version = "0.2.0.5";
+       sha256 = "9aa44dcff5bdddc3e3331a359ce517ec5f04258ebf2ab8c52c0971c38cd01948";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -2353,7 +2353,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_1_24_1_0" = callPackage
+  "Cabal_1_24_2_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, directory, exceptions, filepath, old-time, pretty
      , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit
@@ -2361,8 +2361,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.24.1.0";
-       sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b";
+       version = "1.24.2.0";
+       sha256 = "b7d0eb8e3503fbca460c0a6ca5c88352cecfe1b69e0bbc79827872134ed86340";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
@@ -5439,8 +5439,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.1.6";
-       sha256 = "7a7a6639b04e9650d5dde93bb67bc0f26b053fd3456a34808f39640a0f780a50";
+       version = "0.1.8";
+       sha256 = "5b695c025c1e153d40b5ac8a526ca4986b1b4ae9350354e6373593b15d9c3e57";
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -5801,8 +5801,8 @@ self: {
      }:
      mkDerivation {
        pname = "GPipe-GLFW";
-       version = "1.2.3";
-       sha256 = "a6854b9e0a2790db5205d22035cfa6e68c8e2341918a875e851f22264a9b5c40";
+       version = "1.3.0";
+       sha256 = "f929bfa320a76ca8c9769bf38b9de6b8928b9ef63f9b09c31a9dfe209f8826b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
@@ -7568,11 +7568,12 @@ self: {
      }:
      mkDerivation {
        pname = "HMarkov";
-       version = "1.0.0.3";
-       sha256 = "0f43a9e0dd4da3258f89668e240081f4d0144003b8b45283ea3a0b446715a8a7";
+       version = "1.0.1.1";
+       sha256 = "f7b2753019c7348487d2b7df31f1b59522c008a90d59926a0f7fa6670fa89d03";
        libraryHaskellDepends = [ base lens mtl random vector ];
        testHaskellDepends = [
-         base QuickCheck random tasty tasty-hunit tasty-quickcheck vector
+         base lens mtl QuickCheck random tasty tasty-hunit tasty-quickcheck
+         vector
        ];
        homepage = "https://github.com/swizzard/HMarkov#readme";
        description = "Markov-generated sequences";
@@ -11924,6 +11925,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "NMap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "NMap";
+       version = "0.12";
+       sha256 = "84133b162935f6f249fd8a7d19dcf378482fec0d292df929cee2dd4984281ab5";
+       libraryHaskellDepends = [ base containers ];
+       description = "A transparent nested Map structure";
+       license = "LGPL";
+     }) {};
+
   "NTRU" = callPackage
     ({ mkDerivation, arithmoi, base, bytestring, containers, crypto-api
      , polynomial, random, SHA, split
@@ -12762,23 +12774,6 @@ self: {
      }) {};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGLRaw";
-       version = "3.2.3.0";
-       sha256 = "e64cb1b8ea0f87857e44396fb948751bdcace2a1c924875c8aa91b20e4d90ba3";
-       libraryHaskellDepends = [
-         base bytestring containers fixed half text transformers
-       ];
-       librarySystemDepends = [ mesa ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mesa;};
-
-  "OpenGLRaw_3_2_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
      , text, transformers
      }:
@@ -12793,7 +12788,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw21" = callPackage
@@ -13993,8 +13987,8 @@ self: {
      }:
      mkDerivation {
        pname = "R-pandoc";
-       version = "0.2.1";
-       sha256 = "57f08dfd05b50b9961ad4427fa6925d3a388618d73b41df7bee095b8349cbbd3";
+       version = "0.2.2";
+       sha256 = "988608b7353738a664a0557be210e82fd0db8e4a116577221fddc6b9b86d69cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14436,8 +14430,8 @@ self: {
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
        pname = "ReadArgs";
-       version = "1.2.2";
-       sha256 = "47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec";
+       version = "1.2.3";
+       sha256 = "9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base system-filepath text ];
@@ -15763,13 +15757,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Spintax_0_2_0_0" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
+  "Spintax_0_3_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.2.0.0";
-       sha256 = "33b5e8e7d3e41ef5a8b008e2a1084c23b57e26af147f5158dca59256b875336a";
-       libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
+       version = "0.3.0.0";
+       sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc";
+       libraryHaskellDepends = [
+         attoparsec base extra mtl mwc-random text
+       ];
        homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
@@ -15957,6 +15953,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Stack" = callPackage
+    ({ mkDerivation, base, nats, stm }:
+     mkDerivation {
+       pname = "Stack";
+       version = "0.3.2";
+       sha256 = "2ba17b68a6daef6040f30cfd6b0044380890bc9f7faf8ab21192ff467d2757e5";
+       libraryHaskellDepends = [ base nats stm ];
+       homepage = "https://en.wikipedia.org/wiki/Stack_(abstract_data_type)";
+       description = "Stack data structure";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Stasis" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -19464,6 +19472,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acme-smuggler" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "acme-smuggler";
+       version = "0.1.0.1";
+       sha256 = "740ecdf25dd30475f44b865490b8efecfb39621e91569c988d21ca0762946ac7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/benclifford/acme-smuggler";
+       description = "Smuggle arbitrary values in ()";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-strfry" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -20004,6 +20025,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-better-errors_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific
+     , text, transformers, transformers-compat, unordered-containers
+     , vector, void
+     }:
+     mkDerivation {
+       pname = "aeson-better-errors";
+       version = "0.9.1.0";
+       sha256 = "68f001bf055ec7b755d91019f2a0ef136307d157a231acddad6b4cc561f67327";
+       libraryHaskellDepends = [
+         aeson base bytestring dlist mtl scientific text transformers
+         transformers-compat unordered-containers vector void
+       ];
+       homepage = "https://github.com/hdgarrood/aeson-better-errors";
+       description = "Better error messages when decoding JSON values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-bson" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, bson, bytestring
      , containers, text, unordered-containers, vector
@@ -20806,8 +20846,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.6";
-       sha256 = "1e84a2957a7f974e4e11cdaa2a7c4ec3da5b03fe15a0fed07427e9ee74712bba";
+       version = "5.0.1";
+       sha256 = "ec5dd90074c05a947f3c1506fb58d7ab0eae497b31c2bba9641c9ff3cbf5ca57";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -20957,8 +20997,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "4.6.1";
-       sha256 = "0177336d1d520bf303a3702a90dd33e31195d825f949872f3525fe940b7c01f8";
+       version = "5.0.1";
+       sha256 = "7a4e0088489642819513ab9acc0e05ab2ec94e4fddf5ac2df519740e7d7333d9";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -21727,7 +21767,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka_1_4_4_2" = callPackage
+  "amazonka_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
      , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
      , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -21735,8 +21775,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.4.4.2";
-       sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f";
+       version = "1.4.5";
+       sha256 = "86e7b7ef0dea4a6bc9a7644ec17908a3d9f781ac1190fcb4bd33690b8bca885c";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-conduit ini mmorph monad-control mtl resourcet
@@ -21768,14 +21808,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-apigateway_1_4_4" = callPackage
+  "amazonka-apigateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-apigateway";
-       version = "1.4.4";
-       sha256 = "a32aab9e4c78b15f609de4718845e593dcd5c4c29ee18643dde47c9c33adba21";
+       version = "1.4.5";
+       sha256 = "cccd4f7832b75b3df0de5946fdc0d9277fe2e267fce7a93524ebc609234d0e4a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21805,14 +21845,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-application-autoscaling_1_4_4" = callPackage
+  "amazonka-application-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-application-autoscaling";
-       version = "1.4.4";
-       sha256 = "f45fc7dd0b3b7be5cd4fa188cf7b0a3007c48db11ee8c92cbf16e6e20ea66f7e";
+       version = "1.4.5";
+       sha256 = "e6b4e51be8eb4279e0a5daa81b858e6b7a35a7005d48e038c1b53d5c9feec24e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21824,6 +21864,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-appstream" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-appstream";
+       version = "1.4.5";
+       sha256 = "7f15da60e2afdf90ea98bec5734c5f387e2676fd7ef9a1388501396f7782517c";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon AppStream SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-autoscaling" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21842,14 +21900,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-autoscaling_1_4_4" = callPackage
+  "amazonka-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.4.4";
-       sha256 = "bb54c9340d38d4b08cbb43321eaad731416a38dda4a36e768e12d0d54ec8ab13";
+       version = "1.4.5";
+       sha256 = "f887bf9f7ff88edc228dee99a858a097e6235f066886430ce4d7c5dc339e6bda";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21861,6 +21919,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-budgets" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-budgets";
+       version = "1.4.5";
+       sha256 = "a1363b6057e1e85b9e4a18491056f8eeeee7dbd4798cc3292ba89fb4e7ea1d8b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Budgets SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-certificatemanager" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21879,14 +21955,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-certificatemanager_1_4_4" = callPackage
+  "amazonka-certificatemanager_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-certificatemanager";
-       version = "1.4.4";
-       sha256 = "dea7c0aaa3f69f3da3f8755ee47a4a402603aad8602f3a8ce92a302fabbf0fc6";
+       version = "1.4.5";
+       sha256 = "9990c1090044eb24013197b94bb923e800c6312c87c89f4caae6bbe36c0632b0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21916,14 +21992,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudformation_1_4_4" = callPackage
+  "amazonka-cloudformation_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.4.4";
-       sha256 = "aee7abe767b8287213406e1e79db9be1d83f510f9239f8faf7e03cca3e40a923";
+       version = "1.4.5";
+       sha256 = "fac2471ee46e386baa7751ac091194d90f84c96eb0c0a1094e790ecb62ddb7f6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21953,14 +22029,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudfront_1_4_4" = callPackage
+  "amazonka-cloudfront_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.4.4";
-       sha256 = "ef921bc77e37c6e0cc8ad8943fe11360ecc0f7ae3031fd99cfc4a28023201cfb";
+       version = "1.4.5";
+       sha256 = "0e89f49e5ab607a45f5ac94d9b47d3102c11c5d7b7249eb0303e9350a3a5aad1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -21990,14 +22066,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudhsm_1_4_4" = callPackage
+  "amazonka-cloudhsm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.4.4";
-       sha256 = "cf37dcb18bd9baa0cd8ddcf334fdbf9a649a5aebacc63a11b7e9de70f994d5d4";
+       version = "1.4.5";
+       sha256 = "0114a91437d3dfa7e03e656750a47fe2b4c223ec5c4a66ad533bd0893c77a837";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22027,14 +22103,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudsearch_1_4_4" = callPackage
+  "amazonka-cloudsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.4.4";
-       sha256 = "27c1fe0dee9fbb1ec9f1d90e89527483133d14cf85b9199cbf9b7e96f3586e42";
+       version = "1.4.5";
+       sha256 = "62c42b596e1682e438966f536db36e284926141487dd9c49a634f3ffacba325b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22064,14 +22140,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudsearch-domains_1_4_4" = callPackage
+  "amazonka-cloudsearch-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.4.4";
-       sha256 = "f5516758925123c47a89ffb1abe120efca0ac2c0f218babc13089f7c6e78e1ff";
+       version = "1.4.5";
+       sha256 = "e0090397d9d6ce30a99537bb5041b6085aa758502a809d8e5744cd222fea028a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22101,14 +22177,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudtrail_1_4_4" = callPackage
+  "amazonka-cloudtrail_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.4.4";
-       sha256 = "114a334efd63d9b5ef8b50425a96e8672e5d84f6cabb2b8d4c15784d1afa4b46";
+       version = "1.4.5";
+       sha256 = "45e80bd1a66402e9a56355a88bfaa3407fd9549f3ee66a9d9a344fccfaccc276";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22138,14 +22214,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudwatch_1_4_4" = callPackage
+  "amazonka-cloudwatch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.4.4";
-       sha256 = "e76a1f166dd3f4ac110579961f4b142a42017e800d401a7fd8bfa85ecea0257c";
+       version = "1.4.5";
+       sha256 = "00e6b5f8d949ed5b4d4c7fc2c8264677018c54d7e5f36a6ead297da22f8c2201";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22175,14 +22251,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudwatch-events_1_4_4" = callPackage
+  "amazonka-cloudwatch-events_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-events";
-       version = "1.4.4";
-       sha256 = "cf7be01a292dbeb153560891f2eb65df1583df0248073668211320bf5fbe2559";
+       version = "1.4.5";
+       sha256 = "b1a2b8119e6c104e2820febd9a743c74b220ea70b2fdb4d464a8edc0bdc9fc7d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22212,14 +22288,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cloudwatch-logs_1_4_4" = callPackage
+  "amazonka-cloudwatch-logs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.4.4";
-       sha256 = "4c29612100b88bd6d9e611f20e555ed69939e66e9e1502561ae345095ba23060";
+       version = "1.4.5";
+       sha256 = "10cffb3ce3f6ee216b740b78d56a3689b7f1d4e0e367c92afac8f4d412799032";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22231,6 +22307,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-codebuild" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codebuild";
+       version = "1.4.5";
+       sha256 = "24426e202b2171181bd3b0ffe8fa2e2032561d233fa36f1fe0dfb890887afdd0";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeBuild SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-codecommit" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22249,14 +22343,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-codecommit_1_4_4" = callPackage
+  "amazonka-codecommit_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.4.4";
-       sha256 = "02d3c4988f82a20b2175a99203aec701efbeeb25a47bda53f6a755937f77d261";
+       version = "1.4.5";
+       sha256 = "fc8fed2cedf92680d4cffe7467c6b33259a0fb9b2461f11017eb85ce1a668063";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22286,14 +22380,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-codedeploy_1_4_4" = callPackage
+  "amazonka-codedeploy_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.4.4";
-       sha256 = "d900d37a7f47aaeec516dd149a2d2a8595a2dfaa75168624d49fdb96d2246482";
+       version = "1.4.5";
+       sha256 = "b1f0222e0d3504c116f5b1ff6d4769edafe7655bb0fd0deaa955689e9f7071b7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22323,14 +22417,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-codepipeline_1_4_4" = callPackage
+  "amazonka-codepipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.4.4";
-       sha256 = "dca521df26d5f53de2780b72a3d9c922326cc48847519e1ad088f330a5c02a6e";
+       version = "1.4.5";
+       sha256 = "6608a8f8f1adc996cbba830988cde869c425b1bc779bdb7f259d619f654646ec";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22360,14 +22454,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cognito-identity_1_4_4" = callPackage
+  "amazonka-cognito-identity_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.4.4";
-       sha256 = "61dc9389d62ee2f260dec8c3ba07a03afdb01c5150ac87b49ffba58561ce16df";
+       version = "1.4.5";
+       sha256 = "2cac79694e1b0c0a694525904bf8031d57a79c5fee2dda16b1126655ccf50d06";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22397,14 +22491,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cognito-idp_1_4_4" = callPackage
+  "amazonka-cognito-idp_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cognito-idp";
-       version = "1.4.4";
-       sha256 = "8e7370f170810959f61aaf2030f570e4486f24c2741cd185339e6c06039dc263";
+       version = "1.4.5";
+       sha256 = "bcf273498b47ecdfe30922bc22ad68d8d04773fd1a4ede8d98b6598cd7126618";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22434,14 +22528,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-cognito-sync_1_4_4" = callPackage
+  "amazonka-cognito-sync_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.4.4";
-       sha256 = "85c4ff9369475464be0c912557b7e05876a401240ed63eb9582293e39c655c59";
+       version = "1.4.5";
+       sha256 = "1331523164798c0162904f58d95a100fec9527652fcdebb81846c460a6344edf";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22471,14 +22565,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-config_1_4_4" = callPackage
+  "amazonka-config_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.4.4";
-       sha256 = "a0d2e3dc82dbdcf3387a2ba5be959442b261b31083e063453cf4c1a4fd1b9a91";
+       version = "1.4.5";
+       sha256 = "775c5b9ff6efb185ee6954aaf57f607ac1fcc386daf6a7aa7071e7364c7fbe24";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22522,7 +22616,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-core_1_4_4" = callPackage
+  "amazonka-core_1_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
      , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
@@ -22533,8 +22627,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.4.4";
-       sha256 = "ad0b79e5f369d079389250310ac865125f41b8025b18bbec93293e787112f45b";
+       version = "1.4.5";
+       sha256 = "db13e1d0ced722c21187815f34975d08a6e5a432ed58c17b3bbac75389cdee7f";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite deepseq exceptions hashable
@@ -22571,14 +22665,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-datapipeline_1_4_4" = callPackage
+  "amazonka-datapipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.4.4";
-       sha256 = "cd68a5f94435542e4a348b23931ab619f866ed9ce773d500f6575eb9e1b5c1cb";
+       version = "1.4.5";
+       sha256 = "258812a9a3c553bf56e8d18f32ff69d28860f65664fb2510e5f5b1ff3ff25cb5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22608,14 +22702,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-devicefarm_1_4_4" = callPackage
+  "amazonka-devicefarm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.4.4";
-       sha256 = "242a32cdb5502ac586f2e1ffb2921280907cbf6eecaaf431206bb6f3aa5d8e3b";
+       version = "1.4.5";
+       sha256 = "ea472974c93f360186baea4a5b746ac37ff1c573c778b747c9be479dda458802";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22645,14 +22739,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-directconnect_1_4_4" = callPackage
+  "amazonka-directconnect_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.4.4";
-       sha256 = "043dbd7e4ebc086155270118ca4329f3ad03a730c0b8aabe183958fba844de0d";
+       version = "1.4.5";
+       sha256 = "52139e543342d60607fc24e0ff5a25e38dc8868590aefbabf659bced71b3dea9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22682,14 +22776,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-discovery_1_4_4" = callPackage
+  "amazonka-discovery_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-discovery";
-       version = "1.4.4";
-       sha256 = "9bbb7e4f2baec019ce8fb41ff6382e5fa1a7c3010012cad2f7d315f5220e8045";
+       version = "1.4.5";
+       sha256 = "df5781938eda734bcce63fc6f7b674422bfa1dde5dbdf46d6cc1cf7bcdbcadb8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22719,14 +22813,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-dms_1_4_4" = callPackage
+  "amazonka-dms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-dms";
-       version = "1.4.4";
-       sha256 = "a8f6b3684de4d1b190aebf1966e2497fc8f8b18bed3dea687e4603fe8b70caaa";
+       version = "1.4.5";
+       sha256 = "334209b75c646cb4783ec19b98bece9274291402627bc65a86180bffb15171fc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22756,14 +22850,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ds_1_4_4" = callPackage
+  "amazonka-ds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.4.4";
-       sha256 = "5cae6b1926cfd6ea5f7fb4ad596a3d7fec80ad6e2ae6bb37f837ce5e5a9b48a0";
+       version = "1.4.5";
+       sha256 = "e711f34752793135a9bc088789f69482faf3044d23394c0455a8873ec76944dd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22793,14 +22887,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-dynamodb_1_4_4" = callPackage
+  "amazonka-dynamodb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.4.4";
-       sha256 = "9e0d23783e6e02eb3dd3edaa890a90a92be51024bd1e25967e680e8be257f49e";
+       version = "1.4.5";
+       sha256 = "74b23d5a012af7b2f3a14001a41496e22bdc61884aa52b8aac7f687c64bcd762";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22830,14 +22924,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-dynamodb-streams_1_4_4" = callPackage
+  "amazonka-dynamodb-streams_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.4.4";
-       sha256 = "575ee098e69bf18cb59549cac9ff4ce9c40ef54860b58210886290c933b04fa9";
+       version = "1.4.5";
+       sha256 = "83a340d763fbcd62b0b6f4c09358646516c7949b5f86423d4263874175e1feed";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22867,14 +22961,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ec2_1_4_4" = callPackage
+  "amazonka-ec2_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.4.4";
-       sha256 = "6fef83cb09e9ca74a6f1fb18f3add1420fc6c237aeafdb450a97d3216037741c";
+       version = "1.4.5";
+       sha256 = "e4a4938f947b6d69b799b5abc47a2d36e57ba68fdcc51a10b01c2566510cd498";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22904,14 +22998,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ecr_1_4_4" = callPackage
+  "amazonka-ecr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ecr";
-       version = "1.4.4";
-       sha256 = "d38d111fa1801b048fcadd67475b0a916a0813636607df2db48747c8190148db";
+       version = "1.4.5";
+       sha256 = "c3fa1094ea22402a87f4803301b74081bfd3a6dd1db42536ade0994548fd690c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22941,14 +23035,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ecs_1_4_4" = callPackage
+  "amazonka-ecs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.4.4";
-       sha256 = "fd2b867115fcd1a0b0ea992f3d2e902d7a5b66cce7c62da66ee1ac49c93aa574";
+       version = "1.4.5";
+       sha256 = "ba72592448eee9123acc7b700067343712c6c05f0635d6a52ebdcf3c08e2c414";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -22978,14 +23072,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-efs_1_4_4" = callPackage
+  "amazonka-efs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.4.4";
-       sha256 = "fb10cf8284a036623620f80c5fd938d5200e4e5ba67a8352e5549479a5661544";
+       version = "1.4.5";
+       sha256 = "e8fba140dc9ca493da92ba57873b54e4488ad63d1a7e6b914b0149338cb52c50";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23015,14 +23109,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-elasticache_1_4_4" = callPackage
+  "amazonka-elasticache_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.4.4";
-       sha256 = "70a1bfb0f6f48d4c7d650c20c0397b6722f9658e59c99b330ad1002bfdaedc2f";
+       version = "1.4.5";
+       sha256 = "6f592d7af0a9b0433ab9332bbfbb84b3b75c27b6a4df45006ff096c261be45bb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23052,14 +23146,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-elasticbeanstalk_1_4_4" = callPackage
+  "amazonka-elasticbeanstalk_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.4.4";
-       sha256 = "ebd1f78511256ff1592e71bd4368308689faec1fbee98d7217436a735cf93270";
+       version = "1.4.5";
+       sha256 = "e3ac291b93b951ab557ff82bed2cbe702e56b8b24e5f95e3330777fb82df59f8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23089,14 +23183,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-elasticsearch_1_4_4" = callPackage
+  "amazonka-elasticsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-elasticsearch";
-       version = "1.4.4";
-       sha256 = "c69aefafbd4a6117fec49da4dac96bf26ac06f82474b6b515f99803f00c87222";
+       version = "1.4.5";
+       sha256 = "bdc5f8bf276fde27b5357048f77b261569cddc1ffe1de2ff1035e436b9255303";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23126,14 +23220,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-elastictranscoder_1_4_4" = callPackage
+  "amazonka-elastictranscoder_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.4.4";
-       sha256 = "1d66ce985ba936e20b13364c672b4e3f017edbeae2ecc5005899f20072844ec7";
+       version = "1.4.5";
+       sha256 = "306760ad72bae83f29cfa574caac2646e3eac6935596d0e7ed66201b8e2c123b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23163,14 +23257,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-elb_1_4_4" = callPackage
+  "amazonka-elb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.4.4";
-       sha256 = "1fac7fd383a58c8455e0de38fbafc9aff7fd6301594adafe3660380f16a63f4f";
+       version = "1.4.5";
+       sha256 = "e6ca6ef93fc988ff9cb4314ff6668f415ea4306d41a5e8c555d6deefd210eb62";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23188,8 +23282,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elbv2";
-       version = "1.4.4";
-       sha256 = "41587adac7111d7fd6e4c913bdb3a135fab0a81b90b8d137f4554043de7a9ba2";
+       version = "1.4.5";
+       sha256 = "fa4c8d492f85be81c2ad3d47f08d464acb7003e9fb003724daa8992de75dd847";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23219,14 +23313,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-emr_1_4_4" = callPackage
+  "amazonka-emr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.4.4";
-       sha256 = "5c9ad06a37ffa2d8c79ad068430c361c7e792f59528846aae18380f75453dcd7";
+       version = "1.4.5";
+       sha256 = "2c99f0be432d535e7e55a958cb6d8c65e9e48dc5f337daf61705aa2de0e924b7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23256,14 +23350,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-gamelift_1_4_4" = callPackage
+  "amazonka-gamelift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-gamelift";
-       version = "1.4.4";
-       sha256 = "bfef8aeb54f867d9c818405082022492c47ff4bcea2239610b51d8529b73707b";
+       version = "1.4.5";
+       sha256 = "e05847758651f3f658c1db3275798deffaabc4eb0ed1e1e2bc87ef1608dc8152";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23293,14 +23387,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-glacier_1_4_4" = callPackage
+  "amazonka-glacier_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.4.4";
-       sha256 = "551f1dd605fcd0d8efc2cf8db2fefd1385eefcbe40aee62ed7991acae8c19b7a";
+       version = "1.4.5";
+       sha256 = "9ca17da801fa3b470796a4285e5d45592005d2d9ec96bb3d9298868535ad52e3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23312,6 +23406,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-health" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-health";
+       version = "1.4.5";
+       sha256 = "ec1def33813329c965a92c4becd7b942750c8da9b1f81b00b673aa676c1e2e61";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Health APIs and Notifications SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-iam" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -23330,14 +23442,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-iam_1_4_4" = callPackage
+  "amazonka-iam_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.4.4";
-       sha256 = "b2911ae52d1476f7109a96c2fc2e1ba58950aae6de57aefc1c4ad0c74be19067";
+       version = "1.4.5";
+       sha256 = "c37c6081febdce459a9683ac9ea22f45161dd86d56f452e2699f819a729068ca";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23367,14 +23479,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-importexport_1_4_4" = callPackage
+  "amazonka-importexport_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.4.4";
-       sha256 = "463e6ad69547306e34848a40382aea4ff187b1fc7e838481b08f9ad5970167df";
+       version = "1.4.5";
+       sha256 = "24b131fbf1af88531c1688541cc357e22cc4cd770a5a691ea59b02bd3959c5ec";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23404,14 +23516,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-inspector_1_4_4" = callPackage
+  "amazonka-inspector_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-inspector";
-       version = "1.4.4";
-       sha256 = "76fe8fc64f948ed26e36c11fe7aa3650bd7f971726a2dbd5215d3be58ff1ba01";
+       version = "1.4.5";
+       sha256 = "8408f9535fbd5c3136a2adc5afb7d698520db7a5577c598c8d7ed02e9d9aa78a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23441,14 +23553,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-iot_1_4_4" = callPackage
+  "amazonka-iot_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iot";
-       version = "1.4.4";
-       sha256 = "fde976b7e41af4cb3d3a6399f0a8e5b76993f11b94381a1fffdafbdc2c67a1bd";
+       version = "1.4.5";
+       sha256 = "bac8bb743fc67bbcd62b2c636c922af58d0866df1859cd266ceda2f1d3d66293";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23478,14 +23590,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-iot-dataplane_1_4_4" = callPackage
+  "amazonka-iot-dataplane_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iot-dataplane";
-       version = "1.4.4";
-       sha256 = "ba3451574fbf7a49ec5f50e5c8479bfb3235db42a792760d01247968412900f5";
+       version = "1.4.5";
+       sha256 = "3b3dc22d05f534fefb163600963793dbcd9d077200255f7ce106fe54f6d4d962";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23515,14 +23627,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-kinesis_1_4_4" = callPackage
+  "amazonka-kinesis_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.4.4";
-       sha256 = "734f9f465eec775faa97f0379933d469ce35c8ac6651bfd47b530ccc3d0c739a";
+       version = "1.4.5";
+       sha256 = "69661eeaf4b9c9e8082d3e576eb705ae8de3c3e90c814f90bc0cbd0e2f1ea24d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23540,8 +23652,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-analytics";
-       version = "1.4.4";
-       sha256 = "fe628e5e65947849c7ec390140144d257bebf994ea2a76ddb6b11eaee69c02a9";
+       version = "1.4.5";
+       sha256 = "36917ed8d951b2cae224f1fd1f41a94741d5a51d7606de11af28f3bb63e5908a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23571,14 +23683,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-kinesis-firehose_1_4_4" = callPackage
+  "amazonka-kinesis-firehose_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kinesis-firehose";
-       version = "1.4.4";
-       sha256 = "33274c4050b98ce89cb5495a92642d9ea99edcff70a2c8e994c6761921a4bef9";
+       version = "1.4.5";
+       sha256 = "fcdccc16e54f79b99d98e32790284ea0d64207bce0e0405e9cfd7632d24ce103";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23608,14 +23720,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-kms_1_4_4" = callPackage
+  "amazonka-kms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.4.4";
-       sha256 = "20537bfd340f26e2f78fde482754e362e2a9369d4697141192c1cd3e759a62ac";
+       version = "1.4.5";
+       sha256 = "8578614ba763ed460f78b55ae975680b43d856a7c57d7380c034097d1c68f0f6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23645,14 +23757,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-lambda_1_4_4" = callPackage
+  "amazonka-lambda_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.4.4";
-       sha256 = "0dd073dd98625b829ed38345f57615f65492158c6731b9ca7522414d24ba9eb3";
+       version = "1.4.5";
+       sha256 = "b210aa40ff787d5c848278609b9a9b4d001f1c0a38b965488e6d416af949cf22";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23664,6 +23776,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-lightsail" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-lightsail";
+       version = "1.4.5";
+       sha256 = "9204a4a4d70e8edd998011a5e3216f269ba291e004d3ad88a343d1c097c3e980";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Lightsail SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-marketplace-analytics" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -23682,14 +23812,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-marketplace-analytics_1_4_4" = callPackage
+  "amazonka-marketplace-analytics_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-marketplace-analytics";
-       version = "1.4.4";
-       sha256 = "0027736e24e0fe98388269a64c8d27fbec52e6c6944241c22a6d9d8dbd191d2d";
+       version = "1.4.5";
+       sha256 = "43d428b51e7a38aac08c64dc2dc01e98021a11b5fa9d178c351808d4f109ab28";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23719,14 +23849,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-marketplace-metering_1_4_4" = callPackage
+  "amazonka-marketplace-metering_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-marketplace-metering";
-       version = "1.4.4";
-       sha256 = "047fa110ee9969017e81b1643dfc653c86efa7cb10999bb2185ebac1a4832397";
+       version = "1.4.5";
+       sha256 = "76144fe48a26014c40ec0fca4f828c9e4b5dfd08f1efc0ffb5b3b1829d8e3cde";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23756,14 +23886,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ml_1_4_4" = callPackage
+  "amazonka-ml_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.4.4";
-       sha256 = "f03c3da79b2e386f5355f2b5f8cab536f739b99aa44865a33876b751de15cd12";
+       version = "1.4.5";
+       sha256 = "579b0d042abdc637d14f394a89b2e192b1c5e1bc82fff1c666e6f5eac9544865";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23793,14 +23923,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-opsworks_1_4_4" = callPackage
+  "amazonka-opsworks_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.4.4";
-       sha256 = "8b15270cfe54ff8ab6f427118771bc26878ac5f21bd2bd0785b74c6736bab2ba";
+       version = "1.4.5";
+       sha256 = "c91802c8bdcf0d259d86b382e5ce1fb25795e73810631f9367d5603afc2f8d34";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23812,6 +23942,60 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-opsworks-cm" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-opsworks-cm";
+       version = "1.4.5";
+       sha256 = "5791722b0bb3783dfc11ddffa284024b5317f3da817040b4a6389b6dec9d29d3";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon OpsWorks for Chef Automate SDK";
+       license = "unknown";
+     }) {};
+
+  "amazonka-pinpoint" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-pinpoint";
+       version = "1.4.5";
+       sha256 = "91267103b0453e5f56ef6e01f24a139ea2c4020a8344cd8664e7958f9ac1bcdd";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Pinpoint SDK";
+       license = "unknown";
+     }) {};
+
+  "amazonka-polly" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-polly";
+       version = "1.4.5";
+       sha256 = "b5d5e2347c9a98daf4182e16a8100c6c1ffe5ed86d9adc69ae888c5aaeb3cec6";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Polly SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-rds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -23831,14 +24015,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-rds_1_4_4" = callPackage
+  "amazonka-rds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.4.4";
-       sha256 = "dbc9ae2a6945ee1cad0c7ac0df9557dd362648b0ee8b73ccfc7e7da79f732f30";
+       version = "1.4.5";
+       sha256 = "8377e03b84e6d8d8ec2417046ce3d67bc052632fc05d92f2f6299e6808c2a30b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23868,14 +24052,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-redshift_1_4_4" = callPackage
+  "amazonka-redshift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.4.4";
-       sha256 = "1329dfc9055b46d1539a871d2c148760f1f62802a2d7b3d4253aacd91b7caa2d";
+       version = "1.4.5";
+       sha256 = "b7ecd60b51ff6b28d3435ef716485a2ebb1e3863a13cdb90b4ceb2ec65ffa84a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23887,6 +24071,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-rekognition" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-rekognition";
+       version = "1.4.5";
+       sha256 = "a6c3aec679aa4b7c4484644b22738fb9611dffe72c38fd80ecf1c19c067a25be";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Rekognition SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-route53" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -23905,15 +24107,15 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-route53_1_4_4" = callPackage
+  "amazonka-route53_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.4.4";
-       sha256 = "74cb1fa132aa0888c8c12acd1aca4e87360ae4a238052dcf21fc3070a10d609d";
-       libraryHaskellDepends = [ amazonka-core base ];
+       version = "1.4.5";
+       sha256 = "68f49826d8f594abc99311081a9d8224f6e79457e6118c5bc7a55bd4aed8425d";
+       libraryHaskellDepends = [ amazonka-core base text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
@@ -23942,14 +24144,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-route53-domains_1_4_4" = callPackage
+  "amazonka-route53-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.4.4";
-       sha256 = "bbcdbda4a0f0a7bc408e033183bc46cc680b121d43d2ad44a66b07c70195a6f1";
+       version = "1.4.5";
+       sha256 = "1fb74290a0c019f4dfa1fba75b553efd90c440fb3f4a89fba66dd5ec7ad4fd3d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -23979,14 +24181,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-s3_1_4_4" = callPackage
+  "amazonka-s3_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , lens, tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.4.4";
-       sha256 = "bd32c46e99cca9c1acf6647813975411c5fec92690982fc2e00881da58759435";
+       version = "1.4.5";
+       sha256 = "78297e966eac3ba9045612c8e09d3e6e34c83b5dfb3d59e489edc7cd3a2fe4ad";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24016,14 +24218,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-sdb_1_4_4" = callPackage
+  "amazonka-sdb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.4.4";
-       sha256 = "eae1f14a0ae2e0ea39ed9a1212d63fe9d7262e01d05bce8869b83525e690c58d";
+       version = "1.4.5";
+       sha256 = "fdec685f8184680eaea76456db18cd552ccb77fd40e941d3590f2f57f2bec6b2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24041,8 +24243,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-servicecatalog";
-       version = "1.4.4";
-       sha256 = "6d2766375d3ed2b0f3b4f4604eab62887a23a7ecd64c1a8c8ed5411a1af0432a";
+       version = "1.4.5";
+       sha256 = "a5e0106a155a5bd51ac6bb8f2d1037419a621fe5402f2a0888399bb98f74d6e7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24072,14 +24274,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ses_1_4_4" = callPackage
+  "amazonka-ses_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.4.4";
-       sha256 = "ceb5a1d20b2b2a2b5cbb6e54a731f82902552c01f5b7406cedd469256e74ec56";
+       version = "1.4.5";
+       sha256 = "a30f23624dcba2d779dc67a13e9b6f9092f7526e1bf54290fdd0684ae42e1329";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24091,14 +24293,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-shield" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-shield";
+       version = "1.4.5";
+       sha256 = "8c2ec2c561fca8653d33136d0f93f6dc4cd4de1b15a0cc00e5eb0ec9d7242fdc";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Shield SDK";
+       license = "unknown";
+     }) {};
+
+  "amazonka-sms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sms";
+       version = "1.4.5";
+       sha256 = "4a6ffbf02c58db9928517f48d392d7068a5439b39a7a119a727a9c6dd7b0da78";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Server Migration Service SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-snowball" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-snowball";
-       version = "1.4.4";
-       sha256 = "d66c1d7ed36ff62a79a973ba9afbd2e050933d59350bfc65e7fc0a59d7b26103";
+       version = "1.4.5";
+       sha256 = "e27f2c73800874531269dae80e823575ac71820453f1b8c6e406d542ed831e1e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24128,14 +24366,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-sns_1_4_4" = callPackage
+  "amazonka-sns_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.4.4";
-       sha256 = "335f380c3579f139ab5deff522fbfd07398ba6019214923e92657b322a8eadef";
+       version = "1.4.5";
+       sha256 = "e875c23e6a55cb9753d84f1dab58a39728b9c1ec6b1834db8b5b5d150f888681";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24166,14 +24404,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-sqs_1_4_4" = callPackage
+  "amazonka-sqs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.4.4";
-       sha256 = "cfd9c9d4ee269a36a9f05f4fae6261f8707fcf43d738b57758bdbf43a9eff466";
+       version = "1.4.5";
+       sha256 = "90a38f27bdbe229300cf4a64a253078e51703ad76eb799b597f2ff580fac52dd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24203,25 +24441,43 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-ssm_1_4_4" = callPackage
+  "amazonka-ssm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.4.4";
-       sha256 = "fdf85f55da22e55c8569b2f5149e7f45acd99a6d3bd656d42977f8885a3e727f";
+       version = "1.4.5";
+       sha256 = "fbd16ca62f55f53904e78db6e6e3832b94b84541ca22271cd73c51ab7150df52";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
        homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Systems Management Service SDK";
+       description = "Amazon Simple Systems Manager (SSM) SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-stepfunctions" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-stepfunctions";
+       version = "1.4.5";
+       sha256 = "990379c5baff3e530eea53dbd00a43bf49868d81bdc4abd057e6d9ea6ef05218";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Step Functions SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -24240,14 +24496,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-storagegateway_1_4_4" = callPackage
+  "amazonka-storagegateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.4.4";
-       sha256 = "5375ce7683cd502795f810dbefd8207b823b1d74a63a29f1f3b9c3bd1bf458c7";
+       version = "1.4.5";
+       sha256 = "8cdf92d74e7911efabb6cc67bbcdaecbcf71363fc1277b5eb1cadc8c4cf21aeb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24277,14 +24533,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-sts_1_4_4" = callPackage
+  "amazonka-sts_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.4.4";
-       sha256 = "5eac6f9cb9b5710cf24fdae9f46362d05ae3f1d14a791c7439653b6f2a3f9b9f";
+       version = "1.4.5";
+       sha256 = "b83baf2122c0c30f52a5e7f9d896b2d9b623ed768e61bf7e9d246534f36de3d5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24314,14 +24570,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-support_1_4_4" = callPackage
+  "amazonka-support_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.4.4";
-       sha256 = "162469b9af326e2a6003a86783fb9275e6ba7c402452c200e94380bbd83455e2";
+       version = "1.4.5";
+       sha256 = "135f841dfa793226d7b5d166dfa1d8f0c4fce632228329052178389791db8e2b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24351,14 +24607,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-swf_1_4_4" = callPackage
+  "amazonka-swf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.4.4";
-       sha256 = "f99a09b5d58a125c2cf3f52a2e20fec1b8d5f9b1aac40e01ee4f53872c67f574";
+       version = "1.4.5";
+       sha256 = "4397c168cb7bb864e8819ac12e76b9b86885721fda9bc97f42bd6482d7279928";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24392,7 +24648,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-test_1_4_4_2" = callPackage
+  "amazonka-test_1_4_5" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
      , http-types, process, resourcet, tasty, tasty-hunit
@@ -24401,8 +24657,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.4.4.2";
-       sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46";
+       version = "1.4.5";
+       sha256 = "988872cbcd4b102f1fd45a5160b81026087bf4eec1c982dcaaa3df8296b75e3a";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types process
@@ -24433,14 +24689,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-waf_1_4_4" = callPackage
+  "amazonka-waf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-waf";
-       version = "1.4.4";
-       sha256 = "8a3b59a42d1344cd48418764b17afabacdc1720247af144f332282e41104e88b";
+       version = "1.4.5";
+       sha256 = "fdc63d12726b015627b135539c732116e96b947be9a774df72ee1d1646cff155";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24470,14 +24726,14 @@ self: {
        license = "unknown";
      }) {};
 
-  "amazonka-workspaces_1_4_4" = callPackage
+  "amazonka-workspaces_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.4.4";
-       sha256 = "ea89d4cd168dec09787c276ede32ce85536d46e15c88a3fcfe5b3205303307e7";
+       version = "1.4.5";
+       sha256 = "356c5f0267aa61f4cc3181a8719f7e3a3d9244c473c728aaaba0b4babcb7a7df";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24489,6 +24745,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-xray" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-xray";
+       version = "1.4.5";
+       sha256 = "e133389857343433d017950ec6b9c853d884d391b91986691f9e6afeeecee250";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon X-Ray SDK";
+       license = "unknown";
+     }) {};
+
   "amby" = callPackage
     ({ mkDerivation, base, bytestring, cassava, Chart, Chart-cairo
      , Chart-diagrams, colour, containers, data-default
@@ -25897,6 +26171,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apply-refact_0_3_0_1" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+     , silently, syb, tasty, tasty-expected-failure, tasty-golden
+     , temporary, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.3.0.1";
+       sha256 = "1754bd300db92fdf668d4698af053d4da686512264275478946b7e0710c5e814";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filemanip ghc ghc-exactprint mtl process
+         refact syb temporary transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact syb temporary transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact silently syb tasty
+         tasty-expected-failure tasty-golden temporary transformers
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apportionment" = callPackage
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
@@ -26044,8 +26350,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.10";
-       sha256 = "cc58ebe8508c682f783b238652f0415958c948b4957854624c4f23c131b0fcc2";
+       version = "0.9.0.11";
+       sha256 = "9133fb9cc88568c3baec403e674e95cfe0ebedc1ff974499d97e93d916bdefef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -28227,6 +28533,8 @@ self: {
        pname = "avers";
        version = "0.0.17.0";
        sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
+       revision = "1";
+       editedCabalFile = "76f5fea6b94a6dd6041577fd29de245130f3003c73296a94baea62f066b9b474";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -28270,6 +28578,8 @@ self: {
        pname = "avers-api-docs";
        version = "0.0.17.0";
        sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f";
+       revision = "1";
+       editedCabalFile = "cfd40f6559ac3e05f5d0da009454b18208e7b76ec87a15fa7311d4f0a7caf7ec";
        libraryHaskellDepends = [
          aeson avers avers-api base cookie lens servant servant-swagger
          swagger2 text unordered-containers
@@ -28291,6 +28601,8 @@ self: {
        pname = "avers-server";
        version = "0.0.17.0";
        sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c";
+       revision = "1";
+       editedCabalFile = "8fb371992bc5535a3d923ec6e16e975ac3d5efaadbb1ae8d4e08400b318f92dc";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
          bytestring-conversion containers cookie cryptonite either
@@ -29040,8 +29352,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.21";
-       sha256 = "a7db049d73b0800399cef22fa016932cd5699d6faf9f6056a350eae1952f6cb4";
+       version = "0.5.30";
+       sha256 = "27e1437813bc55f173251c3e38f8de81fdc31ebb0f0ae59f10c954ce4cc4c071";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29498,10 +29810,8 @@ self: {
      }:
      mkDerivation {
        pname = "barrier";
-       version = "0.1.0";
-       sha256 = "9f7c56af995b47791ee0ffa69c27d3de0b895125dbd5fe0c84d8b621467f90ba";
-       revision = "2";
-       editedCabalFile = "bcb912e8105f792720b8515ddf9b37d6a1eecd17cb325cc40bd688641068e9e6";
+       version = "0.1.1";
+       sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9";
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -30580,6 +30890,8 @@ self: {
        pname = "bifunctors";
        version = "5.4.1";
        sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87";
+       revision = "1";
+       editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505";
        libraryHaskellDepends = [
          base base-orphans comonad containers semigroups tagged
          template-haskell transformers transformers-compat
@@ -31176,8 +31488,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary-tagged";
-       version = "0.1.4.1";
-       sha256 = "86ae562f528dd85e1d87f2e4c886be168e1b1dd78c42e22ae3e9bf36ff879acd";
+       version = "0.1.4.2";
+       sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -33255,28 +33567,6 @@ self: {
      }) {};
 
   "blaze-html" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
-       version = "0.8.1.2";
-       sha256 = "f7ee92b38112e939bf251530afb7385a1588a8a6c929f409492dfde7b67ef2b7";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-markup bytestring text
-       ];
-       testHaskellDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-html_0_8_1_3" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -33296,7 +33586,6 @@ self: {
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -33369,25 +33658,6 @@ self: {
      }) {};
 
   "blaze-markup" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
-       version = "0.7.1.0";
-       sha256 = "62ce7977b68873eda328c4e8e3c2034102a49718d63631a6dc76abf479b7c6ba";
-       libraryHaskellDepends = [ base blaze-builder bytestring text ];
-       testHaskellDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-markup_0_7_1_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
@@ -33404,7 +33674,6 @@ self: {
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-shields" = callPackage
@@ -34051,8 +34320,8 @@ self: {
      }:
      mkDerivation {
        pname = "bookkeeper";
-       version = "0.2.3";
-       sha256 = "7aa2a2a42ed03eee2eccc96ed63cfa3b090f55dd432936dc801cd331b684f5b6";
+       version = "0.2.4";
+       sha256 = "0f75317b35b8c4984fd9e1c0f3a33179387648b1aad33efc7a00d0cc0b7e1f9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34390,17 +34659,17 @@ self: {
      }) {};
 
   "bower-json" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring, mtl
-     , scientific, tasty, tasty-hunit, text, transformers
+    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
+     , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "bower-json";
-       version = "0.8.0";
-       sha256 = "ee8efa507020dc3f7439849a3662d6bbc72dfec8c1ae8d158e75546138dff3cf";
+       version = "0.8.1";
+       sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f";
        libraryHaskellDepends = [
-         aeson aeson-better-errors base bytestring mtl scientific text
-         transformers unordered-containers vector
+         aeson aeson-better-errors base bytestring deepseq mtl scientific
+         text transformers unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring tasty tasty-hunit text unordered-containers
@@ -34596,8 +34865,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.14";
-       sha256 = "5cccff3f432593ad50288e66a78a115c5e030bbb3aca37c332a914d6743bcc81";
+       version = "0.15.2";
+       sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
        libraryHaskellDepends = [
          base containers contravariant data-default deepseq microlens
          microlens-mtl microlens-th template-haskell text text-zipper
@@ -35314,8 +35583,8 @@ self: {
     ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }:
      mkDerivation {
        pname = "bytestring-arbitrary";
-       version = "0.1.0";
-       sha256 = "248378d6a7b75e8b9cbadcb3793ddcb17bd1ef7b36ffce02dc99ff11ef49c92b";
+       version = "0.1.1";
+       sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd";
        libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
@@ -35415,24 +35684,6 @@ self: {
      }) {};
 
   "bytestring-handle" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "bytestring-handle";
-       version = "0.1.0.4";
-       sha256 = "3083c6434a6ec552c6c29030f7b2c44b53dead5f05f4a8363e3c350552ffbe60";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
-       description = "ByteString-backed Handles";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bytestring-handle_0_1_0_5" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
@@ -35448,7 +35699,6 @@ self: {
        homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -35583,6 +35833,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-time" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec
+     , QuickCheck, text, time
+     }:
+     mkDerivation {
+       pname = "bytestring-time";
+       version = "0.1.0";
+       sha256 = "824afd4536f2062ffb16169b0989dc26890a83cd1515dff34e33b826608a7603";
+       libraryHaskellDepends = [ attoparsec base bytestring text time ];
+       testHaskellDepends = [
+         attoparsec base bytestring Cabal hspec QuickCheck text time
+       ];
+       homepage = "https://github.com/klangner/bytestring-time";
+       description = "Library for Time parsing from ByteString";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bytestring-tree-builder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring
      , quickcheck-instances, semigroups, tasty, tasty-hunit
@@ -35972,8 +36239,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.35.5";
-       sha256 = "7cd914109290b09c8269a42809cb0d0c29d5e9f9dec8226333d2e3179bb8c381";
+       version = "4.35.6";
+       sha256 = "8ef80d1bc5b3085475c3486c900defb0aeae2ef5ff23bf6d41653d12a3e7e4de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36045,21 +36312,6 @@ self: {
      }) {};
 
   "cabal-file-th" = callPackage
-    ({ mkDerivation, base, Cabal, directory, template-haskell }:
-     mkDerivation {
-       pname = "cabal-file-th";
-       version = "0.2.3";
-       sha256 = "2866e1bea82f5873423411bec9dbded2e4cc878ad7d05108c1339b62cbda5c4d";
-       revision = "1";
-       editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e";
-       libraryHaskellDepends = [ base Cabal directory template-haskell ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/nkpart/cabal-file-th";
-       description = "Template Haskell expressions for reading fields from a project's cabal file";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-file-th_0_2_4" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
      mkDerivation {
@@ -36073,7 +36325,6 @@ self: {
        homepage = "http://github.com/nkpart/cabal-file-th";
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-ghc-dynflags" = callPackage
@@ -36186,10 +36437,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.24.0.1";
-       sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc";
-       revision = "1";
-       editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797";
+       version = "1.24.0.2";
+       sha256 = "2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -36412,24 +36661,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.10.0";
-       sha256 = "b516bd0850bd1433bd5bba7e93d98c6fe22ea785aa0d640584208d9c22437112";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_10_1" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, old-locale
      , process, time, unix
      }:
@@ -36445,7 +36676,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -38481,29 +38711,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.2.1.0";
-       sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19";
-       revision = "1";
-       editedCabalFile = "96e6564d03d1aa6a47aba589a085374b0c50a85af96ed56d1f884774905c0359";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       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-client_0_2_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -40600,38 +40807,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.0.1";
-       sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude_1_0_2" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
      , hashable, hspec, lifted-async, lifted-base, monad-unlift
@@ -40664,28 +40839,6 @@ self: {
      }) {};
 
   "classy-prelude-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, conduit
-     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.0.1";
-       sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c";
-       libraryHaskellDepends = [
-         base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet transformers void
-       ];
-       testHaskellDepends = [
-         base bytestring conduit hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-conduit_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
      , transformers, void
@@ -40708,26 +40861,6 @@ self: {
      }) {};
 
   "classy-prelude-yesod" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude
-     , classy-prelude-conduit, data-default, http-conduit, http-types
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.0.1";
-       sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53";
-       libraryHaskellDepends = [
-         aeson base classy-prelude classy-prelude-conduit data-default
-         http-conduit http-types persistent yesod yesod-newsfeed
-         yesod-static
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-yesod_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -40751,8 +40884,8 @@ self: {
     ({ mkDerivation, base, template-haskell, type-list }:
      mkDerivation {
        pname = "classyplate";
-       version = "0.2.0.0";
-       sha256 = "962081fdb262da338d9e1076cb6ac21a75a6230f641301f06580de88cf796188";
+       version = "0.3.0.0";
+       sha256 = "a422c975aa2e1fd56ad44261f45023d555a777a81bee672de547c7b7ff7c4bc6";
        libraryHaskellDepends = [ base template-haskell type-list ];
        description = "Fuseable type-class based generics";
        license = stdenv.lib.licenses.bsd3;
@@ -41265,6 +41398,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clit" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+     , http-client, http-client-tls, http-types, optparse-applicative
+     , split
+     }:
+     mkDerivation {
+       pname = "clit";
+       version = "0.1.0.0";
+       sha256 = "7845c4a1d58becddb4683fa2972e3aa40eb62ca43d63e7c9b63905666af23c6b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base bytestring http-client
+         http-client-tls http-types optparse-applicative split
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/command-line-tweeter#readme";
+       description = "Post tweets that you pipe to stdin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cloben" = callPackage
     ({ mkDerivation, base, foldl, process, system-filepath, temporary
      , text, turtle
@@ -42108,8 +42262,8 @@ self: {
      }:
      mkDerivation {
        pname = "coin";
-       version = "1.1.1";
-       sha256 = "e020b0b4f31586832db5e56e0d757d60546071d2ca7bfef1f451d154f02486a2";
+       version = "1.2";
+       sha256 = "d046c554fbb2111641744507625518b8a3b012fcbe8c7a88e3ce971291f47907";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42304,6 +42458,8 @@ self: {
        pname = "collections-api";
        version = "1.0.0.0";
        sha256 = "b4dc47ec1552b66e69a465e9f974c8afab914b6a85f8214398969b1daf0efc6d";
+       revision = "2";
+       editedCabalFile = "b497904367aafbe7949dfa846aa34eec27b9ee99bc61ee2f665d48fdf83e7d1c";
        libraryHaskellDepends = [ array base QuickCheck ];
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
@@ -42429,8 +42585,10 @@ self: {
      }:
      mkDerivation {
        pname = "colour-space";
-       version = "0.1.1.0";
-       sha256 = "1dcb84098dfbe7389e4794fef80e629a95cc3607f5277092965f8a4604152339";
+       version = "0.1.2.0";
+       sha256 = "963b04b703a2d5f273ffc43b3687e6d58afed144eef47d4070b0bdec6f3bd3e5";
+       revision = "1";
+       editedCabalFile = "54a4d19227a0e550ad5c89295596d5c8b3b3d8d9ffd0b1f937ca48198ce6e7ad";
        libraryHaskellDepends = [
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
@@ -43789,34 +43947,6 @@ self: {
      }) {};
 
   "conduit-combinators" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
-       version = "1.0.8.2";
-       sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_0_8_3" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, chunked-data, conduit, conduit-extra, containers
      , directory, filepath, hspec, monad-control, mono-traversable, mtl
@@ -43842,7 +43972,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -44051,6 +44180,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conf-json" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, directory, hspec
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "conf-json";
+       version = "1.1";
+       sha256 = "3d870c1fade614cac69169404ea6b1d6318a8026e121a14937a0e8e74ca1fe49";
+       revision = "6";
+       editedCabalFile = "8e300dbe34fc4677039940c6d91fb746a086097b276356b43019fecf24fadbb7";
+       libraryHaskellDepends = [ aeson base bytestring directory ];
+       testHaskellDepends = [
+         aeson base binary bytestring directory hspec QuickCheck
+       ];
+       homepage = "https://github.com/ciez/conf-json";
+       description = "read, parse json config";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "conffmt" = callPackage
     ({ mkDerivation, base, language-conf, megaparsec
      , optparse-applicative, pretty, text
@@ -44439,12 +44587,12 @@ self: {
      }) {};
 
   "console-style" = callPackage
-    ({ mkDerivation, base, mtl, semigroups, transformers }:
+    ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "console-style";
-       version = "0.0.2.0";
-       sha256 = "5e6e372560a61bcd882af5f8255e6c3fbe4d28e8ad459e3dc9c28853ef809f5c";
-       libraryHaskellDepends = [ base mtl semigroups transformers ];
+       version = "0.0.2.1";
+       sha256 = "6d818ea841d7acfe6c42cc3fc7751e324656abfd0509ce470bc8bdbf52d1bd7f";
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/minad/console-style#readme";
        description = "Styled console text output using ANSI escape sequences";
        license = stdenv.lib.licenses.mit;
@@ -45742,15 +45890,15 @@ self: {
      }) {};
 
   "countable-inflections" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-light
-     , QuickCheck, text
+    ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-utils
+     , QuickCheck, regex-pcre-builtin, text
      }:
      mkDerivation {
        pname = "countable-inflections";
-       version = "0.1.0";
-       sha256 = "24bb1f350cfbab09c8de1ededab28f138038d04c86e3614d8dc8514f8c8f1db9";
+       version = "0.2.0";
+       sha256 = "1ee92bece3c2bbf153dac013ee854fe8132702ee74cb61c07e7999ca1e35496d";
        libraryHaskellDepends = [
-         base bytestring exceptions pcre-light text
+         base bytestring exceptions pcre-utils regex-pcre-builtin text
        ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/tippenein/countable-inflections";
@@ -47145,6 +47293,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "crypto-rng" = callPackage
+    ({ mkDerivation, base, bytestring, crypto-api, DRBG, exceptions
+     , monad-control, mtl, transformers-base
+     }:
+     mkDerivation {
+       pname = "crypto-rng";
+       version = "0.1.0.0";
+       sha256 = "cde72050adb3c430de86c9c830d9fe9255ab857285c35adc20bded58f3df12cc";
+       libraryHaskellDepends = [
+         base bytestring crypto-api DRBG exceptions monad-control mtl
+         transformers-base
+       ];
+       homepage = "https://github.com/scrive/crypto-rng";
+       description = "Cryptographic random number generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "crypto-simple" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }:
      mkDerivation {
@@ -47480,8 +47645,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.6.0";
-       sha256 = "08d43d6d701b85ffa3617c8142e23a32daef3156a704b0d30d892e1beb875424";
+       version = "0.6.1";
+       sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -50469,16 +50634,16 @@ self: {
 
   "datasets" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, directory
-     , file-embed, filepath, hashable, HTTP, stringsearch, text, time
-     , vector
+     , file-embed, filepath, hashable, microlens, stringsearch, text
+     , time, vector, wreq
      }:
      mkDerivation {
        pname = "datasets";
-       version = "0.2.1";
-       sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277";
+       version = "0.2.2";
+       sha256 = "d79ae10e42a208a4413f8b4851c18cff671ec0f578108f2f71bbf7cba215f127";
        libraryHaskellDepends = [
          aeson base bytestring cassava directory file-embed filepath
-         hashable HTTP stringsearch text time vector
+         hashable microlens stringsearch text time vector wreq
        ];
        homepage = "https://github.com/glutamate/datasets";
        description = "Classical data sets for statistics and machine learning";
@@ -51397,15 +51562,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "declarative_0_3_3" = callPackage
+  "declarative_0_3_4" = callPackage
     ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
      , mighty-metropolis, mwc-probability, pipes, primitive
      , speedy-slice, transformers
      }:
      mkDerivation {
        pname = "declarative";
-       version = "0.3.3";
-       sha256 = "77d14c47453135ed727b0e8323244a68bb10b74a6c4bdaf5e24eb8a619683dee";
+       version = "0.3.4";
+       sha256 = "4d731ea4199f322fa8028a44ed3e5155e2ae58f27542f1e8a8f0ee4116ec226b";
        libraryHaskellDepends = [
          base hasty-hamiltonian lens mcmc-types mighty-metropolis
          mwc-probability pipes primitive speedy-slice transformers
@@ -52269,10 +52434,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.0.4";
-       sha256 = "eb45d84603824334442b68ef07eb107d1b7ccd69e17161ef2a7fc5b5b4df339a";
-       revision = "1";
-       editedCabalFile = "7b6e8b2dc9d542e818d131d4f6e52a14fed5dce75c20855b7f2d21ab51b74608";
+       version = "0.1.0.6";
+       sha256 = "692a0f29e0959a51d3159f6ca0bb2c9d95fd38cc2ed9d8d26b242f998dd9b012";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
@@ -52346,6 +52509,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_3_5" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged
+     , template-haskell, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.3.5";
+       sha256 = "0a165c8eeb78349ded41cf51750753cdd0e25c139171789f7a4b0c6be4ccd231";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -52571,6 +52757,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dhall" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , http-client, http-client-tls, microlens, microlens-mtl
+     , neat-interpolation, optparse-generic, parsers, system-fileio
+     , system-filepath, text, text-format, transformers, trifecta
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "dhall";
+       version = "1.0.1";
+       sha256 = "4bc7a6e0de32900ac64b58024ea989c3afaeab0f9a3e1256a04090eb6233b428";
+       revision = "1";
+       editedCabalFile = "a149e10771a65c573ffb2c9ed1c6694f11392590a36d60a9b1c48f02d0e9e77c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring containers http-client
+         http-client-tls microlens microlens-mtl neat-interpolation parsers
+         system-fileio system-filepath text text-format transformers
+         trifecta unordered-containers vector
+       ];
+       executableHaskellDepends = [ base optparse-generic text trifecta ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dia-base" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -53097,6 +53309,8 @@ self: {
        pname = "diagrams-pgf";
        version = "1.4";
        sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687";
+       revision = "1";
+       editedCabalFile = "831aa29cc0f758091f2a7a288537b305dec5a846d178f8c55e31d37f33bc75b8";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -53352,8 +53566,8 @@ self: {
      }:
      mkDerivation {
        pname = "dib";
-       version = "0.5.0";
-       sha256 = "2f4a58c4a97c55bed558fee3be61886e05d55cd560f13d98f5cdce4d8ddbe294";
+       version = "0.6.1";
+       sha256 = "3465169e4968fb9b6c0bbd5f283e1778e429dd33005494707c3945fc6b9deb78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53910,8 +54124,8 @@ self: {
     ({ mkDerivation, base, numtype-tf, time }:
      mkDerivation {
        pname = "dimensional-tf";
-       version = "0.3.0.3";
-       sha256 = "50081bf621515ee7fbe54f7aac45b0f3df7433dcc6ba681e0ca418f0cd17b110";
+       version = "0.3.0.4";
+       sha256 = "818bed66794f5669ddadb74887542ebe87df474d436f2ae0903b063909574d14";
        libraryHaskellDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
@@ -54130,8 +54344,8 @@ self: {
      }:
      mkDerivation {
        pname = "direct-sqlite";
-       version = "2.3.18";
-       sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d";
+       version = "2.3.19";
+       sha256 = "f47e9b99888ddd9e3f3811a575590cbc35f4e41f0897f01f0d0b9b44c2e6eb3c";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
@@ -54158,12 +54372,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_7_1" = callPackage
+  "directory_1_3_0_0" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.7.1";
-       sha256 = "cf3c0984238ac5bb67706b03f86f823feb50d46092ed6ec6e523b89a1d0836cf";
+       version = "1.3.0.0";
+       sha256 = "369cd8212b0167b48ea7ad1f44a4ae7648286af21449bd816492ced03fbdd387";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -54439,6 +54653,8 @@ self: {
        pname = "distributed-process";
        version = "0.6.6";
        sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0";
+       revision = "1";
+       editedCabalFile = "5958661e4bceb18f38e9eb9828a58d1c811102f84a74376d7b18b88cde8ba1e7";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -54563,8 +54779,8 @@ self: {
        pname = "distributed-process-execution";
        version = "0.1.2.2";
        sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5";
-       revision = "1";
-       editedCabalFile = "c7fad93838da34d675ea6484d0697e437ab3453d580e9759fa0c5bd66f86d7bf";
+       revision = "2";
+       editedCabalFile = "cfd179986e0282f924ce5d7977a44fa31cc8de3115a5de842b9151f11b0578a2";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -54598,8 +54814,8 @@ self: {
        pname = "distributed-process-extras";
        version = "0.2.1.2";
        sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
-       revision = "1";
-       editedCabalFile = "5f287b8a5c2d4460cc101fd2b96d116fa74876b894f8ae5ab44b925af5f233d6";
+       revision = "2";
+       editedCabalFile = "e487c5799fa82b7e6b88ddf2d58e21d9add876a967b2820f502ac5c5307aec31";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -55158,6 +55374,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dmc" = callPackage
+    ({ mkDerivation, base, hspec, process, QuickCheck }:
+     mkDerivation {
+       pname = "dmc";
+       version = "1.1";
+       sha256 = "76467975ce4b2e65ae67c42e84a78fd995655f39754595e920b903b13009c2ae";
+       revision = "2";
+       editedCabalFile = "a6e8ae3524d68892f9bd71b80c0cb52f4ef0c11ec7212b554f63e25ae65afde6";
+       libraryHaskellDepends = [ base process ];
+       testHaskellDepends = [ base hspec process QuickCheck ];
+       homepage = "https://github.com/ciez/dmc";
+       description = "cmd: run shell commands from code";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "dmenu" = callPackage
     ({ mkDerivation, base, containers, directory, lens, mtl, process
      , transformers
@@ -55673,25 +55904,16 @@ self: {
      }) {};
 
   "dominion" = callPackage
-    ({ mkDerivation, base, hscolour, hspec, lens, mtl, random
-     , random-extras, random-fu, transformers
-     }:
+    ({ mkDerivation, base, containers, hspec, lens, mtl, random }:
      mkDerivation {
        pname = "dominion";
-       version = "0.1.0.4";
-       sha256 = "be25f1fb393288603a619b5fd26b25b05c756726c8f5ee69f447cea61250d78f";
+       version = "0.1.1.0";
+       sha256 = "bea01160caf8636409a3f07f3021c310ee81b67d6037fd62d533993ee746b112";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [
-         base hscolour lens mtl random random-extras random-fu transformers
-       ];
-       executableHaskellDepends = [
-         base hscolour lens mtl random random-extras random-fu transformers
-       ];
-       testHaskellDepends = [
-         base hscolour hspec lens mtl random random-extras random-fu
-         transformers
-       ];
+       libraryHaskellDepends = [ base containers lens mtl random ];
+       executableHaskellDepends = [ base containers lens mtl random ];
+       testHaskellDepends = [ base containers hspec lens mtl random ];
        homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
@@ -55873,6 +56095,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "double-conversion_2_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "double-conversion";
+       version = "2.0.2.0";
+       sha256 = "44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b";
+       libraryHaskellDepends = [ base bytestring ghc-prim text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       homepage = "https://github.com/bos/double-conversion";
+       description = "Fast conversion between double precision floating point and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "double-metaphone" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -56937,23 +57178,24 @@ self: {
   "dynamic-plot" = callPackage
     ({ mkDerivation, base, colour, colour-space, constrained-categories
      , containers, data-default, deepseq, diagrams-cairo, diagrams-core
-     , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens
-     , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl
-     , process, random, semigroups, tagged, time, transformers, vector
-     , vector-space
+     , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk
+     , JuicyPixels, lens, linearmap-category, manifold-random, manifolds
+     , MemoTrie, mtl, process, random, random-fu, semigroups, tagged
+     , time, transformers, vector, vector-space
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.2.0.0";
-       sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528";
+       version = "0.2.1.0";
+       sha256 = "8d75d0d068f801f2da0199738b43261966f265f62f58b3ad9f5b33e7c7158999";
        revision = "1";
-       editedCabalFile = "a527e3da82b5b147ba9cfed25526a2a34eb07cd42710dbea9aee590a15d88fed";
+       editedCabalFile = "d2d367212ca5c730e629b14d04a12eccc8bee0d3bead4f16c7db230507753c4e";
        libraryHaskellDepends = [
          base colour colour-space constrained-categories containers
          data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
-         diagrams-lib free-vector-spaces glib gtk lens linearmap-category
-         manifolds MemoTrie MonadRandom mtl process random semigroups tagged
-         time transformers vector vector-space
+         diagrams-lib free-vector-spaces glib gtk JuicyPixels lens
+         linearmap-category manifold-random manifolds MemoTrie mtl process
+         random random-fu semigroups tagged time transformers vector
+         vector-space
        ];
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
@@ -56998,6 +57240,34 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "dynamodb-simple" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
+     , base, bytestring, conduit, containers, double-conversion
+     , exceptions, generics-sop, hashable, hspec, lens, monad-loops
+     , monad-supply, safe-exceptions, scientific, semigroups, tagged
+     , template-haskell, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "dynamodb-simple";
+       version = "0.2.0.0";
+       sha256 = "d1fbc3a6f4df1b8a8a5125227e3492299cca6b88cec6b24d838ade5f081406b9";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-dynamodb base bytestring
+         conduit containers double-conversion exceptions generics-sop
+         hashable lens monad-loops monad-supply scientific semigroups tagged
+         template-haskell text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         amazonka amazonka-dynamodb base conduit containers hashable hspec
+         lens safe-exceptions semigroups tagged text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/ondrap/dynamodb-simple";
+       description = "Typesafe library for working with DynamoDB database";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dynobud" = callPackage
     ({ mkDerivation, aeson, base, binary, casadi-bindings
      , casadi-bindings-core, cereal, containers, data-default-class
@@ -57166,6 +57436,9 @@ self: {
        pname = "easyrender";
        version = "0.1.1.2";
        sha256 = "303d5f310105be9afd27382134ff4d7802a899f980192953f46a9602ae2aa616";
+       revision = "1";
+       editedCabalFile = "26ce39b96e803d7176fd787298a8dd123f80bc67165bddda9bbb722dfa4bfd3e";
+       setupHaskellDepends = [ base superdoc ];
        libraryHaskellDepends = [
          base bytestring containers mtl superdoc zlib
        ];
@@ -57175,6 +57448,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "easytensor" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "easytensor";
+       version = "0.1.0.0";
+       sha256 = "7ff2225d2081f0151f64cc53cea036f02188e278ba005b1e561e0d1701f0b031";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim ];
+       executableHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/achirkin/easytensor#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ebeats" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -57367,30 +57656,6 @@ self: {
      }) {};
 
   "ede" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors
-     , bytestring, comonad, directory, filepath, free, lens, mtl
-     , parsers, scientific, semigroups, tasty, tasty-golden, text
-     , text-format, text-manipulate, trifecta, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "ede";
-       version = "0.2.8.5";
-       sha256 = "899e146093fc5353f6e86130898e2396d39c5365a412e67a8435252e8a4f2fb3";
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base bifunctors bytestring comonad directory
-         filepath free lens mtl parsers scientific semigroups text
-         text-format text-manipulate trifecta unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring directory tasty tasty-golden text
-       ];
-       homepage = "http://github.com/brendanhay/ede";
-       description = "Templating language with similar syntax and features to Liquid or Jinja2";
-       license = "unknown";
-     }) {};
-
-  "ede_0_2_8_6" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors
      , bytestring, comonad, directory, filepath, free, lens, mtl
      , parsers, scientific, semigroups, tasty, tasty-golden, text
@@ -57412,7 +57677,6 @@ self: {
        homepage = "http://github.com/brendanhay/ede";
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edenmodules" = callPackage
@@ -58353,6 +58617,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "elm-export-persistent" = callPackage
+    ({ mkDerivation, aeson, base, elm-export, persistent, scientific
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "elm-export-persistent";
+       version = "0.1.1";
+       sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2";
+       libraryHaskellDepends = [
+         aeson base elm-export persistent scientific text
+         unordered-containers
+       ];
+       homepage = "https://github.com/jb55/elm-export-persistent";
+       description = "elm-export persistent entities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "elm-get" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
      , bytestring, containers, directory, Elm, filepath, HTTP
@@ -59769,21 +60050,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, safe, transformers, transformers-compat
-     , unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.1.2";
-       sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887";
-       libraryHaskellDepends = [
-         base safe transformers transformers-compat unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_1_3" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat
      , unexceptionalio
      }:
@@ -59796,7 +60062,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersaconcat" = callPackage
@@ -60323,8 +60588,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.0";
-       sha256 = "2d3e90201da379a76f68aed93b0058d76f766ae07e4078c797e5f91c0e315f1b";
+       version = "0.8.2.1";
+       sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -60579,8 +60844,8 @@ self: {
      }:
      mkDerivation {
        pname = "exception-transformers";
-       version = "0.4.0.4";
-       sha256 = "d9b3a527acaeb1c03746db4704d8f64453d02ab4b89d16bd90fb4dbe7b9e7696";
+       version = "0.4.0.5";
+       sha256 = "564caaaac6c2d1759a13d2c2c8a1d7a4b0109035558c4641fa7a8a378961088b";
        libraryHaskellDepends = [
          base stm transformers transformers-compat
        ];
@@ -60613,6 +60878,8 @@ self: {
        pname = "exceptions";
        version = "0.8.3";
        sha256 = "4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be";
+       revision = "1";
+       editedCabalFile = "fc13261461399b8610d60468757f2fc0a62ed660dee998f4329e33dd76d2191b";
        libraryHaskellDepends = [
          base mtl stm template-haskell transformers transformers-compat
        ];
@@ -62062,6 +62329,8 @@ self: {
        pname = "fb";
        version = "1.0.13";
        sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e";
+       revision = "1";
+       editedCabalFile = "ff5a76303ad659f13394147cf6a3bbc3ee25e0ddf2df684d5b9a199c546dc75c";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
@@ -63269,6 +63538,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "find-source-files" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, mtl }:
+     mkDerivation {
+       pname = "find-source-files";
+       version = "0.1.0.0";
+       sha256 = "2c5307c3221ee9a932a93963d4d730ba1d84cce525c598571a4e4570d1753ec6";
+       libraryHaskellDepends = [ base Cabal directory filepath mtl ];
+       homepage = "https://github.com/oisdk/find-source-files#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fingertree" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -63676,6 +63957,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-width" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fixed-width";
+       version = "0.1.0.0";
+       sha256 = "c7e7a455513626b2ce6ddeb54036fd789d9e00b02ab4f13396b8add0c0e1b53f";
+       libraryHaskellDepends = [ base ];
+       description = "Fixed width subsets of an Int64/Word64";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fixedprec" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -63894,22 +64186,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "flat-mcmc_1_4_0" = callPackage
+  "flat-mcmc_1_4_2" = callPackage
     ({ mkDerivation, base, formatting, mcmc-types, monad-par
      , monad-par-extras, mwc-probability, pipes, primitive, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "flat-mcmc";
-       version = "1.4.0";
-       sha256 = "daf0ba3202b7c315e022db361eb01d399d6cec4c742a12d94aeb7a13e95f2b7b";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.4.2";
+       sha256 = "0da3a4fc0d29b994c7aa8a9e5d3f902f15e5a61bde143300438ecaa2318631fa";
        libraryHaskellDepends = [
          base formatting mcmc-types monad-par monad-par-extras
          mwc-probability pipes primitive text transformers vector
        ];
-       executableHaskellDepends = [ base vector ];
        testHaskellDepends = [ base vector ];
        homepage = "https://github.com/jtobin/flat-mcmc";
        description = "Painless general-purpose sampling";
@@ -64480,15 +64769,16 @@ self: {
      }) {};
 
   "fmt" = callPackage
-    ({ mkDerivation, base, text, text-format }:
+    ({ mkDerivation, base, hspec, text, text-format }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.1";
-       sha256 = "e118bd72ec75ad1c749cf43492e85aeed5ee8a3cf616e2af4884f492123d8b30";
+       version = "0.0.0.2";
+       sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a";
        libraryHaskellDepends = [ base text text-format ];
+       testHaskellDepends = [ base hspec text ];
        homepage = "http://github.com/aelve/fmt";
        description = "Nice formatting library";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fn" = callPackage
@@ -66050,6 +66340,8 @@ self: {
        pname = "frisby";
        version = "0.2";
        sha256 = "a3389559849cfc3284923d9b543897abc924c5c076a383890a6a8f21cf4d5247";
+       revision = "1";
+       editedCabalFile = "12db65dfa550e3fb99cf8924ebf71c9308465391ee91a897741fdbcca65fe1c6";
        libraryHaskellDepends = [ array base containers mtl ];
        homepage = "http://repetae.net/computer/frisby/";
        description = "Linear time composable parser for PEG grammars";
@@ -66883,8 +67175,8 @@ self: {
     ({ mkDerivation, base, cmdargs, directory, old-time, process }:
      mkDerivation {
        pname = "fuzzytime";
-       version = "0.7.7";
-       sha256 = "f98a572c199ad3c5cc9232e83df33b22bf90fd46c48d264e100fa411e7f7cb9b";
+       version = "0.7.8";
+       sha256 = "805ae4943fb04808e5e582919235a8e0f61ffc0878fbce41cea29d2609822a1c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -67766,8 +68058,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
-       version = "0.2.2.0";
-       sha256 = "3509e6fd5d9e1337691a88bb7941731f03cf93a42f12a6227dd1a5def9616220";
+       version = "0.2.3.0";
+       sha256 = "2e2c8291de476e103d1978c6ad569be05705fbc178ac89ec68d6a8e20672d377";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
@@ -67778,10 +68070,8 @@ self: {
     ({ mkDerivation, base, generics-sop, lens }:
      mkDerivation {
        pname = "generics-sop-lens";
-       version = "0.1.2.0";
-       sha256 = "bafd04f0238e19d73da60ae018c1c82cb3e4be49990c61a6049dec2dafff40f6";
-       revision = "1";
-       editedCabalFile = "6ea2756e5e916c6a7d24f7d261bb0bf27925b8d8dd30332df4a053160596afcc";
+       version = "0.1.2.1";
+       sha256 = "4e49d4cc580d45e25e0abdeee12b1191ae75937af1c7ca03333979584a8a525c";
        libraryHaskellDepends = [ base generics-sop lens ];
        homepage = "https://github.com/phadej/generics-sop-lens#readme";
        description = "Lenses for types in generics-sop";
@@ -67973,6 +68263,8 @@ self: {
        pname = "genvalidity";
        version = "0.2.0.4";
        sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57";
+       revision = "2";
+       editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -68005,6 +68297,8 @@ self: {
        pname = "genvalidity-hspec";
        version = "0.2.0.5";
        sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b";
+       revision = "1";
+       editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -68857,14 +69151,14 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.0.0";
-       sha256 = "58adf44ad70a30be50397c8ec85390596afa821dca40b92378d46e31e6fb0fe8";
+       version = "1.0.1";
+       sha256 = "3949eb1542f92ed99b38d4f2eb3efb6161fe3250a778b71e638af52463c23de4";
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
        testHaskellDepends = [
-         attoparsec base directory filepath process tasty tasty-hunit
-         temporary text
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
        ];
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
@@ -69264,8 +69558,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.7.0.2";
-       sha256 = "eccf3df2533b5ebcc619f79bb791b84e01765ce66f77b3039cbece34a0302de1";
+       version = "0.7.0.3";
+       sha256 = "e2c65cfafc438029ef8e9ad504ca01e9c92168d9e6f863411a3e8c6ea62cde33";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -69294,8 +69588,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.7.0.1";
-       sha256 = "3a4d95d81f32e46bbd0b50254d56b57315dbfd2cdd47845116095356f5122af4";
+       version = "0.7.0.3";
+       sha256 = "3ec7c0973dfce18d77df9b6162c29c4af6ea2356da679510c034ae8c31a4c029";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -69307,8 +69601,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.7.0.2";
-       sha256 = "7ff04a5bc39b2b84c98badd6f8f569ca9d97fec348c0734821801f7090a1efd6";
+       version = "0.7.0.3";
+       sha256 = "77ecc2d8ee887d4a35cf6161106e278613fe7552569af3a49f136c64dddde0be";
        isLibrary = false;
        isExecutable = false;
        description = "DOM library using JSFFI and GHCJS";
@@ -69473,14 +69767,14 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_6" = callPackage
+  "gi-atk_2_0_9" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.6";
-       sha256 = "774a1cdc10424d51c91c37438866a6254bf1af4723a422e96b82fd6b28eeedb2";
+       version = "2.0.9";
+       sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -69519,15 +69813,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-cairo_1_0_6" = callPackage
+  "gi-cairo_1_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.6";
-       sha256 = "f47f69ac0a09baad360bc24fab8b46261884566e22c975fad2711ab03b537d77";
+       version = "1.0.9";
+       sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
@@ -69567,15 +69861,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gdk_3_0_6" = callPackage
+  "gi-gdk_3_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.6";
-       sha256 = "9c3c974dfa90533fda145d86494690e92c103bd18f32c1225a7a47098aaf6278";
+       version = "3.0.9";
+       sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -69615,15 +69909,15 @@ self: {
      }) {inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gdkpixbuf_2_0_6" = callPackage
+  "gi-gdkpixbuf_2_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.6";
-       sha256 = "f6901f27a610d675e2770144a47d549702619da6a6f3be3c79315c706aa6fa91";
+       version = "2.0.9";
+       sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
@@ -69663,15 +69957,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gio_2_0_6" = callPackage
+  "gi-gio_2_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.6";
-       sha256 = "25f5c90a7549f5d0571e749f80b4ae782b3734575cb88dcc355776edf1e99779";
+       version = "2.0.9";
+       sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -69693,8 +69987,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.6";
-       sha256 = "dd9333861386a6dff7ee76d12c9e3faae4231a18abf482db2f24ad1b0ff67068";
+       version = "1.0.9";
+       sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi-base text
@@ -69728,15 +70022,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-glib_2_0_6" = callPackage
+  "gi-glib_2_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.6";
-       sha256 = "51d0f914fad2d0f36c19d0a4e39c5908ed106d5d400e9f04ded6ee36a26eabc5";
+       version = "2.0.9";
+       sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
@@ -69771,15 +70065,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gobject_2_0_6" = callPackage
+  "gi-gobject_2_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.6";
-       sha256 = "2f2731932c3168e6239b206de266426e5f43a8e2ad2ed78e06fca97b0712e22c";
+       version = "2.0.9";
+       sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
@@ -69801,8 +70095,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.6";
-       sha256 = "5cc2ba47575c854bbc66ea37941c9efc53a962e3a611b9ca31d505ae9e9505ed";
+       version = "1.0.9";
+       sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -69823,8 +70117,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.6";
-       sha256 = "470c68fd68c09df37d12efe93ed250024dea0cd0948eac578b8d1f6c6e24996d";
+       version = "1.0.9";
+       sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -69847,8 +70141,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.6";
-       sha256 = "9130496376c4bbaa230b21a230fd3a4decd971328c9e6b6b90d4d9e78ebd97e2";
+       version = "1.0.9";
+       sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst
@@ -69871,8 +70165,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.6";
-       sha256 = "9bd777b6f49d516b63f550ff59c0a32768bf92f097ebec903f478ea3652872ae";
+       version = "1.0.9";
+       sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -69911,15 +70205,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gtk_3_0_6" = callPackage
+  "gi-gtk_3_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.6";
-       sha256 = "85a001a538a0657b548a5729c2b17ea2265d39b83af718069874eef77202574c";
+       version = "3.0.9";
+       sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -69942,8 +70236,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.1.0";
-       sha256 = "9dbf08bcecc1dfc3cee64073632410a6ece816ffa51fb6326b2c8c7c1ca44742";
+       version = "0.3.2.0";
+       sha256 = "1e028105e79012de9bc54d576bc888994f950512c4ef1b72ad0776bcdeb4a1e6";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -69961,8 +70255,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.6";
-       sha256 = "e9ad5632649a9b3bb6452116a110e4aef2a332b9091bce411f9c169ade9b5141";
+       version = "2.0.9";
+       sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
@@ -69984,8 +70278,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.6";
-       sha256 = "3d97242b370c3937ec34a969548ad968c9b8cc3176a665347adb5014bf2a87b7";
+       version = "3.0.9";
+       sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -70021,14 +70315,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_6" = callPackage
+  "gi-javascriptcore_4_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.6";
-       sha256 = "50e289b13b10d4a7d1724a8bc5cab500611a0453d55743ec7decb91099c24146";
+       version = "4.0.9";
+       sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
@@ -70049,8 +70343,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.6";
-       sha256 = "285151350c4354d466c31cff6479913583803913d153d276c0dc76681d66656c";
+       version = "0.7.9";
+       sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
@@ -70091,15 +70385,15 @@ self: {
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
          inherit (pkgs.gnome2) pango;};
 
-  "gi-pango_1_0_6" = callPackage
+  "gi-pango_1_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.6";
-       sha256 = "662c5e9df26fbe0e8238d033be49101fc78a0c6c802434f2de23f7c0c3d97c02";
+       version = "1.0.9";
+       sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
@@ -70126,8 +70420,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.6";
-       sha256 = "41409f273ad2a43e2965ee572814c1586c6f9fd25d8f41597ad4a8ff275d238d";
+       version = "1.0.9";
+       sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -70148,8 +70442,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.6";
-       sha256 = "9c803e86d513a49dbcc70841c52bd0bc1f2c283f7d953c5b563e1ec04f20ae71";
+       version = "0.18.9";
+       sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
@@ -70183,15 +70477,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) libsoup;};
 
-  "gi-soup_2_4_6" = callPackage
+  "gi-soup_2_4_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.6";
-       sha256 = "ecca7b24c9f45b0446a5f2aa43d1424c9e9c05fbb93d57e74d486729c4052dcd";
+       version = "2.4.9";
+       sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
@@ -70212,8 +70506,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.7";
-       sha256 = "72d63ab29583c73c9978515ff840061f138da27799ffe9e2f7c981380317ce86";
+       version = "2.91.10";
+       sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -70250,7 +70544,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
-  "gi-webkit_3_0_6" = callPackage
+  "gi-webkit_3_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
@@ -70258,8 +70552,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "3.0.6";
-       sha256 = "b6f97ee8164291fadb69e8aa1e087e9d07250a6d9ed5614629448f96b7044610";
+       version = "3.0.9";
+       sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -70282,8 +70576,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.6";
-       sha256 = "6aa7e0c02ce4ff6686ee71ea956f5fd040d459a5a99957a066b49d938d00f9da";
+       version = "4.0.9";
+       sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -70306,8 +70600,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.6";
-       sha256 = "c3ad70065775cb53c8164a4b9a573a8dfee535e5d0552e91c3cbc93e4b691076";
+       version = "4.0.9";
+       sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
@@ -70572,7 +70866,7 @@ self: {
      , clientsession, concurrent-output, conduit, conduit-extra
      , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
      , directory, disk-free-space, dlist, dns, edit-distance, esqueleto
-     , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls
+     , exceptions, fdo-notify, feed, filepath, free, git, gnupg, gnutls
      , hinotify, hslogger, http-client, http-conduit, http-types, IfElse
      , lsof, magic, MissingH, monad-control, monad-logger, mountpoints
      , mtl, network, network-info, network-multicast
@@ -70580,16 +70874,17 @@ self: {
      , optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
      , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, template-haskell, text, time, torrent, transformers
-     , unix, unix-compat, unordered-containers, utf8-string, uuid, wai
-     , wai-extra, warp, warp-tls, wget, which, xml-types, yesod
-     , yesod-core, yesod-default, yesod-form, yesod-static
+     , securemem, shakespeare, socks, stm, stm-chans, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-rerun, template-haskell, text, time
+     , torrent, transformers, unix, unix-compat, unordered-containers
+     , utf8-string, uuid, wai, wai-extra, warp, warp-tls, wget, which
+     , xml-types, yesod, yesod-core, yesod-default, yesod-form
+     , yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161118";
-       sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba";
+       version = "6.20161210";
+       sha256 = "b568cceda32908e7cd66b34181811d4da3d3197d71009eac20c1c4c4379f6381";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -70607,17 +70902,17 @@ self: {
          case-insensitive clientsession concurrent-output conduit
          conduit-extra containers crypto-api cryptonite data-default DAV
          dbus directory disk-free-space dlist dns edit-distance esqueleto
-         exceptions fdo-notify feed filepath gnutls hinotify hslogger
+         exceptions fdo-notify feed filepath free gnutls hinotify hslogger
          http-client http-conduit http-types IfElse magic MissingH
          monad-control monad-logger mountpoints mtl network network-info
          network-multicast network-protocol-xmpp network-uri old-locale
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
-         SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
-         tasty-quickcheck tasty-rerun template-haskell text time torrent
-         transformers unix unix-compat unordered-containers utf8-string uuid
-         wai wai-extra warp warp-tls xml-types yesod yesod-core
-         yesod-default yesod-form yesod-static
+         SafeSemaphore sandi securemem shakespeare socks stm stm-chans tasty
+         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
+         torrent transformers unix unix-compat unordered-containers
+         utf8-string uuid wai wai-extra warp warp-tls xml-types yesod
+         yesod-core yesod-default yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -71040,8 +71335,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "0.1.9";
-       sha256 = "df10ca8f6c8dd97e3dbf6f173a63498a674f7564d727c5647782ec029bd4d1ef";
+       version = "0.2.0";
+       sha256 = "847d33683b290360fdaa1a42dcbe5767920392e86abc357973d1e1afd2fac6c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71055,6 +71350,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github-tools" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, github
+     , groom, html, http-client, http-client-tls, monad-parallel
+     , tabular, tagsoup, text, time, vector
+     }:
+     mkDerivation {
+       pname = "github-tools";
+       version = "0.1.1";
+       sha256 = "d6aa2c877079bf89188d8bbbb006df135e481ce047ba26be4c8f7566d44257ad";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring containers exceptions github groom html http-client
+         http-client-tls monad-parallel tabular tagsoup text time vector
+       ];
+       homepage = "https://toktok.github.io/";
+       description = "Various Github helper utilities";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "github-types" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck
      , http-conduit, smallcheck, text, time, unordered-containers
@@ -71480,15 +71795,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.2.0";
+       sha256 = "2c4b636c0f53ddd51f6bc8f0e208cca8cf1326ce107b7164ca80ea629fed8dbb";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       homepage = "https://github.com/MichelBoucey/glabrous";
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
-    ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }:
+    ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
+     , libglade
+     }:
      mkDerivation {
        pname = "glade";
-       version = "0.12.5.0";
-       sha256 = "79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435";
+       version = "0.13.1";
+       sha256 = "6bb9c72052085c83c1810f1389875d260b9d65f1ea4c4e64022270291ae9be45";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
@@ -71637,8 +71976,8 @@ self: {
        pname = "glirc";
        version = "2.20.1.1";
        sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
-       revision = "2";
-       editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5";
+       revision = "3";
+       editedCabalFile = "d9ff6df2f3d84db85981806342ea6a4022a155283f9d4569753ac7ecf5535005";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -72218,18 +72557,18 @@ self: {
   "gnss-converters" = callPackage
     ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring
      , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens
-     , monad-control, mtl, random, resourcet, rtcm, sbp, tasty
-     , tasty-hunit, time, transformers-base, unordered-containers
+     , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit
+     , time, transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.20";
-       sha256 = "217adfa4568c7099c722e519399a56c930ae23c48cc49bed1947368e8d48c043";
+       version = "0.2.1";
+       sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base basic-prelude conduit-extra exceptions extra lens
-         monad-control mtl random resourcet rtcm sbp time transformers-base
+         monad-control mtl resourcet rtcm sbp time transformers-base
          unordered-containers
        ];
        executableHaskellDepends = [
@@ -77873,6 +78212,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hable" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hable";
+       version = "0.3.1";
+       sha256 = "836a85271112fe458f75084144d871c5562a0590c11d9ab52ed248312852091e";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mekeor/hable";
+       description = "customizable pretty printer library for tables";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "hablog" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
      , bytestring, containers, directory, filepath, markdown, mime-types
@@ -80139,8 +80490,10 @@ self: {
      }:
      mkDerivation {
        pname = "haphviz";
-       version = "0.2.0.0";
-       sha256 = "352fd5f9b696341f33ef262a15df817d3831f0bea09de1d5babb34d4388e238d";
+       version = "0.2.0.1";
+       sha256 = "3271b7fa3364dd3d41ad186c886107827ec733a792f9b0f383c09b9dc5796103";
+       revision = "1";
+       editedCabalFile = "1da984c52a02dbea9a2add72cf90555e5b2d72cb4557064dc2ac630809b3edf2";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [
          base checkers hspec QuickCheck quickcheck-text text
@@ -81161,6 +81514,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasbolt" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, data-default, hex, hspec, network
+     , network-simple, QuickCheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "hasbolt";
+       version = "0.1.0.2";
+       sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         hex network network-simple text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hex hspec QuickCheck text
+       ];
+       homepage = "https://github.com/zmactep/hasbolt#readme";
+       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hascal" = callPackage
     ({ mkDerivation, base, HUnit, numbers }:
      mkDerivation {
@@ -81473,18 +81847,6 @@ self: {
      }) {};
 
   "hashmap" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable }:
-     mkDerivation {
-       pname = "hashmap";
-       version = "1.3.1.1";
-       sha256 = "a4c2d96c89b0a3fbf1ca06c6f8174c2fd996f3813017653a676ca075d8a07da7";
-       libraryHaskellDepends = [ base containers deepseq hashable ];
-       homepage = "https://github.com/foxik/hashmap";
-       description = "Persistent containers Map and Set based on hashing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashmap_1_3_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable }:
      mkDerivation {
        pname = "hashmap";
@@ -81494,7 +81856,6 @@ self: {
        homepage = "https://github.com/foxik/hashmap";
        description = "Persistent containers Map and Set based on hashing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashring" = callPackage
@@ -81616,18 +81977,22 @@ self: {
      }) {};
 
   "haskakafka" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, either-unwrap
-     , hspec, rdkafka, regex-posix, temporary, unix
+    ({ mkDerivation, base, bytestring, c2hs, cmdargs, containers
+     , either-unwrap, hspec, pretty-show, rdkafka, regex-posix
+     , temporary, unix
      }:
      mkDerivation {
        pname = "haskakafka";
-       version = "1.0.0";
-       sha256 = "67426843d25b9f16d6cea9a62859b2052d3a965810c0c19b7f215d1a428c3b48";
+       version = "1.2.0";
+       sha256 = "eb4b010f0662f15b987bec00fa093c75726af94131e039fda63436ed87bc1c22";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers temporary unix
        ];
-       librarySystemDepends = [ rdkafka ];
+       libraryPkgconfigDepends = [ rdkafka ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base bytestring cmdargs pretty-show ];
        testHaskellDepends = [
          base bytestring containers either-unwrap hspec regex-posix
        ];
@@ -82125,6 +82490,33 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
+  "haskell-gi_0_20" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
+     , pretty-show, process, regex-tdfa, safe, text, transformers
+     , xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.20";
+       sha256 = "9eec8bad2539b01d833f31cde7dbbe3cc911ab7ba89b68b20d4b2dfc0716d6f6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath haskell-gi-base
+         mtl pretty-show process regex-tdfa safe text transformers
+         xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       executableHaskellDepends = [
+         base containers directory filepath haskell-gi-base pretty-show text
+       ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -82138,6 +82530,20 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_20" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.20";
+       sha256 = "d62e8b11d67441974e7cb52b0a30e7a1efe6051ddde62c48fe276185c670b80a";
+       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
@@ -82219,25 +82625,17 @@ self: {
   "haskell-kubernetes" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, either
      , http-api-data, http-types, lens, network-uri, QuickCheck
-     , quickcheck-instances, scientific, servant, servant-client
-     , servant-server, split, text, transformers, unordered-containers
-     , vector, wai
+     , quickcheck-instances, scientific, servant, servant-client, split
+     , text, unordered-containers, vector, wai
      }:
      mkDerivation {
        pname = "haskell-kubernetes";
-       version = "0.4.0";
-       sha256 = "38cc46fc4540be0c3b3eb0dab282d549f91d45f64856b7f8b9e32dbf7c51b6c0";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0";
+       sha256 = "f81d4713d2588d95c276768e7845f505b7d5c44b8febf2a34e373a35945ba52d";
        libraryHaskellDepends = [
          aeson base bytestring containers either http-api-data http-types
          lens network-uri QuickCheck quickcheck-instances scientific servant
-         servant-client servant-server split text unordered-containers
-         vector wai
-       ];
-       executableHaskellDepends = [
-         base either network-uri QuickCheck servant servant-client split
-         transformers
+         servant-client split text unordered-containers vector wai
        ];
        homepage = "https://github.com/soundcloud/haskell-kubernetes";
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
@@ -82256,6 +82654,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-menu" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "haskell-menu";
+       version = "0.2.1";
+       sha256 = "c43b6ba537425f02a52e7065224de0a399eadd1e2436f3553d8bc0b1057a48a3";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/jlamothe/haskell-menu";
+       description = "A simple menu system for Haskell programs";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "haskell-modbus" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, hspec }:
      mkDerivation {
@@ -82676,15 +83086,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-exts_1_19_0" = callPackage
+  "haskell-src-exts_1_19_1" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
      }:
      mkDerivation {
        pname = "haskell-src-exts";
-       version = "1.19.0";
-       sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47";
+       version = "1.19.1";
+       sha256 = "f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -84332,6 +84742,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-generic" = callPackage
+    ({ mkDerivation, aeson, base, binary-parser, bytestring, containers
+     , contravariant, generics-sop, hasql, postgresql-binary, scientific
+     , text, time, uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql-generic";
+       version = "0.1.0.4";
+       sha256 = "d60dbe2e88395a878c7e920e49a5a7d8b3aae63b5c63bf73659d120cdc14fa82";
+       libraryHaskellDepends = [
+         aeson base binary-parser bytestring containers contravariant
+         generics-sop hasql postgresql-binary scientific text time uuid
+         vector
+       ];
+       homepage = "https://github.com/chris-kahn/hasql-generic#readme";
+       description = "Generic encoder and decoder deriving for Hasql";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasql-optparse-applicative" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
@@ -84599,8 +85028,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasty-hamiltonian";
-       version = "1.1.4";
-       sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed";
+       version = "1.1.5";
+       sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6";
        libraryHaskellDepends = [
          base lens mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -85915,8 +86344,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.9.4";
-       sha256 = "15935228da585669041395cac32c8e570ea4efa122b0ae9f71fa1a0c129f70d1";
+       version = "0.9.5";
+       sha256 = "fe9d461f8a24f134947c89832472463d65150c37b53cf53ea89fd199ef8d1b71";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq mtl network
          resource-pool scanner stm text time unordered-containers vector
@@ -86819,20 +87248,20 @@ self: {
      }) {};
 
   "heterocephalus" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers
+    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
      , doctest, Glob, parsec, shakespeare, template-haskell, text
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.1.0";
-       sha256 = "9b13428f919b3df7fd7f6f4012826223370951065f0fb020ae57a80810368103";
+       version = "1.0.2.0";
+       sha256 = "d0ec193259c06ae95d5e05c17cd42087465e876d04248212d58dc4ccd72004f3";
        libraryHaskellDepends = [
-         base blaze-html blaze-markup containers parsec shakespeare
+         base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/arowM/heterocephalus#readme";
-       description = "A type safe template engine for collaborating with front end development tools";
+       description = "A type-safe template engine for working with popular front end development tools";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -86938,6 +87367,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexml" = callPackage
+    ({ mkDerivation, base, bytestring, extra }:
+     mkDerivation {
+       pname = "hexml";
+       version = "0.1";
+       sha256 = "dab6b475d2c9e9e1b733c37d3a97ebd7f1ef1db606b17c97544ce53d9748226a";
+       revision = "1";
+       editedCabalFile = "a46997607148d6e6ddb555d128cf73c9dfe29b1aeccf383beb283e4d06ff79f6";
+       libraryHaskellDepends = [ base bytestring extra ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/ndmitchell/hexml#readme";
+       description = "XML subset DOM parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexpat" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, List, text
      , transformers, utf8-string
@@ -88194,12 +88638,12 @@ self: {
      }) {};
 
   "hinotify" = callPackage
-    ({ mkDerivation, base, containers, directory, unix }:
+    ({ mkDerivation, async, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
-       version = "0.3.8.1";
-       sha256 = "37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d";
-       libraryHaskellDepends = [ base containers directory unix ];
+       version = "0.3.9";
+       sha256 = "f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99";
+       libraryHaskellDepends = [ async base containers directory unix ];
        testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
@@ -88307,8 +88751,8 @@ self: {
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "0.5.0.0";
-       sha256 = "44520a3892dbefda790b3a44f2896a808db3a22751582ed41a0935f8b2b7544f";
+       version = "0.5.0.1";
+       sha256 = "0c25984c5713318e00990d0a787fb3d788fe0211273d1f7901a8d590b4d3a700";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite exceptions
          lifted-async lifted-base memory monad-control monad-logger mtl
@@ -88359,8 +88803,8 @@ self: {
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.1.0.2";
-       sha256 = "86ff4302827f4d320efd2b574dee5f6383e41b330a38b1f5dca2a717973659f5";
+       version = "1.2.0.0";
+       sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083";
        libraryHaskellDepends = [
          base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process repa temporary vector
@@ -89021,6 +89465,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
        license = "GPL";
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hledger-api" = callPackage
@@ -89078,7 +89523,40 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ gebner ];
+       maintainers = with stdenv.lib.maintainers; [ gebner peti ];
+     }) {};
+
+  "hledger-iadd" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, free
+     , hledger-lib, hspec, megaparsec, microlens, optparse-applicative
+     , QuickCheck, text, text-format, text-zipper, time, transformers
+     , unordered-containers, vector, vty, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "hledger-iadd";
+       version = "1.1.1";
+       sha256 = "89a1d0846caccdd7a7272821cef105ec6fb405d4b3390b0e335fc036e25c8386";
+       revision = "1";
+       editedCabalFile = "518e975bfd1de87c7cfbbaaa0f710d450e3f5e344725510377cb64abcf11baee";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base brick containers directory free hledger-lib megaparsec
+         microlens optparse-applicative text text-format text-zipper time
+         transformers unordered-containers vector vty xdg-basedir
+       ];
+       executableHaskellDepends = [
+         base brick directory free hledger-lib megaparsec microlens
+         optparse-applicative text text-format text-zipper time transformers
+         unordered-containers vector vty xdg-basedir
+       ];
+       testHaskellDepends = [
+         base free hledger-lib hspec megaparsec QuickCheck text text-format
+         time transformers vector
+       ];
+       homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
+       description = "A terminal UI as drop-in replacement for hledger add";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hledger-interest" = callPackage
@@ -89114,6 +89592,7 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hledger-lib" = callPackage
@@ -89156,8 +89635,8 @@ self: {
        pname = "hledger-ui";
        version = "1.0.5";
        sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
-       revision = "1";
-       editedCabalFile = "3189cd365d74e481da18730d14c0ac538f435a331cfe76d519e37214f94adf54";
+       revision = "2";
+       editedCabalFile = "6ef7d005fa20fd8c0001944f37f618305af941d1a8bdb91c6a4f2422fa23b69f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89169,7 +89648,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hledger-vty" = callPackage
@@ -89233,6 +89712,7 @@ self: {
        homepage = "http://hledger.org";
        description = "Web interface for the hledger accounting tool";
        license = "GPL";
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hlibBladeRF" = callPackage
@@ -89329,15 +89809,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_1_9_38" = callPackage
+  "hlint_1_9_39" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.38";
-       sha256 = "43131e26bfcca9fa9dab0f4fd3a260d895586d57b871ee886f124ad1d41f989d";
+       version = "1.9.39";
+       sha256 = "66cffc12e38c0dfbbab61219381c0af6b41a48462a71e3810612ff2bbdc0b38f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91199,6 +91679,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hora" = callPackage
+    ({ mkDerivation, base, binary, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "hora";
+       version = "1.1.1";
+       sha256 = "9f375a418afca764c29a46c86beaef73a429fb2902368bc27b9d6072b6cfdbd1";
+       libraryHaskellDepends = [ base binary time ];
+       testHaskellDepends = [ base binary hspec QuickCheck time ];
+       homepage = "https://github.com/ciez/hora";
+       description = "date time";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "horizon" = callPackage
     ({ mkDerivation, AC-Angle, base, time }:
      mkDerivation {
@@ -91500,37 +91993,6 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
-     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
-     , QuickCheck, temporary, text, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.14.1";
-       sha256 = "a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280";
-       revision = "1";
-       editedCabalFile = "59a63c997869623189c5e2bb3df8b1da09dda3a2258cbef43a87cbb4a40addc5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat containers deepseq directory
-         filepath Glob hspec interpolate mockery QuickCheck temporary text
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_15_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
      , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
      , QuickCheck, temporary, text, unordered-containers, yaml
@@ -91557,7 +92019,6 @@ self: {
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpack-convert" = callPackage
@@ -92219,6 +92680,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hreader_1_1_0" = callPackage
+    ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
+     , tagged, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "hreader";
+       version = "1.1.0";
+       sha256 = "2a2b02c059b343ab7ff0d340b6545a003b0d563fb8a1ad2d53d6c2f4759a7d3a";
+       libraryHaskellDepends = [
+         base exceptions hset mmorph monad-control mtl tagged transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base hset transformers-base ];
+       homepage = "https://bitbucket.org/s9gf4ult/hreader";
+       description = "Generalization of MonadReader and ReaderT using hset";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hreader-lens" = callPackage
     ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action
      , profunctors
@@ -93003,6 +93483,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsbc" = callPackage
+    ({ mkDerivation, attoparsec, base, text, vector }:
+     mkDerivation {
+       pname = "hsbc";
+       version = "0.1.0.2";
+       sha256 = "0cc76047ced42e4860f3876fdebcc2057d6d95917ebc2401f929308e7ba66e75";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ attoparsec base text vector ];
+       description = "Command Line Calculator";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsbencher" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, data-default
      , directory, filepath, GenericPretty, HUnit, io-streams, mtl
@@ -100205,6 +100698,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
+  "idris_0_99" = 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.99";
+       sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9";
+       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 {
@@ -101851,22 +102388,24 @@ self: {
      }) {};
 
   "inline-java" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , distributed-closure, filepath, ghc-heap-view, hspec, inline-c
-     , jni, jvm, language-java, monad-loops, process, singletons, syb
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , directory, distributed-closure, filepath, ghc-heap-view, hspec
+     , inline-c, jni, jvm, language-java, process, singletons, syb
      , template-haskell, temporary, text, thread-local-storage, vector
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.5.1";
-       sha256 = "b134f3a7904da62a23118bffe7f42bee1ea0c6fa4b84216679609520faeea098";
+       version = "0.6";
+       sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1";
        libraryHaskellDepends = [
-         base binary bytestring containers distributed-closure filepath
-         ghc-heap-view inline-c jni jvm language-java monad-loops process
-         singletons syb template-haskell temporary text thread-local-storage
-         vector
+         base binary bytestring Cabal containers directory
+         distributed-closure filepath ghc-heap-view inline-c jni jvm
+         language-java process singletons syb template-haskell temporary
+         text thread-local-storage vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec jni jvm singletons text
        ];
-       testHaskellDepends = [ base bytestring hspec jvm singletons text ];
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
@@ -102357,8 +102896,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.19";
-       sha256 = "77dbd2811296b7b6a57a2d90d59580ea6d0d13f7611528233e020978408521ad";
+       version = "0.1.20";
+       sha256 = "e93fd2df3a3cd1c6a0203420a94b0329c08b51a51ef8d5ec5a38efe61469da77";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103707,16 +104246,19 @@ self: {
 
   "itemfield" = callPackage
     ({ mkDerivation, base, brick, data-default, HUnit, microlens
-     , microlens-th, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, vty
+     , microlens-th, QuickCheck, random, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, vty
      }:
      mkDerivation {
        pname = "itemfield";
-       version = "1.2.0.0";
-       sha256 = "a55b83a20a599c4acbba6aecc68db6d8de982f646c125f68bf0a48f6d4260716";
-       revision = "1";
-       editedCabalFile = "cefe94a562c871d018efedccd5246afd8a019463e4bb3e1e20d3b8d52939de17";
+       version = "1.2.2.1";
+       sha256 = "fe8bfe62a98a286f86f80f65cd3d5c09097fcc75eafda4281e8c19f999233b90";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base brick microlens text vty ];
+       executableHaskellDepends = [
+         base brick data-default microlens microlens-th random text vty
+       ];
        testHaskellDepends = [
          base brick data-default HUnit microlens microlens-th QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
@@ -105015,8 +105557,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.7.0.1";
-       sha256 = "60581922dd1ccef07eb2319653d4b8448cbf65039c32680269277d731d0e95aa";
+       version = "0.7.0.3";
+       sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -105213,12 +105755,12 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, GenericPretty, hashable, hflags, lens, mmap, mtl
      , pretty, process, QuickCheck, scientific, smallcheck, text
-     , uniplate, unordered-containers, vector
+     , uniplate, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0.14";
-       sha256 = "37536fd9cd18ae8fa9527359cbfb8c69dc5bed51abdd7c7931ac0d12642fd2f4";
+       version = "1.0.15";
+       sha256 = "4552e903a49953d48a5f60fb8532b51c40f3061c39cc842d6282ab42f6bbe045";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105229,7 +105771,7 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
          hflags lens mtl pretty process scientific text uniplate
-         unordered-containers vector
+         unordered-containers vector yaml
        ];
        testHaskellDepends = [
          aeson base bytestring containers directory filepath GenericPretty
@@ -105961,8 +106503,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.9";
-       sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854";
+       version = "0.2.10";
+       sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106276,6 +106818,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kalman" = callPackage
+    ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, hmatrix
+     , random-fu, random-fu-multivariate, vector
+     }:
+     mkDerivation {
+       pname = "kalman";
+       version = "1.0.0.2";
+       sha256 = "817cc80d31a8c06864978991b7c16fb11c5910f113d7f2157fff45504c4e3c07";
+       libraryHaskellDepends = [
+         base hmatrix random-fu random-fu-multivariate vector
+       ];
+       testHaskellDepends = [
+         base Chart Chart-cairo Chart-diagrams hmatrix random-fu
+         random-fu-multivariate
+       ];
+       homepage = "https://github.com/idontgetoutmuch/Kalman";
+       description = "Kalman and particle filters and smoothers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "kan-extensions" = callPackage
     ({ mkDerivation, adjunctions, array, base, comonad, containers
      , contravariant, distributive, free, mtl, semigroupoids, tagged
@@ -106988,8 +107550,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-reactivevalues";
-       version = "0.2.2.0";
-       sha256 = "27756d64d0b275d9556f0ffbefdad8e1bb9942f5fc17d585e6148cfc31496e8b";
+       version = "0.2.2.1";
+       sha256 = "27785b27fafb6249a538d400dd47405fa66fc5267de1f17b7ff7a4a4fe738566";
        libraryHaskellDepends = [ base contravariant ];
        testHaskellDepends = [
          base directory filepath hlint HUnit mtl process QuickCheck
@@ -107652,6 +108214,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "krapsh" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring
+     , binary, bytestring, containers, cryptohash-sha256, deepseq
+     , exceptions, formatting, hashable, hspec, lens, monad-logger, mtl
+     , QuickCheck, random, raw-strings-qq, scientific, SHA, text
+     , text-format, transformers, unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "krapsh";
+       version = "0.1.6.0";
+       sha256 = "12c4c3a9d4e0d013056ad269a51ae77078a6a582b9b5924d5e58b73251176d6e";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base16-bytestring binary bytestring
+         containers cryptohash-sha256 deepseq exceptions formatting hashable
+         lens monad-logger mtl QuickCheck random scientific SHA text
+         text-format transformers unordered-containers vector wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers formatting hspec QuickCheck
+         raw-strings-qq text vector
+       ];
+       homepage = "https://github.com/krapsh/kraps-haskell";
+       description = "Haskell bindings for Spark Dataframes and Datasets";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "krpc" = callPackage
     ({ mkDerivation, base, bencoding, bytestring, containers
      , data-default-class, hspec, lifted-base, monad-control
@@ -108584,8 +109172,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdatex";
-       version = "0.1.0.4";
-       sha256 = "0f289460551802ad7d01c1bfc0c52c827e20e961633e228e33cb9dc8bdd178bf";
+       version = "0.1.1.0";
+       sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164";
        libraryHaskellDepends = [
          async base containers directory HaTeX mtl text transformers
        ];
@@ -108790,8 +109378,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.11.7";
-       sha256 = "d35d3b22cc12ed6e7b1036401d394f0a55c9b278e807144f64d0eca41121a230";
+       version = "0.11.7.1";
+       sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -109354,7 +109942,7 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_2_1" = callPackage
+  "language-puppet_1_3_4" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -109368,8 +109956,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.2.1";
-       sha256 = "2540cebeae24f1ad783cd52cff87c55734fe631626f211c2f8579a1c5d4b1ac4";
+       version = "1.3.4";
+       sha256 = "6944b5f03001c07d3b8208db6125594af6ebd101f7025ef45bb01cee071018bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110214,6 +110802,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leapseconds-announced_2017_1" = callPackage
+    ({ mkDerivation, base, QuickCheck, time }:
+     mkDerivation {
+       pname = "leapseconds-announced";
+       version = "2017.1";
+       sha256 = "0f9c1add6d3015df20b4ca2b6c0256af4b27732bee5467f3c85cbc698307f619";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base QuickCheck time ];
+       homepage = "https://github.com/bjornbm/leapseconds-announced";
+       description = "Leap seconds announced at library release time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "learn" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -110761,8 +111363,8 @@ self: {
     ({ mkDerivation, base, doctest, lens }:
      mkDerivation {
        pname = "lens-tutorial";
-       version = "1.0.1";
-       sha256 = "66494550d66d4c62ea56d0184d118e302d3f1f12505c5c7c0a00e098e77272ab";
+       version = "1.0.2";
+       sha256 = "ef2638f69bfbb35f15adc20bde588419889eb0f7c899b3f03ae746fc08d1e1b5";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
@@ -110832,8 +111434,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.3.1";
-       sha256 = "f7270a276914c96190c570397cc9e0dcadb874dec438ff32c2e36eda6d72bee3";
+       version = "1.0.3.2";
+       sha256 = "7c4fcfd08e2b4369f14a3502215cdb6f70a8f776350a6113d3d6f8dbc7a1c397";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111378,6 +111980,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "liblawless" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, binary
+     , bytestring, containers, containers-unicode-symbols, contravariant
+     , data-textual, directory, exceptions, filepath, hjsonschema, lens
+     , machines, mtl, parsers, path, path-io, protolude, QuickCheck
+     , random, semigroups, stm, stm-containers, temporary
+     , test-framework, test-framework-quickcheck2, test-framework-th
+     , text, text-icu, text-icu-normalized, text-printer, time
+     , transformers, yaml, zippers
+     }:
+     mkDerivation {
+       pname = "liblawless";
+       version = "0.13.3";
+       sha256 = "b1c3660a40a50db947712b3768a8cf3ceb8c614e5d71cdf18e4bceedff90a16b";
+       libraryHaskellDepends = [
+         aeson base base-unicode-symbols binary bytestring containers
+         containers-unicode-symbols contravariant data-textual directory
+         exceptions filepath hjsonschema lens machines mtl parsers path
+         path-io protolude random semigroups stm stm-containers temporary
+         text text-icu text-icu-normalized text-printer time transformers
+         yaml zippers
+       ];
+       testHaskellDepends = [
+         base binary bytestring exceptions filepath QuickCheck semigroups
+         temporary test-framework test-framework-quickcheck2
+         test-framework-th text time transformers
+       ];
+       description = "Prelude based on protolude for GHC 8 and beyond";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "liblinear-enumerator" = callPackage
     ({ mkDerivation, base, bindings-DSL, enumerator, mtl, vector }:
      mkDerivation {
@@ -112153,6 +112786,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "line_2_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
+     , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
+     , time, transformers, wai
+     }:
+     mkDerivation {
+       pname = "line";
+       version = "2.1.0.2";
+       sha256 = "456d5ffaec68338fc5892371445e0ff8fa768a68008107f0de22aa0fb962a813";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptohash-sha256
+         http-conduit http-types scotty text time transformers wai
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptohash-sha256 hspec
+         hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty
+         text time transformers
+       ];
+       homepage = "https://github.com/noraesae/line";
+       description = "Haskell SDK for the LINE API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "line-break" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -112333,21 +112991,19 @@ self: {
 
   "linearmap-category" = callPackage
     ({ mkDerivation, base, constrained-categories, containers
-     , free-vector-spaces, ieee754, lens, linear, semigroups, vector
-     , vector-space
+     , free-vector-spaces, ieee754, lens, linear, manifolds-core
+     , semigroups, tagged, vector, vector-space
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.2.0.0";
-       sha256 = "99e027c01da96c907a94b8bd57a7e36597d57b4786aa4835b1b66e921bad21d3";
-       revision = "1";
-       editedCabalFile = "2da156de9e6cffcbd1b9910c4d177250d27a18bf77bdae54bf8560c26b1b89b7";
+       version = "0.3.0.1";
+       sha256 = "f8f24aa068e6578798b9fcdbbc4e7058322db89cf630540b7b91a7cbfe5d5f78";
        libraryHaskellDepends = [
          base constrained-categories containers free-vector-spaces ieee754
-         lens linear semigroups vector vector-space
+         lens linear manifolds-core semigroups tagged vector vector-space
        ];
        homepage = "https://github.com/leftaroundabout/linearmap-family";
-       description = "Native, matrix-free linear algebra";
+       description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -114236,16 +114892,16 @@ self: {
 
   "logging-effect" = callPackage
     ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
-     , stm, stm-delay, text, time, transformers, transformers-base
-     , wl-pprint-text
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.1.0";
-       sha256 = "51275afa770efb4bef3bea13fb294eeb9f7b7ca8186879d49dfa4b2cdcfbdb48";
+       version = "1.1.1";
+       sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5";
        libraryHaskellDepends = [
-         async base exceptions free monad-control mtl stm stm-delay text
-         time transformers transformers-base wl-pprint-text
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
        ];
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
@@ -115034,8 +115690,8 @@ self: {
      }:
      mkDerivation {
        pname = "lua-bc";
-       version = "0.1.0.3";
-       sha256 = "a441ce9aa5d7eb13f5ec7cd4254f1827b17f729c166ec4c2b4eb4475a2fee20f";
+       version = "0.1.1";
+       sha256 = "6a4186dc3ad092df6b5cfd78a0b18175a1944e7044de6a7817f90b195090e02e";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 pretty text
          vector
@@ -116543,8 +117199,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.3.0.0";
-       sha256 = "1ea6a797e4325a16d4a4c7f59d2f732a5c5796491dad79a2b82db3a84feaf369";
+       version = "0.4.0.0";
+       sha256 = "7300fabce3e4c7723cc320f4c96bbd7980ca4e72cb694aa422b91d51b6e26c5e";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -116557,19 +117213,18 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie
-     , microlens, microlens-th, semigroups, tagged, transformers
-     , trivial-constraint, vector, vector-space, void
+     , deepseq, free-vector-spaces, lens, linear, linearmap-category
+     , manifolds-core, MemoTrie, semigroups, tagged, transformers
+     , vector, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.3.0.0";
-       sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab";
+       version = "0.4.0.0";
+       sha256 = "7a4a8a4c392b5e0743e0984bbd361a744a7e054838ca9353131b0bea04e09f93";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq
-         free-vector-spaces linear linearmap-category MemoTrie microlens
-         microlens-th semigroups tagged transformers trivial-constraint
-         vector vector-space void
+         free-vector-spaces lens linear linearmap-category manifolds-core
+         MemoTrie semigroups tagged transformers vector vector-space void
        ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
@@ -116577,6 +117232,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "manifolds-core" = callPackage
+    ({ mkDerivation, base, tagged, vector-space }:
+     mkDerivation {
+       pname = "manifolds-core";
+       version = "0.4.0.0";
+       sha256 = "53a19cc72ef02345f161676d04701249fbf36cd02303672a1d5e3ecd78341568";
+       libraryHaskellDepends = [ base tagged vector-space ];
+       homepage = "https://github.com/leftaroundabout/manifolds";
+       description = "The basic classes for the manifolds hierarchy";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "map-exts" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers }:
      mkDerivation {
@@ -116927,24 +117594,27 @@ self: {
      }) {};
 
   "marvin" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, classy-prelude
-     , configurator, directory, filepath, hslogger, lens, mtl, mustache
-     , network-uri, optparse-generic, random, template-haskell
-     , text-format, text-icu, vector, websockets, wreq, wuss
+    ({ mkDerivation, aeson, async, base, bytestring, configurator
+     , directory, filepath, hashable, hslogger, lens, mono-traversable
+     , mtl, mustache, network-uri, optparse-applicative
+     , optparse-generic, pcre-light, random, template-haskell, text
+     , text-format, unordered-containers, vector, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.0.1";
-       sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614";
+       version = "0.0.2";
+       sha256 = "93cb2eaeb405ed22c165ff2d546e3cc34892663361ef4bf39e4ce03262be8643";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring classy-prelude configurator hslogger
-         lens mtl network-uri optparse-generic random template-haskell
-         text-format text-icu vector websockets wreq wuss
+         aeson async base bytestring configurator hashable hslogger lens
+         mono-traversable mtl network-uri optparse-generic pcre-light random
+         template-haskell text text-format unordered-containers vector
+         websockets wreq wuss
        ];
        executableHaskellDepends = [
-         base classy-prelude directory filepath mustache optparse-generic
+         aeson base bytestring configurator directory filepath
+         mono-traversable mustache optparse-applicative text
        ];
        homepage = "https://github.com/JustusAdam/marvin#readme";
        description = "A modular bot for slack";
@@ -117044,28 +117714,6 @@ self: {
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
-    ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "math-functions";
-       version = "0.2.0.2";
-       sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737";
-       libraryHaskellDepends = [
-         base deepseq primitive vector vector-th-unbox
-       ];
-       testHaskellDepends = [
-         base deepseq erf HUnit primitive QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-         vector-th-unbox
-       ];
-       homepage = "https://github.com/bos/math-functions";
-       description = "Special functions and Chebyshev polynomials";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "math-functions_0_2_1_0" = callPackage
     ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , vector, vector-th-unbox
@@ -117085,7 +117733,6 @@ self: {
        homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathblog" = callPackage
@@ -117202,14 +117849,14 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, primitive, tasty, tasty-hunit
+    ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit
      , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrices";
-       version = "0.4.3";
-       sha256 = "7bc65e57db63146824e8b840f72ce0980251337b98819148439b1afe8d0d4039";
-       libraryHaskellDepends = [ base primitive vector ];
+       version = "0.4.4";
+       sha256 = "50f110321d71db257adfbe0f126542e936148ee473679edc1c2bf37c60d539ee";
+       libraryHaskellDepends = [ base deepseq primitive vector ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck vector
        ];
@@ -117477,8 +118124,8 @@ self: {
     ({ mkDerivation, base, containers, mwc-probability, transformers }:
      mkDerivation {
        pname = "mcmc-types";
-       version = "1.0.2";
-       sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3";
+       version = "1.0.3";
+       sha256 = "3c4b25030b05567694ddc313ca808a32133ad5433b4d89837e1ed00bbfcefc6e";
        libraryHaskellDepends = [
          base containers mwc-probability transformers
        ];
@@ -117574,6 +118221,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mealstrom" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , hashable, list-t, postgresql-simple, resource-pool, stm
+     , stm-containers, tasty, tasty-hunit, text, time, uuid
+     }:
+     mkDerivation {
+       pname = "mealstrom";
+       version = "0.0.0.1";
+       sha256 = "bde77bd197b39ff4673048ee17ec42043d96fbbea101e8650d9db9229757e83f";
+       libraryHaskellDepends = [
+         aeson async base bytestring containers hashable list-t
+         postgresql-simple resource-pool stm stm-containers text time uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring hashable list-t postgresql-simple
+         resource-pool stm stm-containers tasty tasty-hunit text time uuid
+       ];
+       homepage = "https://github.com/linearray/mealstrom";
+       description = "Manipulate FSMs and store them in PostgreSQL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "means" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
@@ -118168,14 +118837,19 @@ self: {
      }) {};
 
   "messagepack" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
-     , test-framework, test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , test-framework-th
      }:
      mkDerivation {
        pname = "messagepack";
-       version = "0.5.3";
-       sha256 = "0c7e98943db3712fe4bc6a2ffcbe92cc1637d8ccc5fc73c333568a6856a8b67c";
-       libraryHaskellDepends = [ base bytestring cereal containers ];
+       version = "0.5.4";
+       sha256 = "939590c05d5b0831b3b4796f2e1a070e290982c92b2009f2aa1ef5f4b05b5d7c";
+       revision = "1";
+       editedCabalFile = "4bfea0a7200706d1826fab53e19df38e5df759672d50095143b4ef078e8d235c";
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq
+       ];
        testHaskellDepends = [
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
@@ -118894,8 +119568,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighty-metropolis";
-       version = "1.0.3";
-       sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80";
+       version = "1.0.4";
+       sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf";
        libraryHaskellDepends = [
          base mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -119012,8 +119686,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.11";
-       sha256 = "84fa24f83206cb88377128395c2d6db2d08bbe9b568ba6ab8eeb76952abedfee";
+       version = "0.4.12";
+       sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -119612,8 +120286,10 @@ self: {
      }:
      mkDerivation {
        pname = "mnist-idx";
-       version = "0.1.2.5";
-       sha256 = "e8881f03789ae5046b33a051a0cc5a269614642d5876d893fc4a9c34b9bdad56";
+       version = "0.1.2.6";
+       sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae";
+       revision = "1";
+       editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/mnist-idx/";
@@ -120398,22 +121074,6 @@ self: {
      }) {};
 
   "monad-logger-syslog" = callPackage
-    ({ mkDerivation, base, bytestring, fast-logger, hsyslog
-     , monad-logger, text, transformers
-     }:
-     mkDerivation {
-       pname = "monad-logger-syslog";
-       version = "0.1.2.0";
-       sha256 = "8b7d6598cbe4046aaeb7f86e526f259be4dde43967bf8a15f8ce3ea9f33221c2";
-       libraryHaskellDepends = [
-         base bytestring fast-logger hsyslog monad-logger text transformers
-       ];
-       homepage = "https://github.com/fpco/monad-logger-syslog";
-       description = "syslog output for monad-logger";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger-syslog_0_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, fast-logger, hsyslog
      , monad-logger, text, transformers
      }:
@@ -120427,7 +121087,6 @@ self: {
        homepage = "https://github.com/fpco/monad-logger-syslog";
        description = "syslog output for monad-logger";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-loops" = callPackage
@@ -121725,8 +122384,8 @@ self: {
      }:
      mkDerivation {
        pname = "morph";
-       version = "0.1.0.1";
-       sha256 = "8ac454d889af2ebe0ef92011e85c9b005be07262a642e3435dac6951c38363f6";
+       version = "0.1.1.1";
+       sha256 = "3b325579797ef49dbc5c49ad0fa05b451806f7178121beb2ee548a988b9745dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121767,7 +122426,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "morte_1_6_4" = callPackage
+  "morte_1_6_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -121776,8 +122435,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.4";
-       sha256 = "8066f8a4092d3fee6fc67bb361bee0a71dc59f9bb38bb81e4d85d9f799076598";
+       version = "1.6.5";
+       sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123456,20 +124115,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mwc-random" = callPackage
-    ({ mkDerivation, base, primitive, time, vector }:
+  "mwc-probability_1_3_0" = callPackage
+    ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
-       pname = "mwc-random";
-       version = "0.13.4.0";
-       sha256 = "c52cfdeab2fe6cae3e2b0de382757372df571b7c25a6712ab205fb784b5a8aea";
-       libraryHaskellDepends = [ base primitive time vector ];
-       doCheck = false;
-       homepage = "https://github.com/bos/mwc-random";
-       description = "Fast, high quality pseudo random number generation";
-       license = stdenv.lib.licenses.bsd3;
+       pname = "mwc-probability";
+       version = "1.3.0";
+       sha256 = "0f9ba623fa2fea7770e3f1cacb1d8a0b14711e60039590d5181864e5a2fe1f6f";
+       libraryHaskellDepends = [ base mwc-random primitive transformers ];
+       homepage = "http://github.com/jtobin/mwc-probability";
+       description = "Sampling function-based probability distributions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-random_0_13_5_0" = callPackage
+  "mwc-random" = callPackage
     ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
@@ -123480,7 +124139,6 @@ self: {
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -123643,8 +124301,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-haskell";
-       version = "0.7.1.0";
-       sha256 = "0d0107914bc3f869eac868e1ad66a1ceba97cd68e2f5b9a595eecab24840edeb";
+       version = "0.8.0.0";
+       sha256 = "5fe7c723b869a0cd160005f6080960c989b678e154c24f4c2419b775b73eece4";
        libraryHaskellDepends = [
          base binary binary-ieee754 binary-parsers blaze-textual bytestring
          bytestring-lexing cryptonite io-streams memory monad-loops network
@@ -123665,8 +124323,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-haskell-openssl";
-       version = "0.7.0.0";
-       sha256 = "c960cc61a13f63df2cc776af9b876ff8e68f181237ec772d27c21684ed7e791b";
+       version = "0.8.0.0";
+       sha256 = "653df3a834ee18da50c2f740a9d241b0d0bc046b584c4fbc66e5a529ff27b616";
        libraryHaskellDepends = [
          base HsOpenSSL io-streams mysql-haskell network tcp-streams
          tcp-streams-openssl wire-streams
@@ -126267,21 +126925,21 @@ self: {
      }) {};
 
   "nicovideo-translator" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, cmdargs
-     , containers, dns, http-client, http-types, iso639, lens
-     , naver-translate, setlocale, text, text-format, wai, warp, wreq
-     , xml-conduit
+    ({ mkDerivation, aeson, async, base, bytestring, case-insensitive
+     , cmdargs, containers, dns, http-client, http-types, iso639, lens
+     , lens-aeson, setlocale, text, text-format, unordered-containers
+     , wai, warp, wreq, xml-conduit
      }:
      mkDerivation {
        pname = "nicovideo-translator";
-       version = "0.1.0.1";
-       sha256 = "d2a7963385d06c67dad7d3aadd215c7d243e1e189b9fc3358bceb36a5c65f68a";
+       version = "0.2.0.0";
+       sha256 = "039a1dd1e25450b96ee513091b382f2f9e00826fa2ae69811da9c9a2fe0d4bf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring case-insensitive cmdargs containers dns http-client
-         http-types iso639 lens naver-translate setlocale text text-format
-         wai warp wreq xml-conduit
+         aeson async base bytestring case-insensitive cmdargs containers dns
+         http-client http-types iso639 lens lens-aeson setlocale text
+         text-format unordered-containers wai warp wreq xml-conduit
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/dahlia/nicovideo-translator";
@@ -126684,8 +127342,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "nonfree";
-       version = "0.1.0.1";
-       sha256 = "11d7f5d66a6ec832cb2c15b5f33b6b2fbc3cdf8c49da3a5a8f9ca252531c4e16";
+       version = "0.1.0.2";
+       sha256 = "e0c3207fdc46af5d182ae135f32d8a0ccb7a7779ba8898d954bf6703ee42b0f2";
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
@@ -127756,15 +128414,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_17_0" = callPackage
+  "octane_0_18_0" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.17.0";
-       sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288";
+       version = "0.18.0";
+       sha256 = "cf92a63584772d60388b550d93d73f08bac3a26b21c4ad2dc6003837e1e9674f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128097,8 +128755,8 @@ self: {
      }:
      mkDerivation {
        pname = "ombra";
-       version = "0.2.1.0";
-       sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c";
+       version = "0.2.2.0";
+       sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60";
        libraryHaskellDepends = [
          base gl hashable hashtables transformers unordered-containers vect
        ];
@@ -129101,8 +129759,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentype";
-       version = "0.1.0";
-       sha256 = "ff80076a81c6aec66347718f11fb7990a45c46e5719db185268007930ca46d6c";
+       version = "0.1.1";
+       sha256 = "c074b4b424201266f126ffe4360adbe00c9c855d65b4d48aeaf835033c504b0d";
        libraryHaskellDepends = [
          base binary bytestring containers ghc microlens microlens-th mtl
          pretty-hex time unordered-containers vector
@@ -129148,10 +129806,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "operational-alacarte";
-       version = "0.3";
-       sha256 = "c9e6ebe251d0854ed71fcf10ea54af2489f6819e180c55d6f15cc1fe3cb5dfcc";
-       revision = "1";
-       editedCabalFile = "b8fa0a71719bbc82e750cab4dacede2ba752370169dd210f75c66e244ffb5ff8";
+       version = "0.3.1";
+       sha256 = "d52a77eee6056ac730bf9b953018044aa5ed9b381e7cd4e7a6e59348c1969d58";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/operational-alacarte";
@@ -130445,7 +131101,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_1_19" = callPackage
+  "pandoc_1_19_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -130460,8 +131116,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.19";
-       sha256 = "227a5a70c8510e95f7dcc4dc1af3ebd9fb3efd252e5cbbda38aa1b9eb178f638";
+       version = "1.19.1";
+       sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -130495,39 +131151,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.10.2.2";
-       sha256 = "1475a2e0a13922df9c931c0480154fa4f02bd81ef34b166596b035898c94dd7a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath pandoc pandoc-types
-         process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_10_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -130558,7 +131181,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -130678,18 +131300,18 @@ self: {
      }) {};
 
   "pandoc-placetable" = callPackage
-    ({ mkDerivation, base, explicit-exception, http-conduit
-     , pandoc-types, spreadsheet, utf8-string
+    ({ mkDerivation, aeson, base, bytestring, explicit-exception
+     , http-conduit, pandoc-types, spreadsheet, utf8-string
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.4.1";
-       sha256 = "8c1e03f5bd538301eda3c5b83b594693638b805b6fead191a10d9b73a7c18383";
+       version = "0.4.2";
+       sha256 = "5151cd72e3277229e87efd0e7cb150434baa1be76e117e5644f93bfba4f81579";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base explicit-exception http-conduit pandoc-types spreadsheet
-         utf8-string
+         aeson base bytestring explicit-exception http-conduit pandoc-types
+         spreadsheet utf8-string
        ];
        homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
@@ -131327,8 +131949,8 @@ self: {
     ({ mkDerivation, base, containers, process }:
      mkDerivation {
        pname = "parseargs";
-       version = "0.2.0.7";
-       sha256 = "900eaca47e0ddbdadf137377f1eb6b16b69eabed54ce45a4c22b176ba8ddb45d";
+       version = "0.2.0.8";
+       sha256 = "7b789204c15d0c478db3d133f349a6970b5509fc6af655faedc03c7426dcf7d6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -131892,8 +132514,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.2.0";
-       sha256 = "bd2304d0f4dbc6e6533771c8a24e2103018ac7ea8d86de9bf45b503ca40aec97";
+       version = "0.4.5.0";
+       sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131961,16 +132583,22 @@ self: {
 
   "path" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , filepath, hspec, HUnit, mtl, template-haskell
+     , filepath, genvalidity, genvalidity-hspec, hspec, HUnit, mtl
+     , QuickCheck, template-haskell, validity
      }:
      mkDerivation {
        pname = "path";
-       version = "0.5.9";
-       sha256 = "e67982fe579b6318def4769db9a7a3ae07ac7b67b4e8d6326f568cb72aafa727";
+       version = "0.5.11";
+       sha256 = "bf0d9ea00271017893f59d5e136cb22116278220899609104d7906635286ac14";
+       revision = "1";
+       editedCabalFile = "a7cad89b8049cd067990a13713c27513b7c473182accfebae5eb2aa0a1d2c197";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath template-haskell
        ];
-       testHaskellDepends = [ aeson base bytestring hspec HUnit mtl ];
+       testHaskellDepends = [
+         aeson base bytestring filepath genvalidity genvalidity-hspec hspec
+         HUnit mtl QuickCheck validity
+       ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133726,8 +134354,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.4";
-       sha256 = "333f39cc5317bd188435e001b3dfbe44d5b2afbc536b59e76b86fa23d827e9f7";
+       version = "10.5";
+       sha256 = "cd4a959d4648589e14b71aa0940141c7881166f8ad0257eb427c3acf71942c7b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134428,17 +135056,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes_4_2_0" = callPackage
-    ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
+  "pipes_4_3_1" = callPackage
+    ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
+     , test-framework, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.2.0";
-       sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124";
-       revision = "1";
-       editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0";
-       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       version = "4.3.1";
+       sha256 = "35a6e296e04f992bcda28ffedf1774e23c866b6ac79025f50ee5226bda3fd001";
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl transformers
+       ];
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
          transformers
@@ -134572,8 +135200,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-bytestring";
-       version = "2.1.3";
-       sha256 = "d2211e068fe28c5e6a5dc0089eec0dd31bedd4b942285965a02f8aa20c4c6f3e";
+       version = "2.1.4";
+       sha256 = "6c3f72de28aa538887f6c442884e88a4a0219057998e3710b81439dcb4466deb";
        libraryHaskellDepends = [
          base bytestring pipes pipes-group pipes-parse transformers
        ];
@@ -134696,8 +135324,8 @@ self: {
     ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
      mkDerivation {
        pname = "pipes-concurrency";
-       version = "2.0.6";
-       sha256 = "e0523b67c40c0e0fba04e2eb695adae9142ee199a8f54326f770cb33d66a3b8e";
+       version = "2.0.7";
+       sha256 = "14a47f0096361b495330b4489c3534ee37f507550ffa2f57cb0e70362df47559";
        libraryHaskellDepends = [ base contravariant pipes stm void ];
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
@@ -134810,8 +135438,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.7";
-       sha256 = "f4d441160cf5d50ad83c15c88c80b835e39d7a73a4e7943c6a6d4c796df28be2";
+       version = "1.0.8";
+       sha256 = "4d0f7932212988b5e4c661238d66db316cd11bae15506a87d925ae058194d37b";
        libraryHaskellDepends = [ base foldl pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -134871,8 +135499,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-group";
-       version = "1.0.5";
-       sha256 = "dbcdfe483c57f337a259635d2fde149e1d2b081092f0b1b30fc7d175b38e2ef5";
+       version = "1.0.6";
+       sha256 = "07ad6f6ba7675b59aeb3be77171170da99a6f54e18b8d477d52f94b05e8ab766";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
@@ -134947,8 +135575,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-key-value-csv";
-       version = "0.4.0.1";
-       sha256 = "940f5961dba5bfcc50f8e54e3263156cd80d73ee34730961eaa81b0f36f77734";
+       version = "0.4.0.2";
+       sha256 = "3d2ecb1a9fc0a276aebdf626191def168df95de896d929f96bf9927658c4ef6c";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class lens mtl pipes
          pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
@@ -135077,8 +135705,8 @@ self: {
     ({ mkDerivation, base, pipes, transformers }:
      mkDerivation {
        pname = "pipes-parse";
-       version = "3.0.7";
-       sha256 = "3f61375dd13d6ca6aa4d73ba62e3dbc8f02f6ad62d6dffb5f1eecd21e1637824";
+       version = "3.0.8";
+       sha256 = "d28f831b2c8229cca567ee95570787d2dd3f5cfcff3b3c44ee308360a8c107a9";
        libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
@@ -135129,8 +135757,8 @@ self: {
     ({ mkDerivation, base, mwc-random, pipes, vector }:
      mkDerivation {
        pname = "pipes-random";
-       version = "1.0.0.1";
-       sha256 = "e18371195212d91ccb7f08f0d4065b3fd314988480bc72fce03f60716ac29ccd";
+       version = "1.0.0.2";
+       sha256 = "1b176ae550fd31ebe8d0d5fca6f1c420b50adb2364d68f7fcaeb7006a48c6520";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
@@ -135189,6 +135817,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-safe_2_2_5" = callPackage
+    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+     , pipes, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-safe";
+       version = "2.2.5";
+       sha256 = "0242cfe67853dc5bd94c979b06da25423d8bf96c3b095f4d33b745c78605a67c";
+       libraryHaskellDepends = [
+         base containers exceptions monad-control mtl pipes transformers
+         transformers-base
+       ];
+       description = "Safety for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-shell" = callPackage
     ({ mkDerivation, async, base, bytestring, directory, hspec, pipes
      , pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@@ -135230,8 +135875,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-text";
-       version = "0.0.2.4";
-       sha256 = "0e16ad5f29c981100452f23aa6c4998cc96427d70af5be389559fd6223279fb0";
+       version = "0.0.2.5";
+       sha256 = "4489ee02a8ebfd87049fc4dd1380b21e6f33984eb0101c836ab8e054759c0f2a";
        libraryHaskellDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
@@ -135814,6 +136459,26 @@ self: {
        license = "GPL";
      }) {};
 
+  "plotlyhs" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , lucid, microlens, microlens-th, text
+     }:
+     mkDerivation {
+       pname = "plotlyhs";
+       version = "0.1.0";
+       sha256 = "445bc874f9edef177830e39968ac487bfd156702750c74f287ed6387a07b5f5b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring lucid microlens
+         microlens-th text
+       ];
+       executableHaskellDepends = [ aeson base lucid microlens text ];
+       homepage = "https://github.com/glutamate/plotlyhs";
+       description = "Haskell bindings to Plotly.js";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "plots" = callPackage
     ({ mkDerivation, adjunctions, base, base-orphans, colour
      , containers, data-default, diagrams-core, diagrams-lib, directory
@@ -137733,6 +138398,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "praglude" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing
+     , containers, data-default, deepseq, directory, filepath, hashable
+     , lens, mtl, random, semigroups, string-convert, template-haskell
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "praglude";
+       version = "0.2.1.0";
+       sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring casing containers
+         data-default deepseq directory filepath hashable lens mtl random
+         semigroups string-convert template-haskell text time
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/tdammers/praglude";
+       description = "A pragmatic Prelude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "precis" = callPackage
     ({ mkDerivation, base, Cabal, containers, cpphs, directory
      , filepath, haskell-src-exts, xhtml
@@ -137917,17 +138603,17 @@ self: {
   "pregame" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, containers
      , data-default, deepseq, either, ghc-prim, integer-gmp, lens, mtl
-     , safe, stm, text, text-conversions, time, tuple
+     , safe, StateVar, stm, text, text-conversions, time, tuple
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "pregame";
-       version = "1.0.1.0";
-       sha256 = "218237f29e51e0635845008541629efc4fcc66403b90c4401087e5279871a9f4";
+       version = "1.0.3.0";
+       sha256 = "447c76f91a0b79f55250168258f840d73062d77ec44c9727ccddcba9561a777f";
        libraryHaskellDepends = [
          aeson array base bytestring containers data-default deepseq either
-         ghc-prim integer-gmp lens mtl safe stm text text-conversions time
-         tuple unordered-containers vector
+         ghc-prim integer-gmp lens mtl safe StateVar stm text
+         text-conversions time tuple unordered-containers vector
        ];
        homepage = "https://github.com/jxv/pregame";
        description = "Prelude for applications";
@@ -138665,6 +139351,8 @@ self: {
        pname = "proc";
        version = "0.0.9";
        sha256 = "8a8e6685d3b917d9db2ccbd55028af49bf0a2a51f27a7dcf7901413230c96c5c";
+       revision = "1";
+       editedCabalFile = "bf249bc625b72139c2e981f4bf0500fc6c7a749c28824c63f62f68cee9fbe028";
        libraryHaskellDepends = [
          base containers directory filepath process regex-tdfa split strict
          xformat
@@ -138687,14 +139375,16 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_4_2_0" = callPackage
-    ({ mkDerivation, base, deepseq, directory, filepath, unix }:
+  "process_1_4_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, directory, filepath
+     , unix
+     }:
      mkDerivation {
        pname = "process";
-       version = "1.4.2.0";
-       sha256 = "1c2ba524a238e464ae9c22582bea92da2d4c5227e1704a984bb8631dcb562bec";
+       version = "1.4.3.0";
+       sha256 = "5473f4d20a19c3ba448ace7d4d01ec821ad531574c23934fd3c55627f5a7f0eb";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138737,6 +139427,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "process-extras_0_7_1" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, deepseq
+     , generic-deriving, HUnit, ListLike, mtl, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.7.1";
+       sha256 = "d25f6228825960b90f86aba3e49bf27fe1cd2f893b44ccb748c3442aa6bcd30f";
+       libraryHaskellDepends = [
+         base bytestring data-default deepseq generic-deriving ListLike mtl
+         process text
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "process-iterio" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, iterIO, process
      , transformers
@@ -139036,6 +139745,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profiteur_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "profiteur";
+       version = "0.4.0.0";
+       sha256 = "8198f5905f8da27ada8c0bce0f5dab39bd1d7d8a802b70a974febc6366e7b91d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring filepath text unordered-containers
+         vector
+       ];
+       homepage = "http://github.com/jaspervdj/profiteur";
+       description = "Treemap visualiser for GHC prof files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "profunctor-extras" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -139937,24 +140666,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
-     , QuickCheck, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.2.2";
-       sha256 = "97b539c4d9da0f0460cd17153641a647b59eb04fde00ec38ea8b56dd9086423f";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_2_3" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -139970,7 +140681,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -140022,12 +140732,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20161129" = callPackage
+  "publicsuffix_0_20161206" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20161129";
-       sha256 = "419e1c5019b6c255087c88e27992d733a550442c40b8a58ee40e647cc76fb894";
+       version = "0.20161206";
+       sha256 = "0f6ef27c6e71f62c7f994dff75f53ba46a469da00a688c6428932426e80b2959";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -140503,7 +141213,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "purescript_0_10_2" = callPackage
+  "purescript_0_10_3" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
      , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
      , boxes, bytestring, clock, containers, data-ordlist, directory
@@ -140520,8 +141230,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.2";
-       sha256 = "45e60466575afed67fbc5244c4e0d3c7184c5aa009ebe7b81aa92a673d212e14";
+       version = "0.10.3";
+       sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140786,28 +141496,29 @@ self: {
 
   "puzzle-draw" = callPackage
     ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers
-     , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, mtl
-     , optparse-applicative, parsec, SVGFonts, tasty, tasty-hunit, text
+     , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec
+     , linear, mtl, optparse-applicative, parsec, process, SVGFonts
+     , tasty, tasty-golden, tasty-hspec, tasty-hunit, text
      , unordered-containers, vector-space, yaml
      }:
      mkDerivation {
        pname = "puzzle-draw";
-       version = "0.1.0.4";
-       sha256 = "118edc89b2a1bcdb9c5ce93c475eeb173709308d25e668875374a69214116c49";
+       version = "0.2.0.0";
+       sha256 = "02dcb3892d34d719fc93ca02168b63fff8ff25a2cb0e926cf74de49b8f5b5113";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers diagrams-lib diagrams-svg filepath hashable
-         mtl optparse-applicative parsec SVGFonts text unordered-containers
-         vector-space yaml
+         linear mtl optparse-applicative parsec SVGFonts text
+         unordered-containers vector-space yaml
        ];
        executableHaskellDepends = [
          aeson base diagrams-lib diagrams-svg filepath optparse-applicative
-         yaml
+         process tasty tasty-golden yaml
        ];
        testHaskellDepends = [
          base blaze-svg bytestring containers deepseq diagrams-lib
-         diagrams-svg tasty tasty-hunit text yaml
+         diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
@@ -141076,6 +141787,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) qhull;};
 
+  "qr-imager" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
+     , haskell-qrencode, jose-jwt, JuicyPixels, lens, vector
+     }:
+     mkDerivation {
+       pname = "qr-imager";
+       version = "0.1.0.0";
+       sha256 = "400145049487f03edc3d249bf44afa596db328e98f1e616c378a83f32fbd129a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cryptonite directory haskell-qrencode
+         jose-jwt JuicyPixels lens vector
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vmchale/QRImager#readme";
+       description = "Library to generate QR codes from bytestrings and objects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "qrcode" = callPackage
     ({ mkDerivation, array, base, containers, mtl, vector }:
      mkDerivation {
@@ -141698,16 +142429,13 @@ self: {
      }) {};
 
   "quickcheck-special" = callPackage
-    ({ mkDerivation, base, bytestring, nats, QuickCheck
-     , quickcheck-instances, scientific, text
-     }:
+    ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }:
      mkDerivation {
        pname = "quickcheck-special";
-       version = "0.1.0.0";
-       sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113";
+       version = "0.1.0.2";
+       sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977";
        libraryHaskellDepends = [
-         base bytestring nats QuickCheck quickcheck-instances scientific
-         text
+         base bytestring QuickCheck scientific text
        ];
        homepage = "https://github.com/minad/quickcheck-special#readme";
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
@@ -141883,16 +142611,14 @@ self: {
 
   "quipper" = callPackage
     ({ mkDerivation, base, containers, directory, easyrender, mtl
-     , process, random, template-haskell, unix
+     , primes, process, random, template-haskell, unix
      }:
      mkDerivation {
        pname = "quipper";
-       version = "0.7";
-       sha256 = "38d86bce23509ff81a0e2964d9c04107c4cbb8ecf799abfed216cc2192dcc47c";
-       revision = "1";
-       editedCabalFile = "ed852a0a36ec59cf0c95e5cec2d0bc82e19a0576f75236ee986f7a221a721c7b";
+       version = "0.8.1";
+       sha256 = "69dad741fde6f2fb2d3c9497a93f6c31a90f1150205c2cc11c02455d501a2c8c";
        libraryHaskellDepends = [
-         base containers directory easyrender mtl process random
+         base containers directory easyrender mtl primes process random
          template-haskell unix
        ];
        homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
@@ -142357,6 +143083,36 @@ self: {
        license = "LGPL";
      }) {};
 
+  "raketka" = callPackage
+    ({ mkDerivation, aeson, async, base, binary, bytestring, conf-json
+     , containers, distributed-process
+     , distributed-process-simplelocalnet, hspec, network
+     , network-transport, network-transport-tcp, QuickCheck, random, stm
+     , tagged, template-haskell
+     }:
+     mkDerivation {
+       pname = "raketka";
+       version = "1.1.1";
+       sha256 = "00de213d145e568d11272776d9c394339aee1b28358995cffb606056bf3c1572";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base binary conf-json containers distributed-process
+         distributed-process-simplelocalnet network network-transport
+         network-transport-tcp random stm tagged template-haskell
+       ];
+       executableHaskellDepends = [
+         aeson async base binary bytestring conf-json containers
+         distributed-process distributed-process-simplelocalnet network
+         network-transport network-transport-tcp random stm tagged
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/ciez/raketka";
+       description = "basic distributed-process node with configurable peers";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "rakhana" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, lens
      , mtl, pipes, scientific, transformers, vector, zlib
@@ -142987,8 +143743,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "1.0.0";
-       sha256 = "faba10702e6e41b73ab6b30d3232c1dfdf648ab5131392bdf24da81fc0f34e49";
+       version = "2.0.0";
+       sha256 = "a58e5c7b1c5e8318ab552ac204248075cf1d8adb6024555f0b06d99de6c750ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144038,16 +144794,19 @@ self: {
      }) {};
 
   "recursion-schemes" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, free, transformers
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad, free
+     , HUnit, semigroups, template-haskell, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "recursion-schemes";
-       version = "5";
-       sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc";
+       version = "5.0.1";
+       sha256 = "b7a97c72fd7edc2d85060626a1f7e3c56756868aec43510dfe41c1e1fa43ff03";
        libraryHaskellDepends = [
-         base bifunctors comonad free transformers transformers-compat
+         base base-orphans bifunctors comonad free semigroups
+         template-haskell transformers transformers-compat
        ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
@@ -144900,19 +145659,22 @@ self: {
      }) {};
 
   "regex-do" = callPackage
-    ({ mkDerivation, array, base, bytestring, hspec, mtl, QuickCheck
-     , regex-base, regex-pcre, stringsearch, text
+    ({ mkDerivation, array, base, bytestring, hspec, QuickCheck
+     , regex-base, regex-pcre, stringsearch, tagged, text
      }:
      mkDerivation {
        pname = "regex-do";
-       version = "2.6.2";
-       sha256 = "041396ec83639de987378825bf576dce7c52beded82801cc49af43b0a54dc76a";
+       version = "3.1";
+       sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b";
+       revision = "3";
+       editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178";
        libraryHaskellDepends = [
-         array base bytestring mtl regex-base regex-pcre stringsearch text
+         array base bytestring regex-base regex-pcre stringsearch tagged
+         text
        ];
        testHaskellDepends = [
-         array base bytestring hspec mtl QuickCheck regex-base regex-pcre
-         stringsearch text
+         array base bytestring hspec QuickCheck regex-base regex-pcre
+         stringsearch tagged text
        ];
        homepage = "https://github.com/ciez/regex-do";
        description = "PCRE wrapper";
@@ -145497,8 +146259,8 @@ self: {
      }:
      mkDerivation {
        pname = "rei";
-       version = "0.4.0.1";
-       sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75";
+       version = "0.4.0.3";
+       sha256 = "195fc1c1a1cff8665d61d8fdd768a72949a4531a41c182e791f5e4824a5000c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146452,6 +147214,8 @@ self: {
        pname = "req";
        version = "0.1.0";
        sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
+       revision = "1";
+       editedCabalFile = "03f0eb9f9ae76f17e56ff02d4e1f42769c323183497c81f0c0cb2c721e0eed2f";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive connection
          data-default-class http-api-data http-client http-client-tls
@@ -147570,6 +148334,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "riscv-isa" = callPackage
+    ({ mkDerivation, base, hspec, mtl, QuickCheck }:
+     mkDerivation {
+       pname = "riscv-isa";
+       version = "0.1.0.0";
+       sha256 = "6a88e07161d0a3bd97cccf3e1d4a88063b09c22e843d6bd7a9af4389849f891a";
+       revision = "1";
+       editedCabalFile = "f998732d08cb67e2d7b6f80b6f9240caedc65e4297d1d90ca87758e78a247e73";
+       libraryHaskellDepends = [ base mtl QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/cocreature/riscv-isa#readme";
+       description = "Haskell representation of the RISC-V instruction set architecture";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rison" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec
      , scientific, text, unordered-containers, vector
@@ -149083,8 +149862,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.3.0.0";
-       sha256 = "1eddd50993f6ed86041dbc2f543263eb6261d5d34d3128beb416a44cb8d59215";
+       version = "0.3.1.0";
+       sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://darcs.redspline.com/safe-access";
        description = "A simple environment to control access to data";
@@ -149547,6 +150326,8 @@ self: {
        pname = "sampling";
        version = "0.2.0";
        sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
+       revision = "1";
+       editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
@@ -149556,6 +150337,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "sampling_0_3_1" = callPackage
+    ({ mkDerivation, base, containers, foldl, mwc-random, primitive
+     , vector
+     }:
+     mkDerivation {
+       pname = "sampling";
+       version = "0.3.1";
+       sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b";
+       libraryHaskellDepends = [
+         base containers foldl mwc-random primitive vector
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/jtobin/sampling";
+       description = "Sample values from collections";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "samtools" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
      mkDerivation {
@@ -149892,8 +150691,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.0";
-       sha256 = "4120efabc373ed18cf009ba8ca3961aca97b31bd0c347e748f2bfbf0e8d47519";
+       version = "2.1.3";
+       sha256 = "1feff9aa39dc4bd34de1cb0da5fcf105429aafa1e28c97cfff19a44403c79951";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152047,8 +152846,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "seqid";
-       version = "0.5.0";
-       sha256 = "54d4602699b9e3a59d9fbe27258005ee877f0871b4d285e25336231e43953c15";
+       version = "0.5.1";
+       sha256 = "cea36ce861a457efe5854b3ae9ffef9fc95ea32f14c34e577e5e3d84a5f86695";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/LukeHoersten/seqid";
        description = "Sequence ID production and consumption";
@@ -152280,24 +153079,25 @@ self: {
      , base16-bytestring, base64-bytestring, binary, binary-orphans
      , bytestring, cereal, cereal-vector, clock, containers
      , data-msgpack, deepseq, directory, either, exceptions, extra
-     , filepath, formatting, hashable, hspec, lens, mtl
+     , filepath, formatting, hashable, hspec, lens, monad-control, mtl
      , optparse-applicative, parsec, QuickCheck, quickcheck-instances
-     , safecopy, scientific, semigroups, template-haskell, text
+     , safecopy, scientific, semigroups, stm, template-haskell, text
      , text-format, time-units, transformers, unordered-containers
      , vector, yaml
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.2.1";
-       sha256 = "585328969b7403c64b05eb05d908074d2742e40ce5d549d161c298d91a69f3db";
+       version = "0.1.2.3";
+       sha256 = "f30880e753f8c7e258906ab0a83f15f23b4ae90cd3bbba02719556421dc97f0a";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
          cereal-vector clock containers data-msgpack deepseq directory
-         either exceptions extra filepath formatting hashable lens mtl
-         optparse-applicative parsec QuickCheck quickcheck-instances
-         safecopy scientific semigroups template-haskell text text-format
-         time-units transformers unordered-containers vector yaml
+         either exceptions extra filepath formatting hashable lens
+         monad-control mtl optparse-applicative parsec QuickCheck
+         quickcheck-instances safecopy scientific semigroups stm
+         template-haskell text text-format time-units transformers
+         unordered-containers vector yaml
        ];
        testHaskellDepends = [
          aeson base binary bytestring cereal data-msgpack hspec QuickCheck
@@ -153489,8 +154289,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-snap";
-       version = "0.7.0.3";
-       sha256 = "8b3892b6572677b74d1351b8dd9f274a0428c0bcdd2a0ab599ce96edfe7c2a8b";
+       version = "0.7.0.5";
+       sha256 = "4a92e5a97f025541914cbd48266a7498af2ba25e467c13c4abfab4b8d36144f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154344,6 +155144,8 @@ self: {
        pname = "shake";
        version = "0.15.10";
        sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0";
+       revision = "1";
+       editedCabalFile = "bb24876b00ef8cd3f8500ef729a01278e6e4ba9c7e12391cb76c2217ddc55563";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154925,6 +155727,8 @@ self: {
        pname = "shelly";
        version = "1.6.8.1";
        sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
+       revision = "1";
+       editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -157281,8 +158085,26 @@ self: {
      }:
      mkDerivation {
        pname = "smsaero";
-       version = "0.6.1";
-       sha256 = "95d9bd63df306b6ed2ebee3a31c91484bcc29fa72cab77e89f55746bd03bf102";
+       version = "0.6.2";
+       sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec";
+       libraryHaskellDepends = [
+         aeson base containers http-api-data http-client servant
+         servant-client servant-docs text time
+       ];
+       homepage = "https://github.com/GetShopTV/smsaero";
+       description = "SMSAero API and HTTP client based on servant library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "smsaero_0_7_1" = callPackage
+    ({ mkDerivation, aeson, base, containers, http-api-data
+     , http-client, servant, servant-client, servant-docs, text, time
+     }:
+     mkDerivation {
+       pname = "smsaero";
+       version = "0.7.1";
+       sha256 = "cfec597fbd1ea285ce0f035e7f90bda241eca0536a1d22320f5a16ff6909c990";
        libraryHaskellDepends = [
          aeson base containers http-api-data http-client servant
          servant-client servant-docs text time
@@ -157341,8 +158163,8 @@ self: {
      }:
      mkDerivation {
        pname = "smtp-mail";
-       version = "0.1.4.5";
-       sha256 = "dcb32836cdcc165442d9c182866fa05d959bf22a8349e952e3525dbf585e0e04";
+       version = "0.1.4.6";
+       sha256 = "86dacbef87a2519222a1165b49401a437887a249f5bfd63a99702198dad214bc";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring bytestring
          cryptohash filepath mime-mail network text
@@ -159927,8 +160749,8 @@ self: {
      }:
      mkDerivation {
        pname = "speedy-slice";
-       version = "0.1.4";
-       sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92";
+       version = "0.1.5";
+       sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441";
        libraryHaskellDepends = [
          base lens mcmc-types mwc-probability pipes primitive transformers
        ];
@@ -160410,8 +161232,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.92.0";
-       sha256 = "8f93a7d03db1508a2a7e53998edef027a00f75d33a1532113e56a651dc6e3f9e";
+       version = "1.93.0";
+       sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160585,27 +161407,6 @@ self: {
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "sqlite-simple";
-       version = "0.4.10.0";
-       sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-textual bytestring containers
-         direct-sqlite text time transformers
-       ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring direct-sqlite HUnit text time
-       ];
-       homepage = "http://github.com/nurpax/sqlite-simple";
-       description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sqlite-simple_0_4_12_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
      , time, transformers
@@ -160624,7 +161425,6 @@ self: {
        homepage = "http://github.com/nurpax/sqlite-simple";
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -161024,32 +161824,57 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , directory, exceptions, file-embed, filepath, hspec
+     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "0.2.0";
+       sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory exceptions
+         filepath megaparsec mtl template-haskell text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec text yaml
+       ];
+       homepage = "https://github.com/stackbuilders/stache";
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = 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
+     , cryptohash, cryptohash-conduit, deepseq, directory, either
+     , errors, exceptions, extra, fast-logger, file-embed, 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, pid1, pretty, process, project-template
+     , QuickCheck, regex-applicative-text, resourcet, retry, safe
+     , safe-exceptions, semigroups, smallcheck, split, stm, store
      , streaming-commons, tar, template-haskell, temporary, text
-     , text-binary, th-reify-many, time, tls, transformers
+     , text-binary, text-metrics, 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";
+       version = "1.3.0";
+       sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161057,18 +161882,18 @@ self: {
          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
+         directory either errors exceptions extra fast-logger file-embed
+         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 pid1 pretty
+         process project-template regex-applicative-text resourcet retry
+         safe safe-exceptions semigroups split stm store streaming-commons
+         tar template-haskell temporary text text-binary text-metrics 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
@@ -161078,10 +161903,11 @@ self: {
        ];
        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
+         cryptohash directory exceptions filepath hspec http-client-tls
+         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
+         yaml
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -161293,8 +162119,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.14.1.1";
-       sha256 = "1db3dee8833fe6e42f1266c9b78a5cbee9b02d6a9c83f4cf7e2c607f4a6ad6d5";
+       version = "0.14.3";
+       sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161323,7 +162149,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-curator_0_14_3" = callPackage
+  "stackage-curator_0_14_4_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
@@ -161339,8 +162165,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.14.3";
-       sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa";
+       version = "0.14.4.1";
+       sha256 = "37d3b9ac875d46d209efcaa9c6e0d1ab1edb421f1153292238582ee1aff66add";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162028,12 +162854,12 @@ self: {
      }) {};
 
   "stb-image-redux" = callPackage
-    ({ mkDerivation, base, hspec, primitive, vector }:
+    ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "stb-image-redux";
-       version = "0.2.0.0";
-       sha256 = "1ad898ff99f7c1d6532dea98c6acdb1f786bc7c6095f72b179e423aaac3b9515";
-       libraryHaskellDepends = [ base primitive vector ];
+       version = "0.2.1.0";
+       sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d";
+       libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
@@ -162573,8 +163399,8 @@ self: {
      }:
      mkDerivation {
        pname = "stompl";
-       version = "0.4.0";
-       sha256 = "8766eec4d48e44d08fbcb009f9d3098ba1b10193caac14935b2c0c1889ae0d7d";
+       version = "0.5.0";
+       sha256 = "b0538c190c3fa1f63d81aa2518561c2ae6dd1407f86b56794a2024e9b59a5158";
        libraryHaskellDepends = [
          attoparsec base bytestring mime split text utf8-string word8
        ];
@@ -162878,15 +163704,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_2_2" = callPackage
+  "stratosphere_0_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.2.2";
-       sha256 = "e7f212a1dad585810e72adbf572b4324a5bfbc4fe7ace581c613fa668bc24ed1";
+       version = "0.3.0";
+       sha256 = "628b988750e237e3c1d26de2ccf03753b964fb84f3f46320d2d6a7665aa557a9";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
@@ -163247,6 +164073,60 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "strelka" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring
+     , bifunctors, bytestring, hashable, http-media, mtl, semigroups
+     , strelka-core, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "strelka";
+       version = "1";
+       sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude base64-bytestring bifunctors
+         bytestring hashable http-media mtl semigroups strelka-core text
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/nikita-volkov/strelka";
+       description = "A simple, flexible and composable web-router";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "strelka-core" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , hashable, mtl, semigroups, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "strelka-core";
+       version = "0.1";
+       sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring hashable mtl semigroups
+         text transformers unordered-containers
+       ];
+       homepage = "https://github.com/nikita-volkov/strelka-core";
+       description = "Core components of \"strelka\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "strelka-wai" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, case-insensitive
+     , http-types, strelka-core, text, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "strelka-wai";
+       version = "1";
+       sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137";
+       libraryHaskellDepends = [
+         base base-prelude bytestring case-insensitive http-types
+         strelka-core text unordered-containers wai warp
+       ];
+       homepage = "https://github.com/nikita-volkov/strelka-wai";
+       description = "WAI compatibility layer for \"strelka\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "strict" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -164297,8 +165177,8 @@ self: {
      }:
      mkDerivation {
        pname = "super-user-spark";
-       version = "0.3.1.0";
-       sha256 = "9daf90541bbb17621d0a0c4993f9601bffcbb1452d862c990f5bf147afaab3ef";
+       version = "0.3.2.0";
+       sha256 = "dbef4d44404a06ca283b8b8e4886373a4dd18d042679dd54998d59256aae118d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164318,15 +165198,13 @@ self: {
      }) {};
 
   "superbuffer" = callPackage
-    ({ mkDerivation, base, bytestring, HTF, QuickCheck }:
+    ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }:
      mkDerivation {
        pname = "superbuffer";
-       version = "0.1.0.0";
-       sha256 = "85d6e38f100ec5847067f569f964e1bbf04df58b001275b70589d58191be2105";
-       revision = "1";
-       editedCabalFile = "162970f213762fe4be50f554d52e2500150fa400cff70e8069127a84c50dfb4a";
+       version = "0.2.0.1";
+       sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166";
        libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring HTF QuickCheck ];
+       testHaskellDepends = [ async base bytestring HTF QuickCheck ];
        homepage = "https://github.com/agrafix/superbuffer#readme";
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
@@ -165112,10 +165990,8 @@ self: {
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.6.2";
-       sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73";
-       revision = "1";
-       editedCabalFile = "48bee990f011eaa13392605459eb15eaa5d63d798cd8b50ec293a4430f4266d3";
+       version = "3.6.3";
+       sha256 = "93b6c366dcd4a0a09005ffc27ff3d62a9ee070308b6300c415fe8301c8f4f3f0";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl syb
          template-haskell tree-view
@@ -166139,6 +167015,8 @@ self: {
        pname = "tagged";
        version = "0.8.5";
        sha256 = "e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99";
+       revision = "1";
+       editedCabalFile = "a8d7b211a0831f5acf65a36003aebab7673ffb6a874a49715e05e7b76a6cb896";
        libraryHaskellDepends = [
          base deepseq template-haskell transformers transformers-compat
        ];
@@ -169348,6 +170226,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "text-time" = callPackage
+    ({ mkDerivation, attoparsec, base, Cabal, formatting, hspec
+     , QuickCheck, text, time
+     }:
+     mkDerivation {
+       pname = "text-time";
+       version = "0.2.0";
+       sha256 = "cf62c803c3532b5ea7c1dec673f86df935d588f9a41e1e6f33b9715d0f2cf392";
+       libraryHaskellDepends = [ attoparsec base formatting text time ];
+       testHaskellDepends = [
+         attoparsec base Cabal formatting hspec QuickCheck text time
+       ];
+       homepage = "https://github.com/klangner/text-time";
+       description = "Library for Time parsing from Text into UTCTime";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-utf7" = callPackage
     ({ mkDerivation, base, bytestring, quickcheck-instances, tasty
      , tasty-hunit, tasty-quickcheck, text
@@ -169864,8 +170759,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-lift-instances";
-       version = "0.1.10";
-       sha256 = "a3b8afd8789f508d9a421952994ff82cd33c40e99f81c85080fee07044ff2174";
+       version = "0.1.11";
+       sha256 = "1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text th-lift vector
        ];
@@ -170158,6 +171053,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "these_0_7_3" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, containers
+     , data-default-class, deepseq, hashable, keys, mtl, profunctors
+     , QuickCheck, quickcheck-instances, semigroupoids, tasty
+     , tasty-quickcheck, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.7.3";
+       sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
+       libraryHaskellDepends = [
+         aeson base bifunctors binary containers data-default-class deepseq
+         hashable keys mtl profunctors QuickCheck semigroupoids transformers
+         transformers-compat unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors binary containers hashable QuickCheck
+         quickcheck-instances tasty tasty-quickcheck transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/isomorphism/these";
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "thespian" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -171063,6 +171985,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "time-series-lib" = callPackage
+    ({ mkDerivation, base, Cabal, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "time-series-lib";
+       version = "0.1.0";
+       sha256 = "91ae1189fb4579c217381514ca62bd028799a27f5ad7ae81c4acc3d0b7504fe0";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base Cabal hspec QuickCheck ];
+       doHaddock = false;
+       homepage = "https://github.com/klangner/time-series-lib";
+       description = "Library for Time Series processing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "time-units" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -171182,8 +172118,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base, linear, time, transformers }:
      mkDerivation {
        pname = "timeless";
-       version = "0.9.0.1";
-       sha256 = "2dd43e752b92715d96e71dd82b65cfd6d9f89c808cb2bb70442d8b133cc01443";
+       version = "1.0.1.2";
+       sha256 = "f028c0d7deb751629c80c720d8b378b8fed3af68c4da28afbfbd1fa55d5acc70";
        libraryHaskellDepends = [
          ansi-terminal base linear time transformers
        ];
@@ -171192,6 +172128,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timeless-tutorials" = callPackage
+    ({ mkDerivation, base, timeless }:
+     mkDerivation {
+       pname = "timeless-tutorials";
+       version = "1.0.0.0";
+       sha256 = "1b4631bde7afe9fcd49b22b7baf82927328981b49491f4d28ad39be3ec471e17";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base timeless ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/carldong/timeless-tutorials#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timelike" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -171392,12 +172343,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timeseries" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-time, Cabal, cassava
+     , hspec, QuickCheck, text, time, vector
+     }:
+     mkDerivation {
+       pname = "timeseries";
+       version = "0.1.0";
+       sha256 = "2aef662eb22472b18b4de81d763a2e98a2f2feb8d1658651376c0709c7b088a0";
+       libraryHaskellDepends = [
+         base bytestring bytestring-time cassava text time vector
+       ];
+       testHaskellDepends = [
+         base bytestring bytestring-time Cabal cassava hspec QuickCheck text
+         time vector
+       ];
+       homepage = "https://github.com/klangner/timeseries";
+       description = "Library for Time Series processing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timespan" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "timespan";
-       version = "0.1.0.0";
-       sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8";
+       version = "0.2.0.0";
+       sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6";
        libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/agrafix/timespan#readme";
        description = "Useful timespan datatype and functions";
@@ -172533,19 +173504,19 @@ self: {
      }) {};
 
   "transformers-abort" = callPackage
-    ({ mkDerivation, base, data-default-class, monad-control, pointed
-     , semigroupoids, transformers, transformers-base
+    ({ mkDerivation, base, monad-control, pointed, semigroupoids
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "transformers-abort";
-       version = "0.5.0.1";
-       sha256 = "f525bd66622ceb6dcdf38d7f96cc3fbcf5e9cc8bc1f5f126e2fbc011a3dc1b68";
+       version = "0.6.0.1";
+       sha256 = "4acca1807cc99bf4f366e25e7ab66069b7d19f5f4bedca675c75805bf3b7a461";
        libraryHaskellDepends = [
-         base data-default-class monad-control pointed semigroupoids
-         transformers transformers-base
+         base monad-control pointed semigroupoids transformers
+         transformers-base
        ];
        homepage = "https://github.com/mvv/transformers-abort";
-       description = "A better error monad transformer";
+       description = "Error and short-circuit monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -173690,6 +174661,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_3_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , directory, doctest, foldl, hostname, managed, optional-args
+     , optparse-applicative, process, stm, system-fileio
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.3.0";
+       sha256 = "6004c179342c8b341f804046584d1ff6630483af5053d74603877df8d1699a47";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock directory foldl hostname
+         managed optional-args optparse-applicative process stm
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -175081,6 +176075,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "typesafe-precure" = callPackage
+    ({ mkDerivation, base, dlist, hspec, monad-skeleton
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "typesafe-precure";
+       version = "0.2.0.0";
+       sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e";
+       libraryHaskellDepends = [
+         base dlist monad-skeleton template-haskell
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/igrep/typesafe-precure#readme";
+       description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "typescript-docs" = callPackage
     ({ mkDerivation, base, blaze-html, cmdtheline, containers
      , filemanip, filepath, language-typescript, parsec, split, syb
@@ -175721,14 +176732,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unfoldable_0_9" = callPackage
+  "unfoldable_0_9_1" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random
      , transformers
      }:
      mkDerivation {
        pname = "unfoldable";
-       version = "0.9";
-       sha256 = "decb997909f9cd8c6ad618a46290c6df922e525361ec5d06e9db3b3822a40f77";
+       version = "0.9.1";
+       sha256 = "08e2565142d11f21242d631dfd78ad02da93fd6fa3e75af0df4c1024123db236";
+       revision = "1";
+       editedCabalFile = "6b047ce80f7c2eab1edef56df078b25bd86bcb496f1c8f9962758a229324ef7c";
        libraryHaskellDepends = [
          base containers ghc-prim QuickCheck random transformers
        ];
@@ -176055,8 +177068,8 @@ self: {
     ({ mkDerivation, base, deepseq, prelude-extras }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.12";
-       sha256 = "91a4b9682568510ac79c66fff0c002c8994b5de6e09f42e93512188e293ffed0";
+       version = "0.1.13";
+       sha256 = "d31ea7498d3d317dbb22796fc4b26a06d16be5a398c2216ae9820b901503bf9d";
        libraryHaskellDepends = [ base deepseq prelude-extras ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -176459,8 +177472,8 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "unix-compat";
-       version = "0.4.2.0";
-       sha256 = "35f11770757853be6134b3e4d72a20ecd32c5b0326abebf2605d7ac00bd8d60c";
+       version = "0.4.3.1";
+       sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
@@ -177105,8 +178118,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-templater";
-       version = "0.2.0.0";
-       sha256 = "ba1c40d5c4cfc904ec355c0a179b38a4eebb9cd453b2d803df4fbaf37789fe7a";
+       version = "0.2.1.0";
+       sha256 = "b18621a1c4deed63e892395d4a2b0d20c7dbc81ecc8d977a18d99f23cc03943c";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers dlist HTTP mtl parsers
          template-haskell text trifecta unordered-containers vector
@@ -177114,7 +178127,7 @@ self: {
        testHaskellDepends = [
          ansi-wl-pprint base HUnit mtl template-haskell
        ];
-       homepage = "http://github.com/sanetracker/uri-templater";
+       homepage = "http://github.com/iand675/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178270,12 +179283,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "varying_0_6_0_0" = callPackage
+  "varying_0_7_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
      mkDerivation {
        pname = "varying";
-       version = "0.6.0.0";
-       sha256 = "f26af9b5a31095c8a8b8deabae2257a91ff749f99a0f5406b7c537a6e96b5c12";
+       version = "0.7.0.3";
+       sha256 = "6cd417fad6b30d8f9bd5a01dd21d059ecbc26cd1faf27bb7973eea43b5640309";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
@@ -178462,20 +179475,22 @@ self: {
      }) {};
 
   "vcsgui" = callPackage
-    ({ mkDerivation, base, directory, filepath, gtk3, mtl, process
-     , text, vcswrapper
+    ({ mkDerivation, base, directory, filepath, gi-gtk, gi-gtk-hs
+     , haskell-gi-base, mtl, process, text, vcswrapper
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.1.3.0";
-       sha256 = "0d8997fec3f3a0025045408f8e619abd9568247a08228daa0ff7fa9508e7b06b";
+       version = "0.2.1.0";
+       sha256 = "ef43f033ca5ad099a48890bc0b29a881b846e94e0fad833d65091027243836b8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base directory filepath gtk3 mtl process text vcswrapper
+         base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
+         process text vcswrapper
        ];
        executableHaskellDepends = [
-         base directory filepath gtk3 mtl process text vcswrapper
+         base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
+         process text vcswrapper
        ];
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
@@ -179281,6 +180296,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vinyl_0_5_3" = callPackage
+    ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.5.3";
+       sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest lens singletons ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vinyl-gl" = callPackage
     ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL
      , tagged, test-framework, test-framework-hunit, transformers
@@ -179695,7 +180723,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_13" = callPackage
+  "vty_5_14" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , data-default, deepseq, directory, filepath, hashable, HUnit
      , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
@@ -179706,8 +180734,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.13";
-       sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117";
+       version = "5.14";
+       sha256 = "6f96be6c79c55850f09589b940bfebcc774adddf8a8258af2235320893c53912";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182214,6 +183242,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
+  "webkit2gtk3-javascriptcore" = callPackage
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }:
+     mkDerivation {
+       pname = "webkit2gtk3-javascriptcore";
+       version = "0.14.2.1";
+       sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ webkit2gtk ];
+       description = "JavaScriptCore FFI from webkitgtk";
+       license = stdenv.lib.licenses.bsd3;
+     }) {webkit2gtk = null;};
+
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit
@@ -182310,8 +183351,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.9.7.0";
-       sha256 = "07141953f005347214233617ce2654265dea67f63ffbcf4656fdea47066b7baa";
+       version = "0.9.8.2";
+       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy network random SHA text
@@ -183038,19 +184079,17 @@ self: {
      }) {};
 
   "wl-pprint-annotated" = callPackage
-    ({ mkDerivation, base, containers, deepseq, HUnit, semigroups
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, base, containers, deepseq, HUnit, test-framework
+     , test-framework-hunit, text
      }:
      mkDerivation {
        pname = "wl-pprint-annotated";
-       version = "0.0.1.2";
-       sha256 = "7fa75ad09c60f72fa75430c862667847cd83fa4c9e912bf86b00f3eed6a4af33";
-       libraryHaskellDepends = [
-         base containers deepseq semigroups text
-       ];
+       version = "0.0.1.3";
+       sha256 = "f59627ca7e26bafee3954a0ce807243e93f38b229e7ecbb335d0e1fc32decae1";
+       libraryHaskellDepends = [ base containers deepseq text ];
        testHaskellDepends = [
-         base containers deepseq HUnit semigroups test-framework
-         test-framework-hunit text
+         base containers deepseq HUnit test-framework test-framework-hunit
+         text
        ];
        homepage = "https://github.com/minad/wl-pprint-annotated#readme";
        description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
@@ -183240,8 +184279,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.2.13";
-       sha256 = "3c6ab5d67238b760d883c3943c3131720d0f07f4edb037c6531b9a827529f7d7";
+       version = "0.2.14";
+       sha256 = "0c154567da03ceb1fd748223bce9cb62f6c6b3cede94ab79e1b2693329fcf062";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183883,21 +184922,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.1";
-       sha256 = "285d9122bd2da4e6968d7c4f199858ccb2a6ea888f83cf7873f8cc651b755cdf";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_3" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -183910,7 +184934,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -184141,8 +185164,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509";
-       version = "1.6.4";
-       sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42";
+       version = "1.6.5";
+       sha256 = "b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite hourglass memory mtl pem
@@ -186235,37 +187258,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
-     , semigroups, template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.20";
-       sha256 = "d5cda5b2849afb9f0d7572759c3e006798d7efaeeb0bf0d3825f12832a0a3b11";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         enclosed-exceptions filepath resourcet scientific semigroups
-         template-haskell 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;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_21_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -186294,7 +187286,6 @@ self: {
        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
@@ -186806,8 +187797,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.13.5";
-       sha256 = "42bfdfe72f5ef9f9e43d12dcd47f5a3415e6b883d455a7ad4cbfb7e900e760bf";
+       version = "1.4.15";
+       sha256 = "a917b003c348aa4b3d8c673efb32e0ea0f9190affa86d435b9bea9f11ab85cfd";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -186822,36 +187813,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-auth_1_4_14" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, mime-mail
-     , network-uri, nonce, persistent, persistent-template, random
-     , resourcet, safe, shakespeare, template-haskell, text, time
-     , transformers, unordered-containers, wai, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.14";
-       sha256 = "44f5c8c4f1c129fd8552d583679bb848b54ab3ed81e86e7038edaf8996a6ca85";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptohash data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -187101,6 +188062,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-auth-nopassword" = callPackage
+    ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text
+     , uuid, yesod-auth, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-nopassword";
+       version = "0.1.0.1";
+       sha256 = "a2ae8ba484ebd509eb8507b879eae29876ee9284facf1dfc4f94eea4f092106f";
+       libraryHaskellDepends = [
+         base blaze-markup http-types pwstore-fast text uuid yesod-auth
+         yesod-core yesod-form
+       ];
+       homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme";
+       description = "A plugin for Yesod to provide email-only authentication";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-auth-oauth" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
@@ -187373,8 +188351,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.26";
-       sha256 = "2441476cd66d5e615ce33d7d378f121e6f05875fa92a0e8afd3ab47c3d50dd6d";
+       version = "1.4.30";
+       sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -187398,47 +188376,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-core_1_4_28" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , data-default, deepseq, deepseq-generics, directory, exceptions
-     , fast-logger, hspec, hspec-expectations, http-types, HUnit
-     , lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.4.28";
-       sha256 = "f544294deb9f9ac499885b6978d64a9467213908d19b6af6a4c46846d1990186";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-builder blaze-html blaze-markup
-         byteable bytestring case-insensitive cereal clientsession conduit
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -187768,6 +188705,8 @@ self: {
        pname = "yesod-ip";
        version = "0.5.0";
        sha256 = "b6945480c694b48c03daceb6c286636f65ed9c442b7b94774814c1078418a029";
+       revision = "1";
+       editedCabalFile = "257cdc5ff06969dc0298e4b92be3907fce4e9ad20eefd132e2f634bab47d0a83";
        libraryHaskellDepends = [
          base http-api-data ip path-pieces persistent text yesod-core
          yesod-form
@@ -187978,6 +188917,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-persistent_1_4_1_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.4.1.0";
+       sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-platform" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
      , asn1-parse, asn1-types, attoparsec-conduit, authenticate
@@ -188455,8 +189417,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-test";
-       version = "1.5.3";
-       sha256 = "4253af356d95fd1888501a640460a48b1ccc4fa81fdd2fd22dfa3c22dd44ab19";
+       version = "1.5.4.1";
+       sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
@@ -188472,34 +189434,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-test_1_5_4" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.4";
-       sha256 = "c8b69211a49939fa74e3d799626487dcc358213896eec6e887f3051843b7a17a";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -188600,24 +189534,6 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, enclosed-exceptions
-     , monad-control, transformers, wai, wai-websockets, websockets
-     , yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-websockets";
-       version = "0.2.4";
-       sha256 = "7067115f0e7e282879718798bba627ab967eb38a419fc2180cc6b58259ea9adc";
-       libraryHaskellDepends = [
-         async base conduit enclosed-exceptions monad-control transformers
-         wai wai-websockets websockets yesod-core
-       ];
-       homepage = "https://github.com/yesodweb/yesod";
-       description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-websockets_0_2_4_1" = callPackage
     ({ mkDerivation, async, base, conduit, enclosed-exceptions
      , monad-control, transformers, wai, wai-websockets, websockets
      , yesod-core
@@ -188633,7 +189549,6 @@ self: {
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets-extra" = callPackage
@@ -188750,7 +189665,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi_0_13_3" = callPackage
+  "yi_0_13_5" = callPackage
     ({ mkDerivation, base, microlens-platform, mtl
      , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
      , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -188758,8 +189673,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.13.3";
-       sha256 = "e6caf353d17a18378a6a31a90f8b4130eab7ea51d548218d620e9037b0a01036";
+       version = "0.13.5";
+       sha256 = "902341a7927ee1d255d44286e46dc46b6c4282026c52c1c571d3999cf3a7259f";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -188806,8 +189721,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.13.3";
-       sha256 = "41f2ace2aa9cdbcc8392ac007c5c94a2785a659acd50d8fb5b3a87a9f296948c";
+       version = "0.13.5";
+       sha256 = "b84b49f40b7cf9801a3d7fcf0bf11f4e828ecfc7cd20800d8b2f46fd596e8829";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state dyre exceptions filepath hashable
@@ -188849,8 +189764,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.13.3";
-       sha256 = "8da397739c5b448aa825f69bb2f0d085c68091540cc6e80fa09d384acc8a1cfd";
+       version = "0.13.5";
+       sha256 = "f2cf5d62e161d7edd1c664874daa5acdc2ec70d7e9b6cc7f688d2d02963272b0";
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -188868,8 +189783,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.13.3";
-       sha256 = "3dd96a09085b7ad5375e9038af38fef7cb72c1c3dd9c7941fbe40d4ae43f5002";
+       version = "0.13.5";
+       sha256 = "5be74cdfd2e0ca9d0a8af5895013f8fee86e55e2a6484f66253f761090a137b3";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language
@@ -188897,15 +189812,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-fuzzy-open_0_13_3" = callPackage
+  "yi-fuzzy-open_0_13_5" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.13.3";
-       sha256 = "51f827d2d9deec703a0450f90aed40d2084379fc3ab59d51d13b444f316e893c";
+       version = "0.13.5";
+       sha256 = "a71c3fd14598bb153cb64d45cfa60c40c4e97e9ed74e422c6fac566330ed9e2d";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi-core yi-language yi-rope
@@ -188934,8 +189849,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.13.3";
-       sha256 = "7f8f3985386f3a64ad4de36c93b81183a08f9c0d5d9fbe4acfc47ac2a19cb2c7";
+       version = "0.13.5";
+       sha256 = "0ffe75cb958387aa4512cd07a40a25df4a68d2109b2d5530208ee291e03d7b48";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
@@ -188951,8 +189866,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.13.3";
-       sha256 = "ba7836bd5192212baa9b3ae5c7a839953be08be67aa5199068f472f9a24f5a54";
+       version = "0.13.5";
+       sha256 = "d49e00c8097e23d6626b58e6cfa875f76a3a215524d29bb11fef09f91f4d57c5";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
@@ -188969,8 +189884,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.13.3";
-       sha256 = "3b2ee411a67904f011c6f5f9ac7739d7c4571c4a0c8deaef82aaeb44176cd1b2";
+       version = "0.13.5";
+       sha256 = "8019d069cc6f81a5c13b5429fd60db008ec224cc3df55c6384a0067edeeb0416";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -188991,8 +189906,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.13.3";
-       sha256 = "e81caeb7866e485a88ede2b88cfe7f6fbbc6ea9cd21424502d11150df64211b4";
+       version = "0.13.5";
+       sha256 = "c37a48f0915f4a1584ae684e227102bed334f64ceec851547b2789e645c74907";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -189037,7 +189952,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-language_0_13_3" = callPackage
+  "yi-language_0_13_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -189046,8 +189961,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.13.3";
-       sha256 = "06d3c328777bed0fb1c0ab8a7fabfed6603fa6cfc4d50f3195c85e9bae99cc5f";
+       version = "0.13.5";
+       sha256 = "d599c10c37cc829dba86c9e35da6d58a6e84c99aaab18a5a8418d4baab22fcfd";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -189067,18 +189982,19 @@ self: {
      }) {};
 
   "yi-misc-modes" = callPackage
-    ({ mkDerivation, array, base, binary, data-default, filepath
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
      , yi-rope
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.13.3";
-       sha256 = "94993c405dccbc2aa4f5077096560c68219414a2d747f84a195b4fd556f7e63e";
+       version = "0.13.5";
+       sha256 = "5889c2011813f37d58311a52714c5d8f165e6a0640b7af4752190d9d3db921a9";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform
          semigroups text yi-core yi-language yi-rope
        ];
+       libraryToolDepends = [ alex ];
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
@@ -189086,20 +190002,21 @@ self: {
      }) {};
 
   "yi-mode-haskell" = callPackage
-    ({ mkDerivation, array, base, binary, containers, data-default
-     , filepath, hashable, hspec, microlens-platform, pointedlist
-     , QuickCheck, regex-base, regex-tdfa, template-haskell, text
-     , transformers-base, unordered-containers, yi-core, yi-language
-     , yi-rope
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, filepath, hashable, hspec, microlens-platform
+     , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell
+     , text, transformers-base, unordered-containers, yi-core
+     , yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.13.3";
-       sha256 = "438ff92a24aef5e3cb7a8aa0046014b8f40927f046a612f830a20fb2ef9a6fde";
+       version = "0.13.5";
+       sha256 = "4323b34b6ae45391072300d9ba8350df8237fc5984fa4ad962bcfd20f2046f99";
        libraryHaskellDepends = [
          array base binary data-default microlens-platform text yi-core
          yi-language yi-rope
        ];
+       libraryToolDepends = [ alex ];
        testHaskellDepends = [
          array base binary containers data-default filepath hashable hspec
          microlens-platform pointedlist QuickCheck regex-base regex-tdfa
@@ -189113,17 +190030,19 @@ self: {
      }) {};
 
   "yi-mode-javascript" = callPackage
-    ({ mkDerivation, array, base, binary, data-default, dlist, filepath
-     , microlens-platform, mtl, text, yi-core, yi-language, yi-rope
+    ({ mkDerivation, alex, array, base, binary, data-default, dlist
+     , filepath, microlens-platform, mtl, text, yi-core, yi-language
+     , yi-rope
      }:
      mkDerivation {
        pname = "yi-mode-javascript";
-       version = "0.13.3";
-       sha256 = "1a24664cf2d65732b5575bd4ab3bc92d3897a3c6af4bc93296945429b5c974f3";
+       version = "0.13.5";
+       sha256 = "156db2b03fb06ce12bb6e17a0b07c7acdac42a29734b714860777e234c86381c";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
        ];
+       libraryToolDepends = [ alex ];
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
@@ -189189,8 +190108,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.13.3";
-       sha256 = "0373adb2e93de479995cc64299106a3fb2ba2dbfb5abb87d811ef13f47a39077";
+       version = "0.13.5";
+       sha256 = "f3b67c88c01a6c190013870ae7dd371ccc77f619c73247effb9c3e2d36a6ab13";
        libraryHaskellDepends = [
          base binary containers data-default free lens mtl text vector
          yi-core yi-rope

From 7f1d74d43b4699d0c98825ecb59e1fc462ebf7b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Dec 2016 20:43:50 +0100
Subject: [PATCH 172/295] haskell-brick: update overrides with regard to vty

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 700f9d0dbb2..1ce125e4164 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -512,7 +512,7 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
-  vty_5_13 = dontCheck super.vty_5_13;
+  vty_5_14 = dontCheck super.vty_5_14;
 
   # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
   crypto-pubkey = dontCheck super.crypto-pubkey;
@@ -1128,6 +1128,6 @@ self: super: {
   barrier = doJailbreak super.barrier;
 
   # requires vty 5.13
-  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_13; });
+  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
 
 }

From 3e092a19f3aa6bdb5ae9e12dc994c0b48ae64369 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Dec 2016 18:04:24 +0100
Subject: [PATCH 173/295] haskell-math-functions: test suite fails sporadically

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1ce125e4164..f07d6628e4b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1057,6 +1057,9 @@ self: super: {
     doCheck = false;
   });
 
+  # https://github.com/bos/math-functions/issues/25
+  math-functions = dontCheck super.math-functions;
+
   # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
   # is hard because of transitive dependencies, so we just disable tests.
   http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3;

From f135c9fde7ba9a8922ebcf847b59b4bb7717f074 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Dec 2016 22:25:17 +0100
Subject: [PATCH 174/295] configuration-hackage2nix.yaml: maintain hledger
 packages to ensure they build

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 220b7bc8dc2..d99253eb665 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2045,7 +2045,12 @@ package-maintainers:
     - funcmp
     - git-annex
     - hackage-db
+    - hledger
+    - hledger-diff
     - hledger-interest
+    - hledger-irr
+    - hledger-ui
+    - hledger-web
     - hopenssl
     - hsdns
     - hsemail
@@ -4444,7 +4449,6 @@ dont-distribute-packages:
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-ui:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]

From 1e14698a5828a09e8b2b3195e537dfcee3f4d3f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 8 Dec 2016 11:51:30 +0100
Subject: [PATCH 175/295] haskell-Cabal: update latest version to 1.24.2.0

---
 pkgs/development/haskell-modules/configuration-common.nix     | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f07d6628e4b..1198b60101d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -10,7 +10,7 @@ self: super: {
   ghcjs-base = null;
 
   # Some packages need a non-core version of Cabal.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
 
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 9710d139f8a..564ce3c04ec 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -37,10 +37,10 @@ self: super: {
   xhtml = null;
 
   # Enable latest version of cabal-install.
-  cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; });
+  cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
 
   # Build jailbreak-cabal with the latest version of Cabal.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";

From 80c35f6f3dc666df91205b71283aa488cc342a77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Dec 2016 22:02:01 +0100
Subject: [PATCH 176/295] cabal-install: always use the latest version by
 default

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d99253eb665..099735eb769 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -263,7 +263,6 @@ default-package-overrides:
   - cabal-dependency-licenses ==0.1.2.0
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.2.0
-  - cabal-install ==1.24.0.1
   - cabal-rpm ==0.10.1
   - cabal-sort ==0.0.5.3
   - cabal-src ==0.3.0.2

From 64afb52f6cf3c07eeba8ad88a0643ca53c9ab007 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Dec 2016 14:37:56 +0100
Subject: [PATCH 177/295] git-annex: fix sha hash for the new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1198b60101d..5c575c36205 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -53,7 +53,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd";
+      sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr";
       rev = drv.version;
     };
   })).overrideScope (self: super: {

From 69c09c47e65ac220d9306687feb79544aeb2567a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Dec 2016 15:22:07 +0100
Subject: [PATCH 178/295] stack: version 1.3.x needs aeson 1.x to compile

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5c575c36205..0feb7b0c47a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -994,13 +994,14 @@ self: super: {
     '';
   });
 
-  # https://github.com/commercialhaskell/stack/issues/2263
+  # The most current version needs some packages to build that are not in LTS 7.x.
   stack = super.stack.overrideScope (self: super: {
     http-client = self.http-client_0_5_4;
     http-client-tls = self.http-client-tls_0_3_3;
     http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
     criterion = super.criterion.override { inherit (super) optparse-applicative; };
+    aeson = self.aeson_1_0_2_1;
   });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.

From acbbf6a3cc1489b4fd1989872e6a2a5b72809df7 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 12 Dec 2016 16:54:28 -0500
Subject: [PATCH 179/295] Fixup haskell-src-exts version

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0feb7b0c47a..eee8f9df457 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -819,7 +819,7 @@ self: super: {
       ln -s $lispdir $out/share/emacs/site-lisp
     '';
   })).override {
-    haskell-src-exts = self.haskell-src-exts_1_19_0;
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
   };
 
   # # Make elisp files available at a location where people expect it.
@@ -833,7 +833,7 @@ self: super: {
     '';
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   })).override {
-    haskell-src-exts = self.haskell-src-exts_1_19_0;
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
   };
 
   # https://github.com/yesodweb/Shelly.hs/issues/106
@@ -1005,7 +1005,7 @@ self: super: {
   });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
-  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; };
+  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
 
   # To be in sync with Hoogle.
   lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: {
@@ -1024,7 +1024,7 @@ self: super: {
   };
 
   # Needs new version.
-  haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_0; };
+  haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
 
   # Test suite fails a QuickCheck property.
   optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;

From 1edf95167aeca72f2c0f60b9ef46dceccd1bf1cb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 14 Dec 2016 09:35:10 -0500
Subject: [PATCH 180/295] subversion: 1.8.16 -> 1.8.17

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 1fbedcaf9d7..eddbc0e56dd 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -104,8 +104,8 @@ let
 
 in {
   subversion18 = common {
-    version = "1.8.16";
-    sha256 = "0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi";
+    version = "1.8.17";
+    sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy";
   };
 
   subversion19 = common {

From b217c0a99ba22371b2a73821a8e127892f2e24d4 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Wed, 14 Dec 2016 15:46:45 +0100
Subject: [PATCH 181/295] yarn: init at 0.17.8 (#20635)

---
 pkgs/development/node-packages/node-env.nix   | 109 +-
 .../node-packages/node-packages-v4.nix        | 973 +++++++++++++++---
 .../node-packages/node-packages-v6.nix        | 604 +++++++++--
 .../node-packages/node-packages.json          |   1 +
 pkgs/top-level/node-packages.json             |   1 +
 5 files changed, 1374 insertions(+), 314 deletions(-)

diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 389ccae2fe5..414f60420af 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -8,19 +8,19 @@ let
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
     mkdir -p $out/bin
-
+    
     cat > $out/bin/tar <<EOF
     #! ${stdenv.shell} -e
     $(type -p tar) "\$@" --warning=no-unknown-keyword
     EOF
-
+    
     chmod +x $out/bin/tar
   '';
-
+  
   # Function that generates a TGZ file from a NPM project
   buildNodeSourceDist =
     { name, version, src, ... }:
-
+    
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
@@ -44,13 +44,13 @@ let
           # Bundle the dependencies of the package
           mkdir -p node_modules
           cd node_modules
-
+          
           # Only include dependencies if they don't exist. They may also be bundled in the package.
           if [ ! -e "${dependency.name}" ]
           then
               ${composePackage dependency}
           fi
-
+          
           cd ..
         ''
       ) dependencies);
@@ -63,13 +63,13 @@ let
         text = ''
           var fs = require('fs');
           var url = require('url');
-
+          
           /*
            * Replaces an impure version specification by *
            */
           function replaceImpureVersionSpec(versionSpec) {
               var parsedUrl = url.parse(versionSpec);
-
+              
               if(versionSpec == "latest" || versionSpec == "unstable" ||
                   versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
                   return '*';
@@ -79,9 +79,9 @@ let
               else
                   return versionSpec;
           }
-
+      
           var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
+      
           /* Replace dependencies */
           if(packageObj.dependencies !== undefined) {
               for(var dependency in packageObj.dependencies) {
@@ -89,7 +89,7 @@ let
                   packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-
+          
           /* Replace development dependencies */
           if(packageObj.devDependencies !== undefined) {
               for(var dependency in packageObj.devDependencies) {
@@ -97,7 +97,7 @@ let
                   packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-
+          
           /* Replace optional dependencies */
           if(packageObj.optionalDependencies !== undefined) {
               for(var dependency in packageObj.optionalDependencies) {
@@ -105,7 +105,7 @@ let
                   packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-
+          
           /* Write the fixed JSON file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj));
         '';
@@ -114,47 +114,40 @@ let
     ''
       DIR=$(pwd)
       cd $TMPDIR
-
+      
       unpackFile ${src}
-
+      
       # Make the base dir in which the target dependency resides first
       mkdir -p "$(dirname "$DIR/${packageName}")"
 
       if [ -f "${src}" ]
       then
           # Figure out what directory has been unpacked
-          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
-
+          packageDir=$(find . -type d -maxdepth 1 | tail -1)
+          
           # Restore write permissions to make building work
           find "$packageDir" -type d -print0 | xargs -0 chmod u+x
           chmod -R u+w "$packageDir"
-
+          
           # Move the extracted tarball into the output folder
           mv "$packageDir" "$DIR/${packageName}"
       elif [ -d "${src}" ]
       then
-          # Get a stripped name (without hash) of the source directory.
-          # On old nixpkgs it's already set internally.
-          if [ -z "$strippedName" ]
-          then
-              strippedName="$(stripHash ${src})"
-          fi
-
           # Restore write permissions to make building work
-          chmod -R u+w "$strippedName"
-
+          chmod -R u+w $strippedName
+          
           # Move the extracted directory into the output folder
-          mv "$strippedName" "$DIR/${packageName}"
+          mv $strippedName "$DIR/${packageName}"
       fi
 
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
-
+      
       # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
       # The following JavaScript replaces these by * to prevent that
       cd "$DIR/${packageName}"
       node ${fixImpureDependencies}
-
+      
       # Include the dependencies of the package
       ${includeDependencies { inherit dependencies; }}
       cd ..
@@ -167,36 +160,36 @@ let
     tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv node-* $out
   '';
-
+  
   # Builds and composes an NPM package including all its dependencies
   buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
-
+    
     stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
       name = "node-${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
       dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
-
+      
       inherit dontNpmInstall preRebuild;
-
+      
       unpackPhase = args.unpackPhase or "true";
-
+      
       buildPhase = args.buildPhase or "true";
-
+      
       compositionScript = composePackage args;
       passAsFile = [ "compositionScript" ];
-
+      
       installPhase = args.installPhase or ''
         # Create and enter a root node_modules/ folder
         mkdir -p $out/lib/node_modules
         cd $out/lib/node_modules
-
+          
         # Compose the package and all its dependencies
         source $compositionScriptPath
-
+        
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
         patchShebangs .
-
+        
         # Deploy the Node.js package by running npm install. Since the
         # dependencies have been provided already by ourselves, it should not
         # attempt to install them again, which is good, because we want to make
@@ -206,26 +199,23 @@ let
         #
         # The other responsibilities of NPM are kept -- version checks, build
         # steps, postprocessing etc.
-
+        
         export HOME=$TMPDIR
         cd "${packageName}"
         runHook preRebuild
         npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
+        
         if [ "$dontNpmInstall" != "1" ]
         then
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
-
+        
         # Create symlink to the deployed executable folder, if applicable
         if [ -d "$out/lib/node_modules/.bin" ]
         then
             ln -s $out/lib/node_modules/.bin $out/bin
         fi
-
+        
         # Create symlinks to the deployed manual page folders, if applicable
         if [ -d "$out/lib/node_modules/${packageName}/man" ]
         then
@@ -239,7 +229,7 @@ let
                 done
             done
         fi
-
+        
         # Run post install hook, if provided
         runHook postInstall
       '';
@@ -250,17 +240,17 @@ let
     let
       nodeDependencies = stdenv.mkDerivation {
         name = "node-dependencies-${name}-${version}";
-
+        
         buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-
+        
         includeScript = includeDependencies { inherit dependencies; };
         passAsFile = [ "includeScript" ];
-
+        
         buildCommand = ''
           mkdir -p $out/lib
           cd $out/lib
           source $includeScriptPath
-
+          
           # Create fake package.json to make the npm commands work properly
           cat > package.json <<EOF
           {
@@ -268,18 +258,15 @@ let
               "version": "${version}"
           }
           EOF
-
+          
           # Patch the shebangs of the bundled modules to prevent them from
           # calling executables outside the Nix store as much as possible
           patchShebangs .
-
-          export HOME=$PWD
+          
+          export HOME=$TMPDIR
           npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-
+          
           ${stdenv.lib.optionalString (!dontNpmInstall) ''
-            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-            rm -f npm-shrinkwrap.json
-
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
           ''}
 
@@ -289,7 +276,7 @@ let
     in
     stdenv.lib.makeOverridable stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
-
+      
       buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
       buildCommand = ''
         mkdir -p $out/bin
@@ -300,7 +287,7 @@ let
         EOF
         chmod +x $out/bin/shell
       '';
-
+      
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index e6c31441967..20197d1833e 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -868,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.16.0" = {
+    "moment-2.17.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.16.0";
+      version = "2.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
-        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
+        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
       };
     };
     "ms-rest-1.15.2" = {
@@ -1129,13 +1129,13 @@ let
         sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
-    "xpath.js-1.0.6" = {
+    "xpath.js-1.0.7" = {
       name = "xpath.js";
       packageName = "xpath.js";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz";
-        sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
+        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
+        sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
       };
     };
     "base64url-2.0.0" = {
@@ -1894,13 +1894,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.2" = {
+    "async-2.1.4" = {
       name = "async";
       packageName = "async";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
-        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
+        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
     "lodash-4.17.2" = {
@@ -2965,13 +2965,13 @@ let
         sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "graceful-fs-4.1.10" = {
+    "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.10";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz";
-        sha1 = "f2d720c22092f743228775c75e3612632501f131";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
     "parse-json-2.2.0" = {
@@ -3181,13 +3181,13 @@ let
         sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
       };
     };
-    "browser-pack-6.0.1" = {
+    "browser-pack-6.0.2" = {
       name = "browser-pack";
       packageName = "browser-pack";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz";
-        sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
+        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz";
+        sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531";
       };
     };
     "browser-resolve-1.11.2" = {
@@ -4468,13 +4468,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.3" = {
+    "numeral-1.5.5" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.3";
+      version = "1.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
-        sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
+        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
       };
     };
     "open-0.0.5" = {
@@ -9449,13 +9449,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.1.3" = {
+    "prettyjson-1.2.0" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz";
-        sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
+        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
       };
     };
     "shush-1.0.0" = {
@@ -13833,6 +13833,15 @@ let
         sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
       };
     };
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+      };
+    };
     "libbase64-0.1.0" = {
       name = "libbase64";
       packageName = "libbase64";
@@ -14220,13 +14229,13 @@ let
         sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
       };
     };
-    "buffer-crc32-0.2.6" = {
+    "buffer-crc32-0.2.13" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
-      version = "0.2.6";
+      version = "0.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
-        sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
       };
     };
     "fresh-0.1.0" = {
@@ -16681,13 +16690,13 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
-    "commoner-0.10.4" = {
+    "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
-      version = "0.10.4";
+      version = "0.10.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz";
-        sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8";
+        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz";
+        sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5";
       };
     };
     "jstransform-10.1.0" = {
@@ -16708,31 +16717,31 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.10.43" = {
+    "recast-0.11.17" = {
       name = "recast";
       packageName = "recast";
-      version = "0.10.43";
+      version = "0.11.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz";
-        sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
+        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
       };
     };
-    "esprima-fb-15001.1001.0-dev-harmony-fb" = {
-      name = "esprima-fb";
-      packageName = "esprima-fb";
-      version = "15001.1001.0-dev-harmony-fb";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz";
-        sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659";
-      };
-    };
-    "ast-types-0.8.15" = {
+    "ast-types-0.9.2" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.8.15";
+      version = "0.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz";
-        sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz";
+        sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
+      };
+    };
+    "esprima-3.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
+        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
       };
     };
     "base62-0.1.1" = {
@@ -17636,6 +17645,15 @@ let
         sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
       };
     };
+    "async-2.1.2" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+      };
+    };
     "fields-0.1.24" = {
       name = "fields";
       packageName = "fields";
@@ -17663,6 +17681,15 @@ let
         sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
       };
     };
+    "moment-2.16.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
+      };
+    };
     "node-appc-0.2.39" = {
       name = "node-appc";
       packageName = "node-appc";
@@ -18410,13 +18437,13 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.30" = {
+    "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
-      version = "0.0.30";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz";
-        sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -18644,6 +18671,150 @@ let
         sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
       };
     };
+    "babel-runtime-6.18.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
+        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+      };
+    };
+    "death-1.0.0" = {
+      name = "death";
+      packageName = "death";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
+        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+      };
+    };
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+      };
+    };
+    "invariant-2.2.2" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+      };
+    };
+    "is-ci-1.0.10" = {
+      name = "is-ci";
+      packageName = "is-ci";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+      };
+    };
+    "leven-2.0.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
+        sha1 = "74c45744439550da185801912829f61d22071bc1";
+      };
+    };
+    "node-emoji-1.4.1" = {
+      name = "node-emoji";
+      packageName = "node-emoji";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
+        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+      };
+    };
+    "object-path-0.11.3" = {
+      name = "object-path";
+      packageName = "object-path";
+      version = "0.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
+        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+      };
+    };
+    "proper-lockfile-1.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
+        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+      };
+    };
+    "request-capture-har-1.1.4" = {
+      name = "request-capture-har";
+      packageName = "request-capture-har";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
+        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+      };
+    };
+    "roadrunner-1.1.0" = {
+      name = "roadrunner";
+      packageName = "roadrunner";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
+        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+      };
+    };
+    "regenerator-runtime-0.9.6" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+      };
+    };
+    "loose-envify-1.3.0" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
+        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+      };
+    };
+    "ci-info-1.0.0" = {
+      name = "ci-info";
+      packageName = "ci-info";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
+      };
+    };
+    "string.prototype.codepointat-0.2.0" = {
+      name = "string.prototype.codepointat";
+      packageName = "string.prototype.codepointat";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
+        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
+      };
+    };
+    "err-code-1.1.1" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
+        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
+      };
+    };
   };
 in
 {
@@ -18782,7 +18953,7 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."xmldom-0.1.22"
-          sources."xpath.js-1.0.6"
+          sources."xpath.js-1.0.7"
         ];
       })
       sources."async-1.4.2"
@@ -18928,7 +19099,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.16.0"
+      sources."moment-2.17.0"
       (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
@@ -19047,7 +19218,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.2" // {
+              (sources."async-2.1.4" // {
                 dependencies = [
                   sources."lodash-4.17.2"
                 ];
@@ -19395,7 +19566,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -19420,7 +19591,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -19480,7 +19651,7 @@ in
       sources."bower-logger-0.2.1"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
@@ -19590,7 +19761,7 @@ in
         ];
       })
       sources."assert-1.3.0"
-      (sources."browser-pack-6.0.1" // {
+      (sources."browser-pack-6.0.2" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
             dependencies = [
@@ -20064,7 +20235,7 @@ in
                     dependencies = [
                       (sources."load-json-file-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
                               (sources."error-ex-1.3.0" // {
@@ -20089,7 +20260,7 @@ in
                       })
                       (sources."path-type-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                           sources."pify-2.3.0"
                           (sources."pinkie-promise-2.0.1" // {
                             dependencies = [
@@ -20178,7 +20349,7 @@ in
             ];
           })
           sources."network-address-0.0.5"
-          sources."numeral-1.5.3"
+          sources."numeral-1.5.5"
           sources."open-0.0.5"
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -20775,7 +20946,7 @@ in
                     ];
                   })
                   sources."assert-1.3.0"
-                  (sources."browser-pack-6.0.1" // {
+                  (sources."browser-pack-6.0.2" // {
                     dependencies = [
                       (sources."combine-source-map-0.7.2" // {
                         dependencies = [
@@ -21292,7 +21463,7 @@ in
                       })
                     ];
                   })
-                  sources."graceful-fs-4.1.10"
+                  sources."graceful-fs-4.1.11"
                 ];
               })
               (sources."validate-npm-package-license-3.0.1" // {
@@ -21374,7 +21545,7 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               sources."hosted-git-info-2.1.5"
               sources."inflight-1.0.6"
               sources."inherits-2.0.3"
@@ -21549,7 +21720,7 @@ in
                   sources."forever-agent-0.6.1"
                   (sources."form-data-1.0.1" // {
                     dependencies = [
-                      (sources."async-2.1.2" // {
+                      (sources."async-2.1.4" // {
                         dependencies = [
                           sources."lodash-4.17.2"
                         ];
@@ -21755,7 +21926,7 @@ in
               sources."block-stream-0.0.9"
               (sources."fstream-1.0.10" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.10"
+                  sources."graceful-fs-4.1.11"
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
                       sources."minimist-0.0.8"
@@ -21838,7 +22009,7 @@ in
           })
           (sources."configstore-1.4.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -22057,7 +22228,7 @@ in
           })
           (sources."configstore-1.4.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -23059,7 +23230,7 @@ in
                 dependencies = [
                   (sources."load-json-file-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -23084,7 +23255,7 @@ in
                   })
                   (sources."path-type-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       sources."pify-2.3.0"
                       (sources."pinkie-promise-2.0.1" // {
                         dependencies = [
@@ -23259,7 +23430,7 @@ in
                   sources."rimraf-2.5.4"
                 ];
               })
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               sources."write-0.2.1"
             ];
           })
@@ -23682,7 +23853,7 @@ in
               })
               (sources."readdirp-2.1.0" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.10"
+                  sources."graceful-fs-4.1.11"
                   (sources."readable-stream-2.2.2" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
@@ -23903,7 +24074,7 @@ in
                           sources."block-stream-0.0.9"
                           (sources."fstream-1.0.10" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                             ];
                           })
                         ];
@@ -23917,7 +24088,7 @@ in
                           })
                           (sources."fstream-1.0.10" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                             ];
                           })
                           sources."fstream-ignore-1.0.5"
@@ -23996,7 +24167,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.1.3" // {
+      (sources."prettyjson-1.2.0" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -24426,7 +24597,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -24451,7 +24622,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -25796,7 +25967,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       (sources."http-proxy-1.15.2" // {
         dependencies = [
           sources."eventemitter3-1.2.0"
@@ -26503,7 +26674,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           (sources."gulp-sourcemaps-1.6.0" // {
             dependencies = [
               sources."convert-source-map-1.3.0"
@@ -26653,7 +26824,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
@@ -26919,7 +27090,7 @@ in
           sources."block-stream-0.0.9"
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -27029,7 +27200,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       (sources."minimatch-3.0.3" // {
         dependencies = [
           (sources."brace-expansion-1.1.6" // {
@@ -27377,7 +27548,7 @@ in
                             dependencies = [
                               (sources."load-json-file-1.1.0" // {
                                 dependencies = [
-                                  sources."graceful-fs-4.1.10"
+                                  sources."graceful-fs-4.1.11"
                                   (sources."parse-json-2.2.0" // {
                                     dependencies = [
                                       (sources."error-ex-1.3.0" // {
@@ -27402,7 +27573,7 @@ in
                               })
                               (sources."path-type-1.1.0" // {
                                 dependencies = [
-                                  sources."graceful-fs-4.1.10"
+                                  sources."graceful-fs-4.1.11"
                                   sources."pify-2.3.0"
                                   (sources."pinkie-promise-2.0.1" // {
                                     dependencies = [
@@ -27794,7 +27965,7 @@ in
                   sources."block-stream-0.0.9"
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
                   sources."inherits-2.0.3"
@@ -27809,7 +27980,7 @@ in
                   })
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -28062,7 +28233,7 @@ in
                   sources."block-stream-0.0.9"
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
                   sources."inherits-2.0.3"
@@ -28077,7 +28248,7 @@ in
                   })
                   (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -28404,7 +28575,7 @@ in
           sources."block-stream-0.0.9"
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
             ];
           })
           sources."inherits-2.0.3"
@@ -28419,7 +28590,7 @@ in
           })
           (sources."fstream-1.0.10" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               sources."inherits-2.0.3"
             ];
           })
@@ -28566,7 +28737,7 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
@@ -28787,7 +28958,7 @@ in
                       sources."block-stream-0.0.9"
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                         ];
                       })
                     ];
@@ -28801,7 +28972,7 @@ in
                       })
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                         ];
                       })
                       sources."fstream-ignore-1.0.5"
@@ -28919,7 +29090,7 @@ in
           })
           (sources."configstore-1.4.0" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -29176,7 +29347,7 @@ in
         dependencies = [
           (sources."moment-timezone-0.5.9" // {
             dependencies = [
-              sources."moment-2.16.0"
+              sources."moment-2.17.0"
             ];
           })
         ];
@@ -29271,7 +29442,7 @@ in
       })
       (sources."fs-extra-0.30.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
@@ -29812,7 +29983,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.2" // {
+                  (sources."async-2.1.4" // {
                     dependencies = [
                       sources."lodash-4.17.2"
                     ];
@@ -29923,7 +30094,7 @@ in
             dependencies = [
               (sources."libmime-1.2.0" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                 ];
@@ -29942,7 +30113,7 @@ in
                               sources."ms-0.7.2"
                             ];
                           })
-                          sources."iconv-lite-0.4.13"
+                          sources."iconv-lite-0.4.15"
                         ];
                       })
                     ];
@@ -29956,7 +30127,7 @@ in
                       sources."ms-0.7.2"
                     ];
                   })
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                 ];
               })
               (sources."nodemailer-direct-transport-1.1.0" // {
@@ -29992,7 +30163,7 @@ in
               })
               (sources."encoding-0.1.12" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                 ];
               })
               sources."mime-1.3.4"
@@ -30365,7 +30536,7 @@ in
                       sources."block-stream-0.0.9"
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                         ];
                       })
                       sources."inherits-2.0.3"
@@ -30380,7 +30551,7 @@ in
                       })
                       (sources."fstream-1.0.10" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                           sources."inherits-2.0.3"
                         ];
                       })
@@ -30495,7 +30666,7 @@ in
           sources."range-parser-0.0.4"
           sources."mkdirp-0.3.5"
           sources."cookie-0.0.5"
-          sources."buffer-crc32-0.2.6"
+          sources."buffer-crc32-0.2.13"
           sources."fresh-0.1.0"
           sources."methods-0.0.1"
           (sources."send-0.1.0" // {
@@ -30720,7 +30891,7 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -31674,7 +31845,7 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           sources."has-unicode-2.0.1"
           sources."hosted-git-info-2.1.5"
           sources."iferr-0.1.5"
@@ -32135,7 +32306,7 @@ in
                   sources."is-obj-1.0.1"
                 ];
               })
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
                   sources."minimist-0.0.8"
@@ -32472,7 +32643,7 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           (sources."handlebars-4.0.6" // {
             dependencies = [
               sources."async-1.5.2"
@@ -32767,7 +32938,7 @@ in
                 ];
               })
               sources."safe-json-stringify-1.0.3"
-              sources."moment-2.16.0"
+              sources."moment-2.17.0"
             ];
           })
           sources."bunyan-syslog-udp-0.1.0"
@@ -32868,7 +33039,7 @@ in
                     dependencies = [
                       (sources."load-json-file-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
                               (sources."error-ex-1.3.0" // {
@@ -32913,7 +33084,7 @@ in
                       })
                       (sources."path-type-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.10"
+                          sources."graceful-fs-4.1.11"
                           sources."pify-2.3.0"
                           (sources."pinkie-promise-2.0.1" // {
                             dependencies = [
@@ -32997,7 +33168,7 @@ in
                 dependencies = [
                   (sources."load-json-file-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -33042,7 +33213,7 @@ in
                   })
                   (sources."path-type-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       sources."pify-2.3.0"
                       (sources."pinkie-promise-2.0.1" // {
                         dependencies = [
@@ -33290,7 +33461,7 @@ in
                         dependencies = [
                           (sources."load-json-file-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               (sources."parse-json-2.2.0" // {
                                 dependencies = [
                                   (sources."error-ex-1.3.0" // {
@@ -33315,7 +33486,7 @@ in
                           })
                           (sources."path-type-1.1.0" // {
                             dependencies = [
-                              sources."graceful-fs-4.1.10"
+                              sources."graceful-fs-4.1.11"
                               sources."pify-2.3.0"
                               (sources."pinkie-promise-2.0.1" // {
                                 dependencies = [
@@ -33456,7 +33627,7 @@ in
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.3"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -34304,7 +34475,7 @@ in
       })
       (sources."fluent-ffmpeg-2.1.0" // {
         dependencies = [
-          (sources."async-2.1.2" // {
+          (sources."async-2.1.4" // {
             dependencies = [
               sources."lodash-4.17.2"
             ];
@@ -34370,7 +34541,7 @@ in
       })
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
@@ -34439,7 +34610,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.2" // {
+              (sources."async-2.1.4" // {
                 dependencies = [
                   sources."lodash-4.17.2"
                 ];
@@ -34572,7 +34743,7 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      (sources."commoner-0.10.4" // {
+      (sources."commoner-0.10.8" // {
         dependencies = [
           (sources."commander-2.9.0" // {
             dependencies = [
@@ -34611,8 +34782,8 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.10"
-          sources."iconv-lite-0.4.13"
+          sources."graceful-fs-4.1.11"
+          sources."iconv-lite-0.4.15"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
@@ -34620,11 +34791,11 @@ in
           })
           sources."private-0.1.6"
           sources."q-1.4.1"
-          (sources."recast-0.10.43" // {
+          (sources."recast-0.11.17" // {
             dependencies = [
-              sources."esprima-fb-15001.1001.0-dev-harmony-fb"
+              sources."ast-types-0.9.2"
+              sources."esprima-3.1.1"
               sources."source-map-0.5.6"
-              sources."ast-types-0.8.15"
             ];
           })
         ];
@@ -35269,7 +35440,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.16.0"
+          sources."moment-2.17.0"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -35415,7 +35586,7 @@ in
       })
       (sources."readdirp-2.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           (sources."minimatch-3.0.3" // {
             dependencies = [
               (sources."brace-expansion-1.1.6" // {
@@ -35872,7 +36043,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.2" // {
+                  (sources."async-2.1.4" // {
                     dependencies = [
                       sources."lodash-4.17.2"
                     ];
@@ -36631,7 +36802,7 @@ in
               sources."path-is-absolute-1.0.1"
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           sources."has-unicode-2.0.1"
           sources."hosted-git-info-2.1.5"
           sources."iferr-0.1.5"
@@ -37001,7 +37172,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
               sources."hosted-git-info-2.1.5"
@@ -37519,7 +37690,7 @@ in
               })
               (sources."load-json-file-1.1.0" // {
                 dependencies = [
-                  sources."graceful-fs-4.1.10"
+                  sources."graceful-fs-4.1.11"
                   (sources."parse-json-2.2.0" // {
                     dependencies = [
                       (sources."error-ex-1.3.0" // {
@@ -37562,7 +37733,7 @@ in
                 dependencies = [
                   (sources."load-json-file-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -37607,7 +37778,7 @@ in
                   })
                   (sources."path-type-1.1.0" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.10"
+                      sources."graceful-fs-4.1.11"
                       sources."pify-2.3.0"
                       (sources."pinkie-promise-2.0.1" // {
                         dependencies = [
@@ -37725,7 +37896,7 @@ in
           })
           (sources."fs-extra-0.26.7" // {
             dependencies = [
-              sources."graceful-fs-4.1.10"
+              sources."graceful-fs-4.1.11"
               sources."jsonfile-2.4.0"
               sources."klaw-1.3.1"
               sources."path-is-absolute-1.0.1"
@@ -37794,7 +37965,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.2" // {
+                  (sources."async-2.1.4" // {
                     dependencies = [
                       sources."lodash-4.17.2"
                     ];
@@ -37911,7 +38082,7 @@ in
           })
         ];
       })
-      (sources."tmp-0.0.30" // {
+      (sources."tmp-0.0.31" // {
         dependencies = [
           sources."os-tmpdir-1.0.2"
         ];
@@ -37944,7 +38115,7 @@ in
       (sources."enhanced-resolve-0.9.1" // {
         dependencies = [
           sources."memory-fs-0.2.0"
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       sources."acorn-3.3.0"
@@ -38495,7 +38666,7 @@ in
               })
             ];
           })
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       (sources."webpack-core-0.6.8" // {
@@ -38533,4 +38704,518 @@ in
     };
     production = true;
   };
+  yarn = nodeEnv.buildNodePackage {
+    name = "yarn";
+    packageName = "yarn";
+    version = "0.17.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
+      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+    };
+    dependencies = [
+      (sources."babel-runtime-6.18.0" // {
+        dependencies = [
+          sources."core-js-2.4.1"
+          sources."regenerator-runtime-0.9.6"
+        ];
+      })
+      sources."bytes-2.4.0"
+      sources."camelcase-3.0.0"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."ansi-styles-2.2.1"
+          sources."escape-string-regexp-1.0.5"
+          (sources."has-ansi-2.0.0" // {
+            dependencies = [
+              sources."ansi-regex-2.0.0"
+            ];
+          })
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.0.0"
+            ];
+          })
+          sources."supports-color-2.0.0"
+        ];
+      })
+      (sources."cmd-shim-2.0.2" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."commander-2.9.0" // {
+        dependencies = [
+          sources."graceful-readlink-1.0.1"
+        ];
+      })
+      sources."death-1.0.0"
+      (sources."debug-2.3.3" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.2"
+        ];
+      })
+      sources."detect-indent-4.0.0"
+      sources."diff-2.2.3"
+      sources."ini-1.3.4"
+      (sources."inquirer-1.2.3" // {
+        dependencies = [
+          sources."ansi-escapes-1.4.0"
+          (sources."cli-cursor-1.0.2" // {
+            dependencies = [
+              (sources."restore-cursor-1.0.1" // {
+                dependencies = [
+                  sources."exit-hook-1.1.1"
+                  sources."onetime-1.1.0"
+                ];
+              })
+            ];
+          })
+          sources."cli-width-2.1.0"
+          (sources."external-editor-1.1.1" // {
+            dependencies = [
+              sources."extend-3.0.0"
+              (sources."spawn-sync-1.0.15" // {
+                dependencies = [
+                  (sources."concat-stream-1.5.2" // {
+                    dependencies = [
+                      sources."inherits-2.0.3"
+                      sources."typedarray-0.0.6"
+                      (sources."readable-stream-2.0.6" // {
+                        dependencies = [
+                          sources."core-util-is-1.0.2"
+                          sources."isarray-1.0.0"
+                          sources."process-nextick-args-1.0.7"
+                          sources."string_decoder-0.10.31"
+                          sources."util-deprecate-1.0.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."os-shim-0.1.3"
+                ];
+              })
+              (sources."tmp-0.0.29" // {
+                dependencies = [
+                  sources."os-tmpdir-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."figures-1.7.0" // {
+            dependencies = [
+              sources."escape-string-regexp-1.0.5"
+              sources."object-assign-4.1.0"
+            ];
+          })
+          sources."lodash-4.17.2"
+          sources."mute-stream-0.0.6"
+          (sources."pinkie-promise-2.0.1" // {
+            dependencies = [
+              sources."pinkie-2.0.4"
+            ];
+          })
+          (sources."run-async-2.2.0" // {
+            dependencies = [
+              sources."is-promise-2.1.0"
+            ];
+          })
+          sources."rx-4.1.0"
+          (sources."string-width-1.0.2" // {
+            dependencies = [
+              sources."code-point-at-1.1.0"
+              (sources."is-fullwidth-code-point-1.0.0" // {
+                dependencies = [
+                  sources."number-is-nan-1.0.1"
+                ];
+              })
+            ];
+          })
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.0.0"
+            ];
+          })
+          sources."through-2.3.8"
+        ];
+      })
+      (sources."invariant-2.2.2" // {
+        dependencies = [
+          (sources."loose-envify-1.3.0" // {
+            dependencies = [
+              sources."js-tokens-2.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."is-builtin-module-1.0.0" // {
+        dependencies = [
+          sources."builtin-modules-1.1.1"
+        ];
+      })
+      (sources."is-ci-1.0.10" // {
+        dependencies = [
+          sources."ci-info-1.0.0"
+        ];
+      })
+      sources."leven-2.0.0"
+      (sources."loud-rejection-1.6.0" // {
+        dependencies = [
+          (sources."currently-unhandled-0.4.1" // {
+            dependencies = [
+              sources."array-find-index-1.0.2"
+            ];
+          })
+          sources."signal-exit-3.0.1"
+        ];
+      })
+      (sources."minimatch-3.0.3" // {
+        dependencies = [
+          (sources."brace-expansion-1.1.6" // {
+            dependencies = [
+              sources."balanced-match-0.4.2"
+              sources."concat-map-0.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."node-emoji-1.4.1" // {
+        dependencies = [
+          sources."string.prototype.codepointat-0.2.0"
+        ];
+      })
+      (sources."node-gyp-3.4.0" // {
+        dependencies = [
+          (sources."fstream-1.0.10" // {
+            dependencies = [
+              sources."inherits-2.0.3"
+            ];
+          })
+          (sources."glob-7.1.1" // {
+            dependencies = [
+              sources."fs.realpath-1.0.0"
+              (sources."inflight-1.0.6" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."inherits-2.0.3"
+              (sources."once-1.4.0" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+          sources."graceful-fs-4.1.11"
+          (sources."nopt-3.0.6" // {
+            dependencies = [
+              sources."abbrev-1.0.9"
+            ];
+          })
+          (sources."npmlog-3.1.2" // {
+            dependencies = [
+              (sources."are-we-there-yet-1.1.2" // {
+                dependencies = [
+                  sources."delegates-1.0.0"
+                  (sources."readable-stream-2.2.2" // {
+                    dependencies = [
+                      sources."buffer-shims-1.0.0"
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
+                      sources."process-nextick-args-1.0.7"
+                      sources."string_decoder-0.10.31"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."console-control-strings-1.1.0"
+              (sources."gauge-2.6.0" // {
+                dependencies = [
+                  sources."aproba-1.0.4"
+                  sources."has-color-0.1.7"
+                  sources."has-unicode-2.0.1"
+                  sources."object-assign-4.1.0"
+                  sources."signal-exit-3.0.1"
+                  (sources."string-width-1.0.2" // {
+                    dependencies = [
+                      sources."code-point-at-1.1.0"
+                      (sources."is-fullwidth-code-point-1.0.0" // {
+                        dependencies = [
+                          sources."number-is-nan-1.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.0.0"
+                    ];
+                  })
+                  sources."wide-align-1.1.0"
+                ];
+              })
+              sources."set-blocking-2.0.0"
+            ];
+          })
+          (sources."osenv-0.1.3" // {
+            dependencies = [
+              sources."os-homedir-1.0.2"
+              sources."os-tmpdir-1.0.2"
+            ];
+          })
+          (sources."path-array-1.0.1" // {
+            dependencies = [
+              (sources."array-index-1.0.0" // {
+                dependencies = [
+                  (sources."es6-symbol-3.1.0" // {
+                    dependencies = [
+                      sources."d-0.1.1"
+                      (sources."es5-ext-0.10.12" // {
+                        dependencies = [
+                          sources."es6-iterator-2.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."which-1.2.12" // {
+            dependencies = [
+              sources."isexe-1.1.2"
+            ];
+          })
+        ];
+      })
+      sources."object-path-0.11.3"
+      (sources."proper-lockfile-1.2.0" // {
+        dependencies = [
+          sources."err-code-1.1.1"
+          sources."extend-3.0.0"
+          sources."graceful-fs-4.1.11"
+          sources."retry-0.10.0"
+        ];
+      })
+      (sources."read-1.0.7" // {
+        dependencies = [
+          sources."mute-stream-0.0.6"
+        ];
+      })
+      (sources."repeating-2.0.1" // {
+        dependencies = [
+          (sources."is-finite-1.0.2" // {
+            dependencies = [
+              sources."number-is-nan-1.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."request-2.79.0" // {
+        dependencies = [
+          sources."aws-sign2-0.6.0"
+          sources."aws4-1.5.0"
+          sources."caseless-0.11.0"
+          (sources."combined-stream-1.0.5" // {
+            dependencies = [
+              sources."delayed-stream-1.0.0"
+            ];
+          })
+          sources."extend-3.0.0"
+          sources."forever-agent-0.6.1"
+          (sources."form-data-2.1.2" // {
+            dependencies = [
+              sources."asynckit-0.4.0"
+            ];
+          })
+          (sources."har-validator-2.0.6" // {
+            dependencies = [
+              (sources."is-my-json-valid-2.15.0" // {
+                dependencies = [
+                  sources."generate-function-2.0.0"
+                  (sources."generate-object-property-1.2.0" // {
+                    dependencies = [
+                      sources."is-property-1.0.2"
+                    ];
+                  })
+                  sources."jsonpointer-4.0.0"
+                  sources."xtend-4.0.1"
+                ];
+              })
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
+            ];
+          })
+          (sources."hawk-3.1.3" // {
+            dependencies = [
+              sources."hoek-2.16.3"
+              sources."boom-2.10.1"
+              sources."cryptiles-2.0.5"
+              sources."sntp-1.0.9"
+            ];
+          })
+          (sources."http-signature-1.1.1" // {
+            dependencies = [
+              sources."assert-plus-0.2.0"
+              (sources."jsprim-1.3.1" // {
+                dependencies = [
+                  sources."extsprintf-1.0.2"
+                  sources."json-schema-0.2.3"
+                  sources."verror-1.3.6"
+                ];
+              })
+              (sources."sshpk-1.10.1" // {
+                dependencies = [
+                  sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
+                  sources."dashdash-1.14.0"
+                  sources."getpass-0.1.6"
+                  sources."jsbn-0.1.0"
+                  sources."tweetnacl-0.14.3"
+                  sources."jodid25519-1.0.2"
+                  sources."ecc-jsbn-0.1.1"
+                  sources."bcrypt-pbkdf-1.0.0"
+                ];
+              })
+            ];
+          })
+          sources."is-typedarray-1.0.0"
+          sources."isstream-0.1.2"
+          sources."json-stringify-safe-5.0.1"
+          (sources."mime-types-2.1.13" // {
+            dependencies = [
+              sources."mime-db-1.25.0"
+            ];
+          })
+          sources."oauth-sign-0.8.2"
+          sources."qs-6.3.0"
+          sources."stringstream-0.0.5"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
+          sources."tunnel-agent-0.4.3"
+          sources."uuid-3.0.0"
+        ];
+      })
+      sources."request-capture-har-1.1.4"
+      (sources."rimraf-2.5.4" // {
+        dependencies = [
+          (sources."glob-7.1.1" // {
+            dependencies = [
+              sources."fs.realpath-1.0.0"
+              (sources."inflight-1.0.6" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."inherits-2.0.3"
+              (sources."once-1.4.0" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              sources."path-is-absolute-1.0.1"
+            ];
+          })
+        ];
+      })
+      sources."roadrunner-1.1.0"
+      sources."semver-5.3.0"
+      (sources."strip-bom-2.0.0" // {
+        dependencies = [
+          sources."is-utf8-0.2.1"
+        ];
+      })
+      (sources."tar-2.2.1" // {
+        dependencies = [
+          sources."block-stream-0.0.9"
+          (sources."fstream-1.0.10" // {
+            dependencies = [
+              sources."graceful-fs-4.1.11"
+            ];
+          })
+          sources."inherits-2.0.3"
+        ];
+      })
+      (sources."tar-stream-1.5.2" // {
+        dependencies = [
+          (sources."bl-1.1.2" // {
+            dependencies = [
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."inherits-2.0.3"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."end-of-stream-1.1.0" // {
+            dependencies = [
+              (sources."once-1.3.3" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."readable-stream-2.2.2" // {
+            dependencies = [
+              sources."buffer-shims-1.0.0"
+              sources."core-util-is-1.0.2"
+              sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
+              sources."process-nextick-args-1.0.7"
+              sources."string_decoder-0.10.31"
+              sources."util-deprecate-1.0.2"
+            ];
+          })
+          sources."xtend-4.0.1"
+        ];
+      })
+      (sources."user-home-2.0.0" // {
+        dependencies = [
+          sources."os-homedir-1.0.2"
+        ];
+      })
+      (sources."validate-npm-package-license-3.0.1" // {
+        dependencies = [
+          (sources."spdx-correct-1.0.2" // {
+            dependencies = [
+              sources."spdx-license-ids-1.2.2"
+            ];
+          })
+          sources."spdx-expression-parse-1.0.4"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      homepage = "https://github.com/yarnpkg/yarn#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 6ece606398a..2132aff9dd0 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -868,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.16.0" = {
+    "moment-2.17.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.16.0";
+      version = "2.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
-        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
+        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
       };
     };
     "ms-rest-1.15.2" = {
@@ -1129,13 +1129,13 @@ let
         sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
-    "xpath.js-1.0.6" = {
+    "xpath.js-1.0.7" = {
       name = "xpath.js";
       packageName = "xpath.js";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz";
-        sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
+        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
+        sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
       };
     };
     "base64url-2.0.0" = {
@@ -1894,13 +1894,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.2" = {
+    "async-2.1.4" = {
       name = "async";
       packageName = "async";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
-        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
+        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
     "lodash-4.17.2" = {
@@ -2947,13 +2947,13 @@ let
         sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "graceful-fs-4.1.10" = {
+    "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.10";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz";
-        sha1 = "f2d720c22092f743228775c75e3612632501f131";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
     "parse-json-2.2.0" = {
@@ -3163,13 +3163,13 @@ let
         sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
       };
     };
-    "browser-pack-6.0.1" = {
+    "browser-pack-6.0.2" = {
       name = "browser-pack";
       packageName = "browser-pack";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz";
-        sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
+        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz";
+        sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531";
       };
     };
     "browser-resolve-1.11.2" = {
@@ -4450,13 +4450,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.3" = {
+    "numeral-1.5.5" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.3";
+      version = "1.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
-        sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
+        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
       };
     };
     "open-0.0.5" = {
@@ -9440,13 +9440,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.1.3" = {
+    "prettyjson-1.2.0" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz";
-        sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
+        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
       };
     };
     "shush-1.0.0" = {
@@ -14220,13 +14220,13 @@ let
         sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
       };
     };
-    "buffer-crc32-0.2.6" = {
+    "buffer-crc32-0.2.13" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
-      version = "0.2.6";
+      version = "0.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz";
-        sha1 = "612b318074fc6c4c30504b297247a1f91641253b";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
       };
     };
     "fresh-0.1.0" = {
@@ -16681,13 +16681,13 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
-    "commoner-0.10.4" = {
+    "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
-      version = "0.10.4";
+      version = "0.10.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz";
-        sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8";
+        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz";
+        sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5";
       };
     };
     "jstransform-10.1.0" = {
@@ -16699,6 +16699,15 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+      };
+    };
     "private-0.1.6" = {
       name = "private";
       packageName = "private";
@@ -16708,31 +16717,31 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.10.43" = {
+    "recast-0.11.17" = {
       name = "recast";
       packageName = "recast";
-      version = "0.10.43";
+      version = "0.11.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz";
-        sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
+        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
       };
     };
-    "esprima-fb-15001.1001.0-dev-harmony-fb" = {
-      name = "esprima-fb";
-      packageName = "esprima-fb";
-      version = "15001.1001.0-dev-harmony-fb";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz";
-        sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659";
-      };
-    };
-    "ast-types-0.8.15" = {
+    "ast-types-0.9.2" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.8.15";
+      version = "0.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz";
-        sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz";
+        sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
+      };
+    };
+    "esprima-3.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
+        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
       };
     };
     "base62-0.1.1" = {
@@ -17636,6 +17645,15 @@ let
         sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
       };
     };
+    "async-2.1.2" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz";
+        sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
+      };
+    };
     "fields-0.1.24" = {
       name = "fields";
       packageName = "fields";
@@ -17663,6 +17681,15 @@ let
         sha1 = "83736a15ae5f48711b625153e98012f2de659e69";
       };
     };
+    "moment-2.16.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz";
+        sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e";
+      };
+    };
     "node-appc-0.2.39" = {
       name = "node-appc";
       packageName = "node-appc";
@@ -18410,13 +18437,13 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.30" = {
+    "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
-      version = "0.0.30";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz";
-        sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -18644,6 +18671,150 @@ let
         sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
       };
     };
+    "babel-runtime-6.18.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
+        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+      };
+    };
+    "death-1.0.0" = {
+      name = "death";
+      packageName = "death";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
+        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+      };
+    };
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+      };
+    };
+    "invariant-2.2.2" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+      };
+    };
+    "is-ci-1.0.10" = {
+      name = "is-ci";
+      packageName = "is-ci";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+      };
+    };
+    "leven-2.0.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
+        sha1 = "74c45744439550da185801912829f61d22071bc1";
+      };
+    };
+    "node-emoji-1.4.1" = {
+      name = "node-emoji";
+      packageName = "node-emoji";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
+        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+      };
+    };
+    "object-path-0.11.3" = {
+      name = "object-path";
+      packageName = "object-path";
+      version = "0.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
+        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+      };
+    };
+    "proper-lockfile-1.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
+        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+      };
+    };
+    "request-capture-har-1.1.4" = {
+      name = "request-capture-har";
+      packageName = "request-capture-har";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
+        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+      };
+    };
+    "roadrunner-1.1.0" = {
+      name = "roadrunner";
+      packageName = "roadrunner";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
+        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+      };
+    };
+    "regenerator-runtime-0.9.6" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+      };
+    };
+    "loose-envify-1.3.0" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
+        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+      };
+    };
+    "ci-info-1.0.0" = {
+      name = "ci-info";
+      packageName = "ci-info";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
+      };
+    };
+    "string.prototype.codepointat-0.2.0" = {
+      name = "string.prototype.codepointat";
+      packageName = "string.prototype.codepointat";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
+        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
+      };
+    };
+    "err-code-1.1.1" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
+        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
+      };
+    };
   };
 in
 {
@@ -18809,7 +18980,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.16.0"
+      sources."moment-2.17.0"
       sources."ms-rest-1.15.2"
       (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
@@ -18871,7 +19042,7 @@ in
       sources."date-utils-1.2.21"
       sources."jws-3.1.4"
       sources."xmldom-0.1.22"
-      sources."xpath.js-1.0.6"
+      sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
       sources."jwa-1.1.4"
       sources."safe-buffer-5.0.1"
@@ -18949,7 +19120,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.2"
+          sources."async-2.1.4"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -19076,7 +19247,7 @@ in
       sources."bower-logger-0.2.1"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       sources."lodash-4.2.1"
@@ -19151,12 +19322,12 @@ in
       sources."pinkie-2.0.4"
       (sources."load-json-file-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       sources."parse-json-2.2.0"
@@ -19176,12 +19347,12 @@ in
       sources."natives-1.1.0"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.1.10"
+          sources."graceful-fs-4.1.11"
         ];
       })
       sources."path-is-absolute-1.0.1"
@@ -19225,7 +19396,7 @@ in
     dependencies = [
       sources."JSONStream-1.2.1"
       sources."assert-1.3.0"
-      sources."browser-pack-6.0.1"
+      sources."browser-pack-6.0.2"
       sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
@@ -19494,7 +19665,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -19510,7 +19681,7 @@ in
       sources."clivas-0.1.4"
       sources."inquirer-0.8.5"
       sources."network-address-0.0.5"
-      sources."numeral-1.5.3"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -19907,7 +20078,7 @@ in
       sources."browserify-13.1.0"
       sources."JSONStream-1.2.1"
       sources."assert-1.3.0"
-      sources."browser-pack-6.0.1"
+      sources."browser-pack-6.0.2"
       sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       (sources."buffer-4.9.1" // {
@@ -20108,7 +20279,7 @@ in
       sources."mute-stream-0.0.6"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."jju-1.3.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -20270,7 +20441,7 @@ in
         ];
       })
       sources."node-uuid-1.4.7"
-      (sources."async-2.1.2" // {
+      (sources."async-2.1.4" // {
         dependencies = [
           sources."lodash-4.17.2"
         ];
@@ -20828,7 +20999,7 @@ in
       sources."path-exists-2.1.0"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -20937,7 +21108,7 @@ in
       sources."flat-cache-1.2.1"
       sources."circular-json-0.3.1"
       sources."del-2.2.2"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."write-0.2.1"
       sources."globby-5.0.0"
       sources."is-path-cwd-1.0.0"
@@ -21083,7 +21254,7 @@ in
       sources."object-assign-3.0.0"
       sources."optimist-0.6.1"
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.1.3" // {
+      (sources."prettyjson-1.2.0" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -21161,7 +21332,7 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.7.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -21563,7 +21734,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -22064,7 +22235,7 @@ in
         ];
       })
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."http-proxy-1.15.2"
       sources."isbinaryfile-3.0.1"
       sources."lodash-3.10.1"
@@ -22553,7 +22724,7 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
@@ -22740,7 +22911,7 @@ in
       sources."nijs-0.0.23"
       sources."chownr-1.0.1"
       sources."concat-stream-1.5.2"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.3.5"
       (sources."npm-package-arg-4.2.0" // {
@@ -22906,7 +23077,7 @@ in
     dependencies = [
       sources."fstream-1.0.10"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -23134,7 +23305,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -23479,7 +23650,7 @@ in
       sources."concat-map-0.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."debug-2.2.0"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
@@ -23563,7 +23734,7 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.7.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -23881,7 +24052,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
       sources."moment-timezone-0.5.9"
-      sources."moment-2.16.0"
+      sources."moment-2.17.0"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -23906,7 +24077,7 @@ in
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."stream-consume-0.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -24105,7 +24276,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.2"
+          sources."async-2.1.4"
         ];
       })
       sources."har-validator-2.0.6"
@@ -24326,7 +24497,7 @@ in
       sources."range-parser-0.0.4"
       sources."mkdirp-0.3.5"
       sources."cookie-0.0.5"
-      sources."buffer-crc32-0.2.6"
+      sources."buffer-crc32-0.2.13"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
       sources."send-0.1.0"
@@ -24429,7 +24600,7 @@ in
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -24937,7 +25108,7 @@ in
       sources."fstream-1.0.10"
       sources."fstream-npm-1.2.0"
       sources."glob-7.1.1"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -25322,7 +25493,7 @@ in
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       (sources."handlebars-4.0.6" // {
         dependencies = [
           sources."async-1.5.2"
@@ -25456,7 +25627,7 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.16.0"
+      sources."moment-2.17.0"
       sources."nan-2.4.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -25568,7 +25739,7 @@ in
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.3"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -25679,7 +25850,7 @@ in
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
@@ -26148,7 +26319,7 @@ in
       sources."minimist-0.0.8"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -26185,7 +26356,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.2"
+      sources."async-2.1.4"
       sources."lodash-4.17.2"
       sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
@@ -26254,22 +26425,21 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      sources."commoner-0.10.4"
+      sources."commoner-0.10.8"
       (sources."jstransform-10.1.0" // {
         dependencies = [
-          sources."esprima-fb-13001.1001.0-dev-harmony-fb"
           sources."source-map-0.1.31"
         ];
       })
       sources."commander-2.9.0"
       sources."detective-4.3.2"
       sources."glob-5.0.15"
-      sources."graceful-fs-4.1.10"
-      sources."iconv-lite-0.4.13"
+      sources."graceful-fs-4.1.11"
+      sources."iconv-lite-0.4.15"
       sources."mkdirp-0.5.1"
       sources."private-0.1.6"
       sources."q-1.4.1"
-      sources."recast-0.10.43"
+      sources."recast-0.11.17"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26283,10 +26453,11 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."esprima-fb-15001.1001.0-dev-harmony-fb"
+      sources."ast-types-0.9.2"
+      sources."esprima-3.1.1"
       sources."source-map-0.5.6"
-      sources."ast-types-0.8.15"
       sources."base62-0.1.1"
+      sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -26677,7 +26848,7 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.16.0"
+      sources."moment-2.17.0"
       sources."nan-2.4.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -26757,7 +26928,7 @@ in
       sources."readdirp-2.1.0"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -27505,7 +27676,7 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
       sources."iferr-0.1.5"
@@ -27841,7 +28012,7 @@ in
           sources."kew-0.7.0"
         ];
       })
-      sources."tmp-0.0.30"
+      sources."tmp-0.0.31"
       sources."follow-redirects-0.0.3"
       (sources."config-chain-1.1.11" // {
         dependencies = [
@@ -27881,7 +28052,7 @@ in
       sources."minimist-0.0.8"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
@@ -27916,7 +28087,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.2"
+      sources."async-2.1.4"
       sources."lodash-4.17.2"
       sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
@@ -28023,7 +28194,7 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      sources."graceful-fs-4.1.10"
+      sources."graceful-fs-4.1.11"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."json5-0.5.0"
@@ -28296,4 +28467,219 @@ in
     };
     production = true;
   };
+  yarn = nodeEnv.buildNodePackage {
+    name = "yarn";
+    packageName = "yarn";
+    version = "0.17.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
+      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+    };
+    dependencies = [
+      sources."babel-runtime-6.18.0"
+      sources."bytes-2.4.0"
+      sources."camelcase-3.0.0"
+      sources."chalk-1.1.3"
+      sources."cmd-shim-2.0.2"
+      sources."commander-2.9.0"
+      sources."death-1.0.0"
+      sources."debug-2.3.3"
+      sources."defaults-1.0.3"
+      sources."detect-indent-4.0.0"
+      sources."diff-2.2.3"
+      sources."ini-1.3.4"
+      sources."inquirer-1.2.3"
+      sources."invariant-2.2.2"
+      sources."is-builtin-module-1.0.0"
+      sources."is-ci-1.0.10"
+      sources."leven-2.0.0"
+      sources."loud-rejection-1.6.0"
+      sources."minimatch-3.0.3"
+      sources."mkdirp-0.5.1"
+      sources."node-emoji-1.4.1"
+      sources."node-gyp-3.4.0"
+      sources."object-path-0.11.3"
+      sources."proper-lockfile-1.2.0"
+      sources."read-1.0.7"
+      sources."repeating-2.0.1"
+      sources."request-2.79.0"
+      sources."request-capture-har-1.1.4"
+      sources."rimraf-2.5.4"
+      sources."roadrunner-1.1.0"
+      sources."semver-5.3.0"
+      sources."strip-bom-2.0.0"
+      sources."tar-2.2.1"
+      sources."tar-stream-1.5.2"
+      sources."user-home-2.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."core-js-2.4.1"
+      sources."regenerator-runtime-0.9.6"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."graceful-readlink-1.0.1"
+      sources."ms-0.7.2"
+      sources."clone-1.0.2"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.1.0"
+      sources."external-editor-1.1.1"
+      sources."figures-1.7.0"
+      sources."lodash-4.17.2"
+      sources."mute-stream-0.0.6"
+      sources."pinkie-promise-2.0.1"
+      sources."run-async-2.2.0"
+      sources."rx-4.1.0"
+      sources."string-width-1.0.2"
+      sources."through-2.3.8"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."extend-3.0.0"
+      sources."spawn-sync-1.0.15"
+      sources."tmp-0.0.29"
+      sources."concat-stream-1.5.2"
+      sources."os-shim-0.1.3"
+      sources."inherits-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."readable-stream-2.0.6"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."object-assign-4.1.0"
+      sources."pinkie-2.0.4"
+      sources."is-promise-2.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."loose-envify-1.3.0"
+      sources."js-tokens-2.0.0"
+      sources."builtin-modules-1.1.1"
+      sources."ci-info-1.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.1"
+      sources."array-find-index-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."minimist-0.0.8"
+      sources."string.prototype.codepointat-0.2.0"
+      sources."fstream-1.0.10"
+      sources."glob-7.1.1"
+      sources."nopt-3.0.6"
+      sources."npmlog-3.1.2"
+      sources."osenv-0.1.3"
+      sources."path-array-1.0.1"
+      sources."which-1.2.12"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."abbrev-1.0.9"
+      sources."are-we-there-yet-1.1.2"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.6.0"
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.0.4"
+      sources."has-color-0.1.7"
+      sources."has-unicode-2.0.1"
+      sources."wide-align-1.1.0"
+      sources."os-homedir-1.0.2"
+      sources."array-index-1.0.0"
+      sources."es6-symbol-3.1.0"
+      sources."d-0.1.1"
+      sources."es5-ext-0.10.12"
+      sources."es6-iterator-2.0.0"
+      sources."isexe-1.1.2"
+      sources."err-code-1.1.1"
+      sources."retry-0.10.0"
+      sources."is-finite-1.0.2"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.5.0"
+      sources."caseless-0.11.0"
+      sources."combined-stream-1.0.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.2"
+      sources."har-validator-2.0.6"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-types-2.1.13"
+      sources."oauth-sign-0.8.2"
+      sources."qs-6.3.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."is-my-json-valid-2.15.0"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.0"
+      sources."xtend-4.0.1"
+      sources."is-property-1.0.2"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      sources."jsprim-1.3.1"
+      (sources."sshpk-1.10.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.0"
+      sources."tweetnacl-0.14.3"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.0"
+      sources."mime-db-1.25.0"
+      sources."punycode-1.4.1"
+      sources."is-utf8-0.2.1"
+      sources."block-stream-0.0.9"
+      sources."bl-1.1.2"
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      homepage = "https://github.com/yarnpkg/yarn#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9fc9dcf2d7b..8c1c9515926 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -62,4 +62,5 @@
 , "webdrvr"
 , "webpack"
 , "wring"
+, "yarn"
 ]
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 9cb059ca136..88d28bdcbc4 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -183,6 +183,7 @@
 , "wscat"
 , "wu"
 , "x509"
+, "yarn"
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 , { "mongoose": "3.6.x" }
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }

From ebd85b632af4992307111b400143820802b494c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 9 Dec 2016 08:30:17 +0100
Subject: [PATCH 182/295] ferm: reload rules on updates instead of restart

---
 nixos/modules/services/networking/ferm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix
index 6271e82541f..8933e166f59 100644
--- a/nixos/modules/services/networking/ferm.nix
+++ b/nixos/modules/services/networking/ferm.nix
@@ -51,6 +51,7 @@ in {
       before = [ "network-pre.target" ];
       wants = [ "network-pre.target" ];
       wantedBy = [ "multi-user.target" ];
+      reloadIfChanged = true;
       serviceConfig = {
         Type="oneshot";
         RemainAfterExit = "yes";

From a1892edcee7da13fb4dda1a2e6fc22b9d904671b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 8 Dec 2016 11:37:08 +0100
Subject: [PATCH 183/295] genimage: init at 9

Genimage is a tool to generate filesystem images from directory trees.
---
 pkgs/tools/filesystems/genimage/default.nix | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/filesystems/genimage/default.nix

diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
new file mode 100644
index 00000000000..b808573aa5b
--- /dev/null
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libconfuse }:
+
+stdenv.mkDerivation rec {
+  name = "genimage-${version}";
+  version = "9";
+
+  src = fetchurl {
+    url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz";
+    sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9";
+  };
+
+  buildInputs = [ pkgconfig libconfuse ];
+
+  postInstall = ''
+    # As there is no manpage or built-in --help, add the README file for
+    # documentation.
+    docdir="$out/share/doc/genimage"
+    mkdir -p "$docdir"
+    cp -v README "$docdir"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://git.pengutronix.de/cgit/genimage;
+    description = "Generate filesystem images from directory trees";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48cf5d105bd..e3a1a5a11fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1834,6 +1834,8 @@ in
 
   gengetopt = callPackage ../development/tools/misc/gengetopt { };
 
+  genimage = callPackage ../tools/filesystems/genimage { };
+
   geteltorito = callPackage ../tools/misc/geteltorito { };
 
   getmail = callPackage ../tools/networking/getmail { };

From 64d0c0ec1e82b7c5987f9f1574acf05b365966d7 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 14 Dec 2016 19:10:14 +0100
Subject: [PATCH 184/295] pythonPackages.websockets: init at 3.2

---
 .../python-modules/websockets/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/websockets/default.nix

diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
new file mode 100644
index 00000000000..8c66dc60407
--- /dev/null
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pythonOlder
+}:
+
+let
+  pname = "websockets";
+  version = "3.2";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm";
+  };
+
+  disabled = pythonOlder "3.3";
+  doCheck = false; # protocol tests fail
+
+  meta = {
+    description = "WebSocket implementation in Python 3";
+    homepage = https://github.com/aaugustin/websockets;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87cd2970fab..e1c0c1333ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26208,6 +26208,7 @@ in {
     };
   };
 
+  websockets = callPackage ../development/python-modules/websockets { };
 
   wand = buildPythonPackage rec {
     name = "Wand-0.3.5";

From 0f97f71525f9158e6464a9b727a1b6472ee69006 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 14 Dec 2016 19:13:52 +0100
Subject: [PATCH 185/295] pythonPackages.discordpy: init at 0.15.1

---
 .../python-modules/discordpy/default.nix      | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/discordpy/default.nix

diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
new file mode 100644
index 00000000000..cf01ec835a7
--- /dev/null
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pythonOlder
+, withVoice ? true, libopus
+, asyncio
+, aiohttp
+, websockets
+, pynacl
+}:
+
+let
+  pname = "discord.py";
+  version = "0.15.1";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "01lgidvnwwva1i65853gaplamllym2nsk0jis2r6f1rzbamgk1yj";
+  };
+
+  propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
+  patchPhase = ''
+    substituteInPlace "requirements.txt" \
+      --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp"
+  '' + lib.optionalString withVoice ''
+    substituteInPlace "discord/opus.py" \
+      --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
+  '';
+
+  disabled = pythonOlder "3.5";
+
+  meta = {
+    description = "A python wrapper for the Discord API";
+    homepage    = "https://discordpy.rtfd.org/";
+    license     = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87cd2970fab..f61d6a896e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -212,6 +212,8 @@ in {
     '';
   };
 
+  discordpy = callPackage ../development/python-modules/discordpy { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };

From 838a3b4294aa475f686a1d748b8979fca3a8becb Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 14 Dec 2016 13:27:03 -0800
Subject: [PATCH 186/295] coq_8_6: 8.6rc1 -> 8.6

---
 pkgs/applications/science/logic/coq/8.6.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix
index 659034e0586..9d3aa756aa5 100644
--- a/pkgs/applications/science/logic/coq/8.6.nix
+++ b/pkgs/applications/science/logic/coq/8.6.nix
@@ -12,10 +12,9 @@
 }:
 
 let
-  version = "8.6rc${pl}";
-  sha256 = {
-   "1" = "0wral36h39q7g2sa2z8jvjc8ggqmqsjrbs0k299n0nykmmrq1pr8";
-  }."${pl}";
+  # version = "8.6pl${pl}";
+  version = "8.6";
+  sha256 = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
   coq-version = "8.6";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";

From 888b27467e0ecd6c39349759c11389cabe62278e Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 13 Dec 2016 21:06:38 +0100
Subject: [PATCH 187/295] nextcloud: 10.0.2 -> 11.0.0

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 91ecda2e8c7..0d5d0a46e4e 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "10.0.2";
+  version = "11.0.0";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0g0h6yyy712mpyqzxa9azqlkgiw9hplv88xv0r7lh4w4fwcai1x6";
+    sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv";
   };
 
   installPhase = ''

From 2a224c6795582068a0cb9936bcb8c34dbce340c6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 14 Dec 2016 23:23:00 +0000
Subject: [PATCH 188/295] fzf: 0.15.1 -> 0.15.9

---
 pkgs/tools/misc/fzf/default.nix |  4 ++--
 pkgs/tools/misc/fzf/deps.nix    | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 3cb5c568038..24c10c241f2 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.15.1";
+  version = "0.15.9";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0wj5nhrrgx4nkiqwjp5wpfzdyikrjv4qr5x39s5094yc4p2k30b1";
+    sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 98530853832..651c76e361f 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -1,4 +1,14 @@
+# This file was generated by go2nix.
 [
+  {
+    goPackagePath = "github.com/junegunn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/junegunn/go-isatty";
+      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
+    };
+  }
   {
     goPackagePath = "github.com/junegunn/go-runewidth";
     fetch = {

From 4bc0c87b0d170f5532351203c00466ae9af8d2ea Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 15 Dec 2016 00:27:29 +0100
Subject: [PATCH 189/295] xstatic-jquery-ui: 1.11.0.1 -> 1.12.0.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98a9c1d47db..1910166105c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30089,11 +30089,11 @@ in {
 
   xstatic-jquery-ui = buildPythonPackage rec {
     name = "XStatic-jquery-ui-${version}";
-    version = "1.11.0.1";
+    version = "1.12.0.1";
     propagatedBuildInputs = with self; [ xstatic-jquery ];
     src = pkgs.fetchurl {
       url = "mirror://pypi/X/XStatic-jquery-ui/XStatic-jquery-ui-${version}.tar.gz";
-      sha256 = "0n6sgg9jxrqfz4zg6iqdmx1isqx2aswadf7mk3fbi48dxcv1i6q9";
+      sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2";
     };
 
     meta = {

From b035da2e4d84e7f6c158fdd64e21bb75c3cdf26f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 13 Dec 2016 13:35:22 -0600
Subject: [PATCH 190/295] Add vim-markdown plugin....

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 81c8472045b..08cdb3465c8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1039,6 +1039,17 @@ rec {
 
   };
 
+  vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-markdown-2016-05-19";
+    src = fetchgit {
+      url = "git://github.com/plasticboy/vim-markdown";
+      rev = "a3169545f330ec8080244c3ad755bb2211eca8a0";
+      sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1";
+    };
+    dependencies = [];
+
+  };
+
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-racer-2016-10-18";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 20f6afec41f..3809ea8fc01 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -79,6 +79,7 @@
 "github:neovimhaskell/haskell-vim"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
+"github:plasticboy/vim-markdown"
 "github:racer-rust/vim-racer"
 "github:raichoo/purescript-vim"
 "github:rhysd/vim-grammarous"

From 14bf940610a399929d9e67de36a2775e38001eac Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 00:37:19 +0100
Subject: [PATCH 191/295] Revert "darwin.libunwind: fix install phase"

This reverts commit 76125722f0cd445cbce0fb183ae127aeb28796d0.
---
 .../darwin/apple-source-releases/libunwind/default.nix     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
index 9fed57ed64a..81a45d99a86 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
@@ -1,16 +1,15 @@
 { stdenv, appleDerivation, dyld, osx_private_sdk }:
 
 appleDerivation {
-  buildPhase = ":";
+  phases = [ "unpackPhase" "installPhase" ];
 
-  # install headers only
   installPhase = ''
     mkdir -p $out/lib
-    make install-data-am
+    cp -R include $out/include
   '';
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ copumpkin lnl7 ];
+    maintainers = with maintainers; [ copumpkin ];
     platforms   = platforms.darwin;
     license     = licenses.apsl20;
   };

From 83c7660279eef8b7e46c520846948224240390a7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 13 Dec 2016 17:00:50 -0600
Subject: [PATCH 192/295] shell_cmds: init at 187

fixes #11707
---
 .../darwin/apple-source-releases/default.nix  |  2 +
 .../shell_cmds/default.nix                    | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 69dc2283645..770a466a9f5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -40,6 +40,7 @@ let
       basic_cmds    = "55";
       adv_cmds      = "163";
       file_cmds     = "264.1.1";
+      shell_cmds    = "187";
     };
     "osx-10.11.5" = {
       Libc          = "1082.50.1"; # 10.11.6 still unreleased :/
@@ -233,6 +234,7 @@ let
     developer_cmds  = applePackage "developer_cmds"    "osx-10.11.6"     "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {};
     network_cmds    = applePackage "network_cmds"      "osx-10.11.6"     "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {};
     file_cmds       = applePackage "file_cmds"         "osx-10.11.6"     "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {};
+    shell_cmds      = applePackage "shell_cmds"        "osx-10.11.6"     "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {};
 
     libsecurity_apple_csp      = libsecPackage "libsecurity_apple_csp"      "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
     libsecurity_apple_cspdl    = libsecPackage "libsecurity_apple_cspdl"    "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
new file mode 100644
index 00000000000..f434e15794e
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, appleDerivation, xcbuild }:
+
+appleDerivation rec {
+  buildInputs = [ xcbuild ];
+
+  patchPhase = ''
+    # NOTE: these hashes must be recalculated for each version change
+
+    # disables:
+    # - su ('security/pam_appl.h' file not found)
+    # - find (Undefined symbol '_get_date')
+    # - w (Undefined symbol '_res_9_init')
+    substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
+      --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
+      --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
+      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
+
+    # disable w, test install
+    # get rid of permission stuff
+    substituteInPlace xcodescripts/install-files.sh \
+      --replace 'ln -f "$BINDIR/w" "$BINDIR/uptime"' "" \
+      --replace 'ln -f "$DSTROOT/bin/test" "$DSTROOT/bin/["' "" \
+      --replace "-o root -g wheel -m 0755" "" \
+      --replace "-o root -g wheel -m 0644" ""
+  '';
+
+  # temporary install phase until xcodebuild has "install" support
+  installPhase = ''
+    mkdir -p $out/usr/bin
+    install shell_cmds-*/Build/Products/Release/* $out/usr/bin
+
+    export DSTROOT=$out
+    export SRCROOT=$PWD
+    . xcodescripts/install-files.sh
+
+    mv $out/usr/* $out
+    mv $out/private/etc $out
+    rmdir $out/usr $out/private
+  '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
+  };
+}

From 5b2e289c0a688d3c0e12693f356d550cf5308065 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Dec 2016 22:38:40 -0600
Subject: [PATCH 193/295] aws-sdk-cpp: Enable on Darwin systems

libuuid can be provided by libossp_uuid.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index d5d7371aebf..755b98ad32d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3804014a1df..b0feec3eb92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10748,7 +10748,7 @@ in
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else null;
+    else libossp_uuid;
 
   light = callPackage ../os-specific/linux/light { };
 

From ac4f27666e38505e5e1762735a7e4f0bce8a3d71 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Dec 2016 23:45:19 -0600
Subject: [PATCH 194/295] darwin.CoreOSMakefiles: remove
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This wasn't being used and it was causing an error when evaluating:

error: attribute ‘CoreOSMakefiles’ missing, at /Users/mbauer/Projects/nixpkgs2/pkgs/os-specific/darwin/apple-source-releases/default.nix:140:71
---
 .../CoreOSMakefiles/default.nix               | 30 -------------------
 .../darwin/apple-source-releases/default.nix  |  4 ---
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix
deleted file mode 100644
index 203ca010d62..00000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, appleDerivation, unifdef }:
-
-appleDerivation {
-  buildInputs = [ unifdef ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  preInstall = ''
-    substituteInPlace Makefile \
-      --replace "rsync -a --exclude=.svn --exclude=.git" "cp -r"
-
-    substituteInPlace Standard/Commands.in \
-      --replace "/bin/sh" "bash" \
-      --replace "/usr/bin/compress" "compress" \
-      --replace "/usr/bin/gzip" "gzip" \
-      --replace "/bin/pax" "pax" \
-      --replace "/usr/bin/tar" "tar" \
-      --replace "xcrun -find" "echo" \
-      --replace '$(Install_Program_Group)   -s' '$(Install_Program_Group)' \
-      --replace '$(Install_Program_Mode)   -s'  '$(Install_Program_Mode)'
-
-    substituteInPlace ReleaseControl/Common.make \
-      --replace "/tmp" "$TMPDIR"
-
-    substituteInPlace ReleaseControl/BSDCommon.make \
-      --replace '$(shell xcrun -find -sdk $(SDKROOT) cc)' "cc"
-
-    export DSTROOT=$out
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 69dc2283645..31978ae9e44 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -115,9 +115,6 @@ let
     "osx-10.5.8" = {
       adv_cmds = "119";
     };
-    "osx-10.5" = {
-      CoreOSMakeFiles = "40";
-    };
     "dev-tools-7.0" = {
       bootstrap_cmds = "93";
     };
@@ -195,7 +192,6 @@ let
     CommonCrypto    = applePackage "CommonCrypto"      "osx-10.11.6"     "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
     configd         = applePackage "configd"           "osx-10.8.5"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
     copyfile        = applePackage "copyfile"          "osx-10.11.6"     "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
-    CoreOSMakefiles = applePackage "CoreOSMakefiles"   "osx-10.5"        "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {};
     Csu             = applePackage "Csu"               "osx-10.11.6"     "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {};
     dtrace          = applePackage "dtrace"            "osx-10.11.6"     "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {};
     dyld            = applePackage "dyld"              "osx-10.11.6"     "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};

From bea3209d5f1f0d9f55efb4489a3a47540529a2bd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 15 Dec 2016 16:20:33 +0800
Subject: [PATCH 195/295] virtualbox: 5.1.8 -> 5.1.10

---
 pkgs/applications/virtualization/virtualbox/update.py  |  4 +++-
 .../virtualization/virtualbox/upstream-info.json       | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py
index ff1b2e2fffb..6e8bfd5c825 100755
--- a/pkgs/applications/virtualization/virtualbox/update.py
+++ b/pkgs/applications/virtualization/virtualbox/update.py
@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3
+
 import os
 import re
 import json
diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
index d861a7e7932..1b85d2b8847 100644
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "__NOTE": "Generated using update.py from the same directory.",
-  "extpack": "d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322",
-  "extpackRev": "111374",
-  "guest": "347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657",
-  "main": "e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933",
-  "version": "5.1.8"
+  "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5",
+  "extpackRev": "112026",
+  "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41",
+  "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40",
+  "version": "5.1.10"
 }

From bd55e9db63cd7eb1e24609047eea71f44605d4af Mon Sep 17 00:00:00 2001
From: taku0 <taku0@users.noreply.github.com>
Date: Thu, 15 Dec 2016 18:41:18 +0900
Subject: [PATCH 196/295] android-studio: 2.1.3 -> 2.2.3

---
 .../editors/android-studio/default.nix        | 24 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4e16ceedbbb..2e14ae339cf 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -10,9 +10,15 @@
 , gnutar
 , gzip
 , jdk
+, fontconfig
+, freetype
 , libpulseaudio
 , libX11
+, libXext
+, libXi
 , libXrandr
+, libXrender
+, libXtst
 , makeWrapper
 , pciutils
 , pkgsi686Linux
@@ -27,8 +33,8 @@
 
 let
 
-  version = "2.1.3.0";
-  build = "143.3101438";
+  version = "2.2.3.0";
+  build = "145.3537739";
 
   androidStudio = stdenv.mkDerivation {
     name = "android-studio";
@@ -75,11 +81,23 @@ let
         # For Android emulator
         libpulseaudio
         libX11
+        libXext
+        libXrender
+        libXtst
+        libXi
+        freetype
+        fontconfig
       ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
     '';
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj";
+      sha256 = "10fmffkvvbnmgjxb4rq7rjwnn16jp5phw6div4n7hh2ad6spf8wq";
+    };
+    meta = {
+      description = "The Official IDE for Android";
+      homepage = https://developer.android.com/studio/index.html;
+      license = stdenv.lib.licenses.asl20;
+      platforms = [ "x86_64-linux" ];
     };
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cded6273555..200bd62dc31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12203,7 +12203,9 @@ in
   #     };
   #   };
   # }
-  android-studio = callPackage ../applications/editors/android-studio { };
+  android-studio = callPackage ../applications/editors/android-studio {
+      inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
+  };
 
   antimony = qt5.callPackage ../applications/graphics/antimony {};
 

From 910dcdb7d2797e745a0ea11c4ccb1ca1db287847 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 15 Dec 2016 10:42:00 +0100
Subject: [PATCH 197/295] idea-ultimate: 2016.3 -> 2016.3.1

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/editors/idea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index b58d6816c97..dc85b5402bd 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -208,12 +208,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.3";
+    version = "2016.3.1";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "1sax3sjhsyvb9qfnn0gc74p3ym6j5f30mmapd4irq9fk4bsl8c31";
+      sha256 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw";
     };
     wmClass = "jetbrains-idea";
   };

From e314e5b9304b5a9be811145bf5275163912192ba Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Wed, 14 Dec 2016 22:32:40 +0000
Subject: [PATCH 198/295] ImageMagick: Add additional mirror.

The 16.09-nixpkgs source tarball Imagemagick-6.9.6-7.tar.xz source tarball is
not available on any of the existing mirrors. We here add one that has it.
---
 pkgs/applications/graphics/ImageMagick/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 1095ff97fc5..8030302cdcf 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
       "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
       # the original source above removes tarballs quickly
       "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+      "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
     ];
     inherit (cfg) sha256;
   };

From cc864af9282963af7a7711961aea77e04dcf87e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 9 Dec 2016 10:48:54 +0100
Subject: [PATCH 199/295] bird: refactor module

- syntax check before deploying configuration
- remove static unnessary static uid/gid (configuration is opened as root)
- add service hardening
---
 nixos/modules/misc/ids.nix                 |   2 -
 nixos/modules/services/networking/bird.nix | 122 ++++++++++-----------
 2 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index bc69102ba39..2a9a18236e5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -211,7 +211,6 @@
       lambdabot = 191;
       asterisk = 192;
       plex = 193;
-      bird = 195;
       grafana = 196;
       skydns = 197;
       ripple-rest = 198;
@@ -470,7 +469,6 @@
       #asterisk = 192; # unused
       plex = 193;
       sabnzbd = 194;
-      bird = 195;
       #grafana = 196; #unused
       #skydns = 197; #unused
       #ripple-rest = 198; #unused
diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index e76cdac14ca..174354c9eb4 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -1,76 +1,68 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (lib) mkEnableOption mkIf mkOption singleton types;
-  inherit (pkgs) bird;
-  cfg = config.services.bird;
+  inherit (lib) mkEnableOption mkIf mkOption types;
 
-  configFile = pkgs.writeText "bird.conf" ''
-    ${cfg.config}
-  '';
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.bird = {
-
-      enable = mkEnableOption "BIRD Internet Routing Daemon";
-
-      config = mkOption {
-        type = types.string;
-        description = ''
-          BIRD Internet Routing Daemon configuration file.
-          <link xlink:href='http://bird.network.cz/'/>
+  generic = variant:
+    let
+      cfg = config.services.${variant};
+      pkg = pkgs.${variant};
+      birdc = if variant == "bird6" then "birdc6" else "birdc";
+      configFile = pkgs.stdenv.mkDerivation {
+        name = "${variant}.conf";
+        text = cfg.config;
+        preferLocalBuild = true;
+        buildCommand = ''
+          echo -n "$text" > $out
+          ${pkg}/bin/${variant} -d -p -c $out
         '';
       };
-
-      user = mkOption {
-        type = types.string;
-        default = "bird";
-        description = ''
-          BIRD Internet Routing Daemon user.
-        '';
+    in {
+      ###### interface
+      options = {
+        services.${variant} = {
+          enable = mkEnableOption "BIRD Internet Routing Daemon";
+          config = mkOption {
+            type = types.lines;
+            description = ''
+              BIRD Internet Routing Daemon configuration file.
+              <link xlink:href='http://bird.network.cz/'/>
+            '';
+          };
+        };
       };
 
-      group = mkOption {
-        type = types.string;
-        default = "bird";
-        description = ''
-          BIRD Internet Routing Daemon group.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    users.extraUsers = singleton {
-      name = cfg.user;
-      description = "BIRD Internet Routing Daemon user";
-      uid = config.ids.uids.bird;
-      group = cfg.group;
-    };
-
-    users.extraGroups = singleton {
-      name = cfg.group;
-      gid = config.ids.gids.bird;
-    };
-
-    systemd.services.bird = {
-      description = "BIRD Internet Routing Daemon";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart   = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}";
+      ###### implementation
+      config = mkIf cfg.enable {
+        systemd.services.${variant} = {
+          description = "BIRD Internet Routing Daemon";
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig = {
+            Type = "forking";
+            Restart = "on-failure";
+            ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}";
+            ExecReload = "${pkg}/bin/${birdc} configure";
+            ExecStop = "${pkg}/bin/${birdc} down";
+            CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
+                                      # see bird/sysdep/linux/syspriv.h
+                                      "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ];
+            ProtectSystem = "full";
+            ProtectHome = "yes";
+            SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io";
+            MemoryDenyWriteExecute = "yes";
+          };
+        };
+        users = {
+          extraUsers.${variant} = {
+            description = "BIRD Internet Routing Daemon user";
+            group = "${variant}";
+          };
+          extraGroups.${variant} = {};
+        };
       };
     };
-  };
+
+  inherit (config.services) bird bird6;
+in {
+  imports = [(generic "bird") (generic "bird6")];
 }

From 35399f93d6d379a01225fd3860582e915b0de45a Mon Sep 17 00:00:00 2001
From: David Terry <xwvvvvwx@users.noreply.github.com>
Date: Thu, 15 Dec 2016 12:04:48 +0100
Subject: [PATCH 200/295] vscode: 1.6.1 -> 1.7.2

---
 pkgs/applications/editors/vscode/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f7983f71385..f125e8d4d5d 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,20 +2,20 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.6.1";
-  rev = "9e4e44c19e393803e2b05fe2323cf4ed7e36880e";
+  version = "1.7.2";
+  rev = "7ba55c5860b152d999dda59393ca3ebeb1b5c85f";
 
-  sha256 = if stdenv.system == "i686-linux"    then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy"
-      else if stdenv.system == "x86_64-linux"  then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i"
-      else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9"
+  sha256 = if stdenv.system == "i686-linux"    then "0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc"
+      else if stdenv.system == "x86_64-linux"  then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f"
+      else if stdenv.system == "x86_64-darwin" then "1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-stable-code_${version}-1476372351_i386.tar.gz"
+        urlBase + "code-stable-code_${version}-1479767514_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz"
+        urlBase + "code-stable-code_${version}-1479766213_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-stable.zip"
       else throw "Unsupported system: ${stdenv.system}";

From 067171a61f2e106ca0b567dcd41ac203f90fc54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 10 Dec 2016 21:44:00 +0100
Subject: [PATCH 201/295] man-pages: fix conflict with shadow-utils

---
 pkgs/data/documentation/man-pages/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 0661e6e1257..f739479ac0a 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];
+  postInstall = ''
+    # conflict with shadow-utils
+    rm $out/share/man/man5/passwd.5 \
+       $out/share/man/man3/getspnam.3
+  '';
   outputDocdev = "out";
 
   meta = with stdenv.lib; {

From 7a586794d4378d7a6432192700a4706083d58388 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 15 Dec 2016 13:06:05 +0100
Subject: [PATCH 202/295] make-tarball.nix: Fix running as root
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since Nix now runs builds in a user namespace with uid == 0, this
triggered the message

  warning: the group ‘nixbld’ specified in ‘build-users-group’ does not exist

which make-tarball.nix turns into a fatal error. So clear
build-users-group.

http://hydra.nixos.org/build/44817408
---
 pkgs/top-level/make-tarball.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 88f02715796..a69e7019c87 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -35,6 +35,7 @@ releaseTools.sourceTarball rec {
     export NIX_DB_DIR=$TMPDIR
     export NIX_STATE_DIR=$TMPDIR
     export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
+    opts=(--option build-users-group "")
     nix-store --init
 
     echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
@@ -68,7 +69,8 @@ releaseTools.sourceTarball rec {
 
         nix-env -f . \
             --show-trace --argstr system "$platform" \
-            -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log
+            -qa --drv-path --system-filter \* --system \
+            "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log
 
         if [ -s eval-warnings.log ]; then
             echo "Nixpkgs on $platform evaluated with warnings, aborting"
@@ -78,7 +80,8 @@ releaseTools.sourceTarball rec {
 
         nix-env -f . \
             --show-trace --argstr system "$platform" \
-            -qa --drv-path --system-filter \* --system --meta --xml > /dev/null
+            -qa --drv-path --system-filter \* --system --meta --xml \
+            "''${opts[@]}" > /dev/null
         stopNest
     done
 

From ef65353c73bccbedb60603725ca230fd1d4fc2ae Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 15:33:26 +0100
Subject: [PATCH 203/295] Revert "aws-sdk-cpp: Enable on Darwin systems"

This reverts commit 5b2e289c0a688d3c0e12693f356d550cf5308065.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 755b98ad32d..d5d7371aebf 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
     license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1b95bf2d34..8c293e77aa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10774,7 +10774,7 @@ in
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else libossp_uuid;
+    else null;
 
   light = callPackage ../os-specific/linux/light { };
 

From dc0c7104ea2412c39dc1199ac48688a44136ac84 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 14 Dec 2016 20:11:09 +0100
Subject: [PATCH 204/295] chrony: 2.4 -> 2.4.1

---
 pkgs/tools/networking/chrony/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index d405d08e0ab..1e2b48207f5 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "2.4";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "07rrys5axrz4grfy7fj3ds0r9ny1qcwiswsb2318jciklb6yf14d";
+    sha256 = "1q5nxl19fdppwpxancff5dc9crgma8f24zww7ag4bd15yq79xm8g";
   };
 
   buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;

From 6dbdbdec69471104d368d4eb5f48060d335de559 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 15 Dec 2016 16:01:03 +0100
Subject: [PATCH 205/295] chromium pepper flash plugin: 23.0.0.207 ->
 24.0.0.186

Fixes https://github.com/NixOS/nixpkgs/issues/21119,
fixes https://github.com/NixOS/nixpkgs/issues/21169
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index bad888bff52..c1c18828fb4 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "23.0.0.207";
+    version = "24.0.0.186";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1spwv06rynaw45pdll6hzsq6zbz1q10bf7dx4zz25gh8x3sl9l6a";
+      sha256 = "1pwayhnfjvb6gal5msw0k8rv4h6jvl0mpfsi0jqlka00cnyfjqpd";
       stripRoot = false;
     };
 

From 6fc5f8d4f3c98fd276573c8fd35f652c3e66b645 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 15 Dec 2016 15:13:10 +0000
Subject: [PATCH 206/295] terraform: 0.7.13 -> 0.8.1

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 119e33e4d1e..78e167cc0e9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.7.13";
+  version = "0.8.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "0s23gc9rlnsg6x8llxnnw30b9c5kndy73jimrfxpqb4mha7mjn5n";
+    sha256 = "1fgnivhn6hrxpwwajl80vj2w81lv6vypprlbgif8m0z0na7p8956";
   };
 
   postInstall = ''

From b4005bbac0530c711a7bed56722ba63a0883d9f7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 10 Dec 2016 01:00:29 +0100
Subject: [PATCH 207/295] whisper: upgrade to the same version as the other
 graphite components

Without this we get the following Python exception when trying to fetch
a graph in the graphite web app:

    File "/nix/store/nj62jqk2xmp5c3h93pfnlqn66qj1kkvs-python-2.7.12-env/lib/python2.7/site-packages/opt/graphite/webapp/graphite/storage.py", line 335, in fetch
      return whisper.fetch(self.fs_path, startTime, endTime, now)
  TypeError: fetch() takes at most 3 arguments (4 given)

Fixes #21032.
---
 pkgs/top-level/python-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1910166105c..6d8db851ad8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -35,6 +35,8 @@ let
 
   buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args );
 
+  graphiteVersion = "0.9.15";
+
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
@@ -27764,11 +27766,11 @@ in {
 
   whisper = buildPythonPackage rec {
     name = "whisper-${version}";
-    version = "0.9.12";
+    version = graphiteVersion;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/whisper/${name}.tar.gz";
-      sha256 = "0eca66449d6ceb29e2ab5457b01618e0fe525710dd130a286a18282d849ae5b2";
+      sha256 = "1chkphxwnwvy2cs7jc2h2i0lqqvi9jx6vqj3ly88lwk7m35r4ss2";
     };
 
     # error: invalid command 'test'
@@ -27783,7 +27785,7 @@ in {
 
   carbon = buildPythonPackage rec {
     name = "carbon-${version}";
-    version = "0.9.15";
+    version = graphiteVersion;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/carbon/${name}.tar.gz";
@@ -28016,7 +28018,7 @@ in {
   graphite_web = buildPythonPackage rec {
     name = "graphite-web-${version}";
     disabled = isPy3k;
-    version = "0.9.15";
+    version = graphiteVersion;
 
     src = pkgs.fetchurl rec {
       url = "mirror://pypi/g/graphite-web/${name}.tar.gz";

From fba65373419d56aa7aef12062f84873ed7790a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmi@gmail.com>
Date: Thu, 15 Dec 2016 17:13:44 +0100
Subject: [PATCH 208/295] doc: correct typo (#21176)

---
 nixos/doc/manual/man-nixos-rebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index d01e2e060bd..f74788353e6 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -68,7 +68,7 @@ desired operation.  It must be one of the following:
     <listitem>
       <para>Build and activate the new configuration, and make it the
       boot default.  That is, the configuration is added to the GRUB
-      boot menu as the default meny entry, so that subsequent reboots
+      boot menu as the default menu entry, so that subsequent reboots
       will boot the system into the new configuration.  Previous
       configurations activated with <command>nixos-rebuild
       switch</command> or <command>nixos-rebuild boot</command> remain

From 46fc2db7dffe728e33597a5f88e03000f9c6c04a Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Thu, 15 Dec 2016 17:16:00 +0100
Subject: [PATCH 209/295] erlang_basho_R16: add explicit Carbon and Cocoa
 support

---
 pkgs/development/interpreters/erlang/R16B02-8-basho.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
index a4afd1e9b40..5745ea5d98b 100644
--- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc 
     ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
-      ++ optional odbcSupport [ unixODBC ];
+      ++ optional odbcSupport [ unixODBC ]
+      ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
 

From fd5dd0769c1a8c1c28ae53cf22ed29324008ec14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 15 Dec 2016 17:16:32 +0100
Subject: [PATCH 210/295] python27Packages.lxc: init at 2016-08-25 (#21181)

---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d8db851ad8..a8b4b5d9b53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13904,6 +13904,27 @@ in {
     };
   });
 
+  lxc = buildPythonPackage (rec {
+    name = "python-lxc-unstable-2016-08-25";
+    disabled = !isPy27;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "lxc";
+      repo = "python2-lxc";
+      rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef";
+      sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4";
+    };
+
+    buildInputs = [ pkgs.lxc ];
+
+    meta = {
+      description = "Out of tree python 2.7 binding for liblxc";
+      homepage = https://github.com/lxc/python2-lxc;
+      license = licenses.lgpl2;
+      maintainers = with maintainers; [ mic92 ];
+    };
+  });
+
   python_magic = buildPythonPackage rec {
     name = "python-magic-0.4.10";
 

From 77adcfb59f9167108c984049d71a26323b523697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Dec 2016 18:05:00 +0100
Subject: [PATCH 211/295] rocksdb: 4.1 -> 4.13

---
 pkgs/development/libraries/rocksdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 6a888ec67fd..d3ca152a7b9 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,16 +13,16 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "4.1";
+  version = "4.13";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "1q1h2n3v02zg711vk56rc9v54f5i31w684wqag4xcr2dv1glw0r0";
+    sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw";
   };
 
-  buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];
+  buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc ];
 
   postPatch = ''
     # Hack to fix typos

From 6e26fe3d57fdff0dd4fde8f34505f15230badf8d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 18:07:54 +0100
Subject: [PATCH 212/295] xcbuild: add meta

---
 pkgs/development/tools/xcbuild/default.nix  | 7 +++++++
 pkgs/development/tools/xcbuild/platform.nix | 8 ++++----
 pkgs/development/tools/xcbuild/wrapper.nix  | 2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 1393034ff20..3a1b753bf31 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -41,4 +41,11 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ cmake zlib libxml2 libpng ninja ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
+
+  meta = with stdenv.lib; {
+    description = "Xcode-compatible build tool";
+    homepage = https://github.com/facebook/xcbuild;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ copumpkin matthewbauer ];
+  };
 }
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index 0b03d4120e8..34fc5b0f620 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -19,10 +19,10 @@ let
   # is removed because NixPkgs only supports darwin-x86_64.
   Architectures = [
     {
-		  Identifier = "Standard";
-	    Type = "Architecture";
-		  Name = "Standard Architectures (64-bit Intel)";
-		  RealArchitectures = [ "x86_64" ];
+      Identifier = "Standard";
+      Type = "Architecture";
+      Name = "Standard Architectures (64-bit Intel)";
+      RealArchitectures = [ "x86_64" ];
       ArchitectureSetting = "ARCHS_STANDARD";
     }
     {
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index fc03c273fc5..a40a3440d68 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -64,6 +64,8 @@ stdenv.mkDerivation {
       --set DEVELOPER_DIR "$out"
   '';
 
+  inherit (xcbuild) meta;
+
   passthru = {
     raw = xcbuild;
   };

From d5f92a319a5b3dfeac76877c766043f0de1edb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Dec 2016 20:18:50 +0100
Subject: [PATCH 213/295] rocksdb: compile as shared lib

---
 pkgs/development/libraries/rocksdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index d3ca152a7b9..1511f12e88b 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
   buildFlags = [
-    "static_lib"
     "shared_lib"
   ];
 
   installFlags = [
+    "install-shared"
     "INSTALL_PATH=\${out}"
   ];
 

From 3b763fef44c0dd945b686e0a68ee79efe58661db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 15 Dec 2016 15:04:46 +0100
Subject: [PATCH 214/295] nssModules: include correct systemd output

fixes libnss_myhost, libnss_mymachines, libnss_resolve are located here
---
 nixos/modules/config/nsswitch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index f30136be44e..45553ec0566 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -56,7 +56,7 @@ in
     # configured IP addresses, or ::1 and 127.0.0.2 as
     # fallbacks. Systemd also provides nss-mymachines to return IP
     # addresses of local containers.
-    system.nssModules = [ config.systemd.package ];
+    system.nssModules = [ config.systemd.package.out ];
 
   };
 }

From 182c735527c42c25cca268d491b7f7a59eff97b5 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 15 Dec 2016 14:45:46 -0500
Subject: [PATCH 215/295] mu: 0.9.16 -> 0.9.18

---
 pkgs/tools/networking/mu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index fa1740e9d12..0cd3e15e762 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
 , gtk3, webkitgtk24x, libsoup, icu }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.16";
+  version = "0.9.18";
   name = "mu-${version}";
 
   src = fetchurl {
-    url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
-    sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g";
+    url = "https://github.com/djcb/mu/archive/${version}.tar.gz";
+    sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
   };
 
   buildInputs = [

From 4714ca8b565b62856b8d34312c511178d2cf78d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 15 Dec 2016 20:48:03 +0100
Subject: [PATCH 216/295] kexec-tools: 2.0.12 -> 2.0.13 (#21158)

also fix kexec by removing faulty hardeningFlags
---
 pkgs/os-specific/linux/kexectools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index cb30de44a81..1b18fb59017 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.12";
+  version = "2.0.13";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "03cj7w2l5fqn72xfhl4q6z0zbziwkp9bfn0gs7gaf9i44jv6gkhl";
+    sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
   };
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "pic" "relro" ];
 
   buildInputs = [ zlib ];
 

From 147142674992c29025b50f9818d7ac104e0de223 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 15 Dec 2016 21:00:21 +0100
Subject: [PATCH 217/295] nixos/test-instrumentation: Fix eval of boot tests

The boot tests import test-instrumentation.nix directly to create a VM
image that only contains things such as the backdoor and serial console
the same way as used by other NixOS VM tests.

With one difference though: It doesn't need nor want to have 9p
filesystems mounted, because we actually want to test an image rather
than re-using most stuff from the host's store.

Change tested against the boot.uefiUsb and ipv6 tests, just that it
becomes clear we don't break either the tests with 9p nor the boot
tests (which were already broken but now succeed).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/testing/test-instrumentation.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 373bf766524..206df50a420 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -9,6 +9,15 @@ let kernel = config.boot.kernelPackages.kernel; in
 
 {
 
+  # This option is a dummy that if used in conjunction with
+  # modules/virtualisation/qemu-vm.nix gets merged with the same option defined
+  # there and only is declared here because some modules use
+  # test-instrumentation.nix but not qemu-vm.nix.
+  #
+  # One particular example are the boot tests where we want instrumentation
+  # within the images but not other stuff like setting up 9p filesystems.
+  options.virtualisation.qemu.program = mkOption { type = types.path; };
+
   config = {
 
     systemd.services.backdoor =

From fd2ff58d160bdc452b0a83e21cdc8872c0ef4208 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 15 Dec 2016 21:19:39 +0100
Subject: [PATCH 218/295] unscii: init at 1.1

---
 pkgs/data/fonts/unscii/default.nix | 36 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/data/fonts/unscii/default.nix

diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
new file mode 100644
index 00000000000..d318f5db7a7
--- /dev/null
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "unscii";
+  version = "1.1";
+  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  src = fetchurl {
+    url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+    sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
+  };
+  buildInputs = [];
+  nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge 
+    SDL SDL_image];
+  preConfigure = ''
+    patchShebangs .
+  '';
+  installPhase = ''
+    mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg}
+    cp *.hex "$out/share/fonts/"
+    cp *.pcf "$out/share/fonts/"
+    cp *.ttf "$out/share/fonts/truetype"
+    cp *.otf "$out/share/fonts/opentype"
+    cp *.svg "$out/share/fonts/svg"
+    cp *.woff "$out/share/fonts/web"
+  '';
+  meta = {
+    inherit version;
+    description = ''Bitmapped character-art-friendly Unicode fonts'';
+    # Basically GPL2+ with font exception — because of the Unifont-augmented
+    # version. The reduced version is public domain.
+    license = http://unifoundry.com/LICENSE.txt;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://pelulamu.net/unscii/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c293e77aa1..d9aa7940aaf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12094,6 +12094,8 @@ in
 
   unifont_upper = callPackage ../data/fonts/unifont_upper { };
 
+  unscii = callPackage ../data/fonts/unscii { };
+
   vanilla-dmz = callPackage ../data/icons/vanilla-dmz { };
 
   vistafonts = callPackage ../data/fonts/vista-fonts { };

From fbfb6d7c21d35ec184725fe6f0eab1534fcb4be3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 15 Dec 2016 21:03:04 +0100
Subject: [PATCH 219/295] perlPackages.locallib: 2.000017 -> 2.000019

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3199f65f955..9843253c443 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7407,10 +7407,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   locallib = buildPerlPackage rec {
-    name = "local-lib-2.000017";
+    name = "local-lib-2.000019";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "05607zxpb0jqvxn0cw064pnwsvbajw7k2pmzlisffadihg11m6ps";
+      sha256 = "008b9kgvcs9vjvj7ifg0f1s7i7446ff2441c575vhrwn15x35b9n";
     };
     meta = {
       description = "Create and use a local lib/ for perl modules with PERL5LIB";

From 921a6f8b560b7febcc3d07213a834ae3dec75a47 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 15 Dec 2016 21:22:39 +0100
Subject: [PATCH 220/295] parallel: 20161022 -> 20161122

---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d74f2770030..4bc346d41f8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20161022";
+  name = "parallel-20161122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr";
+    sha256 = "0z5c4r35d926ac04ilaivx67cmflr1rsvmjb2ci7hmab948m0ng2";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1152b97925cd0c14367826201318752ddaa21859 Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Thu, 15 Dec 2016 21:47:31 +0100
Subject: [PATCH 221/295] vscode: 1.7.2 -> 1.8.0

---
 pkgs/applications/editors/vscode/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f125e8d4d5d..689a1537b69 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,20 +2,20 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.7.2";
-  rev = "7ba55c5860b152d999dda59393ca3ebeb1b5c85f";
+  version = "1.8.0";
+  rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
 
-  sha256 = if stdenv.system == "i686-linux"    then "0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc"
-      else if stdenv.system == "x86_64-linux"  then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f"
-      else if stdenv.system == "x86_64-darwin" then "1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9"
+  sha256 = if stdenv.system == "i686-linux"    then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq"
+      else if stdenv.system == "x86_64-linux"  then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76"
+      else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-stable-code_${version}-1479767514_i386.tar.gz"
+        urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-stable-code_${version}-1479766213_amd64.tar.gz"
+        urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-stable.zip"
       else throw "Unsupported system: ${stdenv.system}";

From b44e52b1345f39932555b8bc3ecf8f35d50b319d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Thu, 15 Dec 2016 22:18:29 +0100
Subject: [PATCH 222/295] languagetool: Add myself as a maintainer

---
 pkgs/tools/text/languagetool/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index d2929ab90f4..383e9cf72c3 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -25,7 +25,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://languagetool.org";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ edwtjo ];
+    maintainers = with maintainers; [
+      edwtjo
+      jgeerds
+    ];
     descrption = "A proofreading program for English, French German, Polish, and more";
   };
 }

From 63d930878b721f5775399209e8a3e78b4237c324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Dec 2016 22:42:50 +0100
Subject: [PATCH 223/295] travis: also evaluate nixpkgs-unstable

---
 .travis.yml                                 | 2 +-
 maintainers/scripts/travis-nox-review-pr.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1fa01f7b781..802af69834d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ matrix:
         - os: linux
           sudo: false
           script:
-              - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball
+              - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
               - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
         - os: linux
           sudo: required
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 5fc932f10d0..649798ec76b 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -38,6 +38,12 @@ while test -n "$1"; do
             nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr tarball --show-trace
             ;;
 
+        nixpkgs-unstable)
+            echo "=== Checking nixpkgs unstable job"
+
+            nix-instantiate $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr unstable --show-trace
+            ;;
+
         nixpkgs-lint)
             echo "=== Checking nixpkgs lint"
 

From 2e7105467b22292eca1fc37c2c8019e6aacc7051 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 17 Nov 2016 09:52:12 -0200
Subject: [PATCH 224/295] lxqt: better organize system packages

Split packages in three categories, all of them going into the system
package list:
- pre-requisite packages
- core packages
- optional packages

Add a new configuration option 'environment.lxqt.excludePackages' to
specify optional LXQt packages that should be excluded from system
packages.

Add 'gvfs' as a pre-requisite package, needed by 'pcmanfm-qt' to
handle virtual places, like "Computer" and "Network".
---
 .../services/x11/desktop-managers/lxqt.nix    | 66 +++++++------------
 pkgs/desktops/lxqt/default.nix                | 62 +++++++++++++++++
 2 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index c385e74dbb2..89ad2882363 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -4,6 +4,14 @@ with lib;
 
 let
 
+  # Remove packages of ys from xs, based on their names
+  removePackagesByName = xs: ys:
+    let
+      pkgName = drv: (builtins.parseDrvName drv.name).name;
+      ysNames = map pkgName ys;
+    in
+      filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.lxqt;
 
@@ -18,8 +26,14 @@ in
       description = "Enable the LXQt desktop manager";
     };
 
-  };
+    environment.lxqt.excludePackages = mkOption {
+      default = [];
+      example = literalExample "[ pkgs.lxqt.qterminal ]";
+      type = types.listOf types.package;
+      description = "Which LXQt packages to exclude from the default environment";
+    };
 
+  };
 
   config = mkIf (xcfg.enable && cfg.enable) {
 
@@ -31,47 +45,12 @@ in
       '';
     };
 
-    environment.systemPackages = [
-      pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
-      pkgs.kde5.libkscreen # provides plugins for screen management software
-      pkgs.kde5.oxygen-icons5 # default icon theme
-      pkgs.libfm
-      pkgs.libfm-extra
-      pkgs.lxmenu-data
-      pkgs.lxqt.compton-conf
-      pkgs.lxqt.libfm-qt
-      pkgs.lxqt.liblxqt
-      pkgs.lxqt.libqtxdg
-      pkgs.lxqt.libsysstat
-      pkgs.lxqt.lximage-qt
-      pkgs.lxqt.lxqt-about
-      pkgs.lxqt.lxqt-admin
-      pkgs.lxqt.lxqt-common
-      pkgs.lxqt.lxqt-config
-      pkgs.lxqt.lxqt-globalkeys
-      pkgs.lxqt.lxqt-l10n
-      pkgs.lxqt.lxqt-notificationd
-      pkgs.lxqt.lxqt-openssh-askpass
-      pkgs.lxqt.lxqt-panel
-      pkgs.lxqt.lxqt-policykit
-      pkgs.lxqt.lxqt-powermanagement
-      pkgs.lxqt.lxqt-qtplugin
-      pkgs.lxqt.lxqt-runner
-      pkgs.lxqt.lxqt-session
-      pkgs.lxqt.lxqt-sudo
-      pkgs.lxqt.obconf-qt
-      pkgs.lxqt.pavucontrol-qt
-      pkgs.lxqt.pcmanfm-qt
-      pkgs.lxqt.qlipper
-      pkgs.lxqt.qps
-      pkgs.lxqt.qterminal
-      pkgs.lxqt.qtermwidget
-      pkgs.lxqt.screengrab
-      pkgs.menu-cache
-      pkgs.openbox # default window manager
-      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
-      pkgs.xscreensaver
-    ];
+    environment.systemPackages =
+      pkgs.lxqt.preRequisitePackages ++
+      pkgs.lxqt.corePackages ++
+      (removePackagesByName
+        pkgs.lxqt.optionalPackages
+        config.environment.lxqt.excludePackages);
 
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [
@@ -80,5 +59,8 @@ in
       "/share/lxqt"
     ];
 
+    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+
   };
+
 }
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 76cde64494a..d5f5194c48e 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -63,6 +63,68 @@ let
     screengrab = callPackage ./optional/screengrab { };
     qlipper = callPackage ./optional/qlipper { };
 
+    preRequisitePackages = [
+      pkgs.gvfs # virtual file systems support for PCManFM-QT
+      pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
+      pkgs.kde5.libkscreen # provides plugins for screen management software
+      pkgs.libfm
+      pkgs.libfm-extra
+      pkgs.lxmenu-data
+      pkgs.menu-cache
+      pkgs.openbox # default window manager
+      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
+    ];
+
+    corePackages = [
+      ### BASE
+      libqtxdg
+      libsysstat
+      liblxqt
+
+      ### CORE 1
+      libfm-qt
+      lxqt-about
+      lxqt-admin
+      lxqt-common
+      lxqt-config
+      lxqt-globalkeys
+      lxqt-l10n
+      lxqt-notificationd
+      lxqt-openssh-askpass
+      lxqt-policykit
+      lxqt-powermanagement
+      lxqt-qtplugin
+      lxqt-session
+      lxqt-sudo
+      pavucontrol-qt
+
+      ### CORE 2
+      lxqt-panel
+      lxqt-runner
+      pcmanfm-qt
+    ];
+
+    optionalPackages = [
+      ### LXQt project
+      qterminal
+      compton-conf
+      obconf-qt
+      lximage-qt
+
+      ### QtDesktop project
+      qps
+      screengrab
+
+      ### Qlipper
+      qlipper
+
+      ### Default icon theme
+      pkgs.kde5.oxygen-icons5
+
+      ### Screen saver
+      pkgs.xscreensaver
+    ];
+
   };
 
 in self

From a94af71da71ebc4a52c002891d813cf2689fc950 Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 16:43:38 -0500
Subject: [PATCH 225/295] linux stdenv: Fix assert that broke tests...and hydra

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 7063d7bfcb6..26dfee25230 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -180,7 +180,7 @@ rec {
     allPackages = assert false; null;
 
     platform = assert false; null;
-    crossSystem = assert false; null;
+    crossSystem = null;
     config = assert false; null;
   }).bootstrapTools;
 

From f92544fe12dc0cc9d5141132b2ed0298bb8c0f9c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Thu, 15 Dec 2016 22:47:07 +0100
Subject: [PATCH 226/295] falcon: Fix typo in derivation name (closes #21112)

---
 pkgs/development/interpreters/falcon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index bed5b0ef0b3..4c4a4a0c894 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "faclon-${version}";
+  name = "falcon-${version}";
   version = "2013-09-19";
 
   src = fetchFromGitHub {

From 670256dc399ab637fa94df9a90fb13f275c39f8a Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 17:05:39 -0500
Subject: [PATCH 227/295] linux stdenv: Rename the `bootstrap` directory to
 `bootstrap-files`

---
 .../{bootstrap => bootstrap-files}/armv5tel.nix      |  0
 .../linux/{bootstrap => bootstrap-files}/armv6l.nix  |  0
 .../linux/{bootstrap => bootstrap-files}/armv7l.nix  |  0
 .../linux/{bootstrap => bootstrap-files}/i686.nix    |  0
 .../{bootstrap => bootstrap-files}/loongson2f.nix    |  0
 .../linux/{bootstrap => bootstrap-files}/x86_64.nix  |  0
 pkgs/stdenv/linux/default.nix                        | 12 ++++++------
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv5tel.nix (100%)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv6l.nix (100%)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv7l.nix (100%)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/i686.nix (100%)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/loongson2f.nix (100%)
 rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/x86_64.nix (100%)

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv5tel.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv6l.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv6l.nix
diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv7l.nix
rename to pkgs/stdenv/linux/bootstrap-files/armv7l.nix
diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/i686.nix
rename to pkgs/stdenv/linux/bootstrap-files/i686.nix
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/loongson2f.nix
rename to pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/x86_64.nix
rename to pkgs/stdenv/linux/bootstrap-files/x86_64.nix
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 34196359f52..a39ff61a8b5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -7,12 +7,12 @@
 , system, platform, crossSystem, config
 
 , bootstrapFiles ?
-    if system == "i686-linux" then import ./bootstrap/i686.nix
-    else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix
-    else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix
-    else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix
-    else if system == "armv7l-linux" then import ./bootstrap/armv7l.nix
-    else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix
+    if system == "i686-linux" then import ./bootstrap-files/i686.nix
+    else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix
+    else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix
+    else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix
+    else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix
+    else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix
     else abort "unsupported platform for the pure Linux stdenv"
 }:
 

From 7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 17:09:29 -0500
Subject: [PATCH 228/295] linux stdenv: Avoid `assert false`

On one hand, don't want to pass garbage that affects hash, on the other
hand footguns are bad.

Now, factored out the derivation so only need to pass in what is used.
---
 pkgs/stdenv/linux/bootstrap-tools/default.nix  | 18 ++++++++++++++++++
 .../scripts/unpack-bootstrap-tools.sh          |  0
 pkgs/stdenv/linux/default.nix                  | 17 +----------------
 pkgs/stdenv/linux/make-bootstrap-tools.nix     | 11 +----------
 4 files changed, 20 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/stdenv/linux/bootstrap-tools/default.nix
 rename pkgs/stdenv/linux/{ => bootstrap-tools}/scripts/unpack-bootstrap-tools.sh (100%)

diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix
new file mode 100644
index 00000000000..6118585d545
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@@ -0,0 +1,18 @@
+{ system, bootstrapFiles }:
+
+derivation {
+  name = "bootstrap-tools";
+
+  builder = bootstrapFiles.busybox;
+
+  args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
+
+  tarball = bootstrapFiles.bootstrapTools;
+
+  inherit system;
+
+  # Needed by the GCC wrapper.
+  langC = true;
+  langCC = true;
+  isGNU = true;
+}
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
similarity index 100%
rename from pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
rename to pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index a39ff61a8b5..9900fc6dd3d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -37,22 +37,7 @@ rec {
 
 
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = derivation {
-    name = "bootstrap-tools";
-
-    builder = bootstrapFiles.busybox;
-
-    args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
-
-    tarball = bootstrapFiles.bootstrapTools;
-
-    inherit system;
-
-    # Needed by the GCC wrapper.
-    langC = true;
-    langCC = true;
-    isGNU = true;
-  };
+  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
 
 
   # This function builds the various standard environments used during
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 26dfee25230..e13fb88eff0 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -173,16 +173,7 @@ rec {
     bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";
   };
 
-  bootstrapTools = (import ./default.nix {
-    inherit system bootstrapFiles;
-
-    lib = assert false; null;
-    allPackages = assert false; null;
-
-    platform = assert false; null;
-    crossSystem = null;
-    config = assert false; null;
-  }).bootstrapTools;
+  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
 
   test = derivation {
     name = "test-bootstrap-tools";

From 19fbe80c3d1f3b5888a3f78f2df2af07355ea498 Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 17:09:46 -0500
Subject: [PATCH 229/295] top-level: avoid another `assert false` while we're
 at it

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 pkgs/top-level/default.nix                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index bd581f71a43..c862eb141a8 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -334,7 +334,7 @@ in rec {
   # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
   test-pkgs = import test-pkgspath {
     inherit system;
-    stdenv = args: let
+    stdenvFunc = args: let
         args' = args // { inherit bootstrapFiles; };
       in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin;
   };
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 31c51215676..658f149908c 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -25,7 +25,7 @@
 
 , # The standard environment for building packages, or rather a function
   # providing it. See below for the arguments given to that function.
-  stdenv ? assert false; null
+  stdenvFunc ? import ../stdenv
 
 , crossSystem ? null
 , platform ? assert false; null
@@ -76,7 +76,7 @@ in let
     inherit lib nixpkgsFun;
   } // newArgs);
 
-  stdenv = (args.stdenv or (import ../stdenv)) {
+  stdenv = stdenvFunc {
     inherit lib allPackages system platform crossSystem config;
   };
 

From eb7ea181f1368063c33b65db51605f43b1e42654 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 07:38:51 -0500
Subject: [PATCH 230/295] jasper: 1.900.28 -> 2.0.6

---
 pkgs/development/libraries/jasper/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 9568d9bbb3b..cf5c264fc8d 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-1.900.28";
+  name = "jasper-2.0.6";
 
   src = fetchurl {
     # You can find this code on Github at https://github.com/mdadams/jasper
     # however note at https://www.ece.uvic.ca/~frodo/jasper/#download
     # not all tagged releases are for distribution.
     url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
-    sha256 = "0nsiblsfpfa0dahsk6hw9cd18fp9c8sk1z5hdp19m33c0bf92ip9";
+    sha256 = "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk";
   };
 
   # newer reconf to recognize a multiout flag
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    moveToOutput bin "$bin"
+  '';
+
   meta = {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";

From ca6463ef90400e2185b9370e9a92aef76d63dfa6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 07:59:31 -0500
Subject: [PATCH 231/295] sqlite: 3.15.0 -> 3.15.2 for null pointer dereference

https://sqlite.org/releaselog/3_15_2.html
---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index c557de1f39f..8161d3bfa1f 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.15.0";
+  name = "sqlite-3.15.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz";
-    sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp";
+    url = "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz";
+    sha256 = "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 971ae27526f7b955058807ff7fb10b9e97fbae25 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 17:13:18 -0500
Subject: [PATCH 232/295] perlPackages.DBDmysql: 4.039 -> 4.041 for
 CVE-2016-1251

---
 pkgs/development/perl-modules/DBD-mysql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 0e1db7e234d..7302516d542 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, mysql }:
 
 buildPerlPackage rec {
-  name = "DBD-mysql-4.039";
+  name = "DBD-mysql-4.041";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
-    sha256 = "0k4p3bjdbmxm2amb0qiiwmn8v83zrjkz5qp84xdjrg8k5v9aj0hn";
+    url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz";
+    sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";
   };
 
   buildInputs = [ mysql.lib ] ;

From 4fa52379842ac8f845aca64766d148127e3496eb Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 17:36:22 -0500
Subject: [PATCH 233/295] libgsf: 1.14.36 -> 1.14.41 for CVE-2016-9888

---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 25d1ceb40bd..a22b99be8da 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.36";
+  name = "libgsf-1.14.41";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "0h19ssxzz0cmznwga2xy55kjibm24mwxqarnpd0w7xy0hrzm1dvi";
+    sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 5cbb0f7fbf8e44b57bb816b5a2fc3a1891c4438a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 17:52:09 -0500
Subject: [PATCH 234/295] unzip: patch for CVE-2014-9913 and CVE-2016-9844

---
 .../tools/archivers/unzip/CVE-2014-9913.patch | 29 +++++++++++++++++++
 .../tools/archivers/unzip/CVE-2016-9844.patch | 28 ++++++++++++++++++
 pkgs/tools/archivers/unzip/default.nix        |  2 ++
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/archivers/unzip/CVE-2014-9913.patch
 create mode 100644 pkgs/tools/archivers/unzip/CVE-2016-9844.patch

diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
new file mode 100644
index 00000000000..a5675f4fb7c
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch
@@ -0,0 +1,29 @@
+From: "Steven M. Schweda" <sms@antinode.info>
+Subject: Fix CVE-2014-9913, buffer overflow in unzip
+Bug: https://sourceforge.net/p/infozip/bugs/27/
+Bug-Debian: https://bugs.debian.org/847485
+Bug-Ubuntu: https://launchpad.net/bugs/387350
+X-Debian-version: 6.0-21
+
+--- a/list.c
++++ b/list.c
+@@ -339,7 +339,18 @@
+                 G.crec.compression_method == ENHDEFLATED) {
+                 methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3];
+             } else if (methnum >= NUM_METHODS) {
+-                sprintf(&methbuf[4], "%03u", G.crec.compression_method);
++                /* 2013-02-26 SMS.
++                 * http://sourceforge.net/p/infozip/bugs/27/  CVE-2014-9913.
++                 * Unexpectedly large compression methods overflow
++                 * &methbuf[].  Use the old, three-digit decimal format
++                 * for values which fit.  Otherwise, sacrifice the
++                 * colon, and use four-digit hexadecimal.
++                 */
++                if (G.crec.compression_method <= 999) {
++                    sprintf( &methbuf[ 4], "%03u", G.crec.compression_method);
++                } else {
++                    sprintf( &methbuf[ 3], "%04X", G.crec.compression_method);
++                }
+             }
+ 
+ #if 0       /* GRR/Euro:  add this? */
diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
new file mode 100644
index 00000000000..52d07987b33
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch
@@ -0,0 +1,28 @@
+From: "Steven M. Schweda" <sms@antinode.info>
+Subject: Fix CVE-2016-9844, buffer overflow in zipinfo
+Bug-Debian: https://bugs.debian.org/847486
+Bug-Ubuntu: https://launchpad.net/bugs/1643750
+X-Debian-version: 6.0-21
+
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -1921,7 +1921,18 @@
+         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
+         methbuf[3] = dtype[dnum];
+     } else if (methnum >= NUM_METHODS) {   /* unknown */
+-        sprintf(&methbuf[1], "%03u", G.crec.compression_method);
++        /* 2016-12-05 SMS.
++         * https://launchpad.net/bugs/1643750
++         * Unexpectedly large compression methods overflow
++         * &methbuf[].  Use the old, three-digit decimal format
++         * for values which fit.  Otherwise, sacrifice the "u",
++         * and use four-digit hexadecimal.
++         */
++        if (G.crec.compression_method <= 999) {
++            sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
++        } else {
++            sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
++        }
+     }
+ 
+     for (k = 0;  k < 15;  ++k)
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index da0983fc097..b9fa760c019 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
     ./CVE-2014-9636.diff
     ./CVE-2015-7696.diff
     ./CVE-2015-7697.diff
+    ./CVE-2014-9913.patch
+    ./CVE-2016-9844.patch
   ] ++ stdenv.lib.optional enableNLS
     (fetchurl {
       url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";

From 503c57237fa68140059d99fe8f6f12a7efe522a5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 18:03:38 -0500
Subject: [PATCH 235/295] go_1_6: 1.6.3 -> 1.6.4 for DoS vector

---
 pkgs/development/compilers/go/1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 38b114d8d07..db6573417bf 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -15,11 +15,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm";
+    sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9";
   };
 
   # perl is used for testing go vet

From 8800ea7617ab3899b2ed74c8c96849de1f0cf711 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 14 Dec 2016 18:07:52 -0500
Subject: [PATCH 236/295] zabbix22: 2.2.2 -> 2.2.16 for CVE-2016-4338
 CVE-2016-9140

---
 pkgs/servers/monitoring/zabbix/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 10375b9b1c1..6429d3fae53 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -10,12 +10,12 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.2.2";
+  version = "2.2.16";
   branch = "2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1gmjbjmajdllzd7akihb5kg4l2gf0ii9c16fq8mlla37sshzj3p0";
+    sha256 = "0hc0y3p8p6pxri7w3n311ry3m5hb440kgwwkiqlihbhsq73xiz1w";
   };
 
   preConfigure =

From 891e391cdbb90f10927a8b22329130051366f603 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 15:59:25 +0100
Subject: [PATCH 237/295] go: 1.7.3 -> 1.7.4

---
 pkgs/development/compilers/go/1.7.nix         |  4 +--
 .../development/compilers/go/cacert-1.7.patch | 36 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 72665cd0935..16de9b0edbf 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -24,13 +24,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "0dcappkx4ichl249swwdyk7l078ajng0gl6a885va85z8m1jnvbs";
+    sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch
index 0fe9ff8cc23..57f09c975d9 100644
--- a/pkgs/development/compilers/go/cacert-1.7.patch
+++ b/pkgs/development/compilers/go/cacert-1.7.patch
@@ -24,26 +24,18 @@ index a4b33c7..9700b75 100644
  	var data C.CFDataRef = nil
  	err := C.FetchPEMRoots(&data)
 diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
-index 78de56c..05eada4 100644
+index 59b303d..d4a34ac 100644
 --- a/src/crypto/x509/root_darwin.go
 +++ b/src/crypto/x509/root_darwin.go
-@@ -6,20 +6,31 @@
- 
- package x509
- 
--import "os/exec"
-+import (
-+	"io/ioutil"
-+	"os"
-+	"os/exec"
-+)
- 
- func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
- 	return nil, nil
- }
+@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
+ // The linker will not include these unused functions in binaries built with cgo enabled.
  
  func execSecurityRoots() (*CertPool, error) {
-+	roots := NewCertPool()
++	var (
++		mu    sync.Mutex
++		roots = NewCertPool()
++	)
++
 +	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
 +		data, err := ioutil.ReadFile(file)
 +		if err == nil {
@@ -51,16 +43,20 @@ index 78de56c..05eada4 100644
 +			return roots, nil
 +		}
 +	}
++
  	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
  	data, err := cmd.Output()
  	if err != nil {
  		return nil, err
  	}
  
--	roots := NewCertPool()
- 	roots.AppendCertsFromPEM(data)
- 	return roots, nil
- }
+-	var (
+-		mu    sync.Mutex
+-		roots = NewCertPool()
+-	)
+ 	add := func(cert *Certificate) {
+ 		mu.Lock()
+ 		defer mu.Unlock()
 diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
 index 7bcb3d6..3986e1a 100644
 --- a/src/crypto/x509/root_unix.go

From 4af2328e5cbf0835caf95e9a753f42c1d1d4592b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Thu, 15 Dec 2016 23:52:34 +0100
Subject: [PATCH 238/295] discord: Fix missing desktop entry (closes #21045)

---
 .../instant-messengers/discord/default.nix    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index aaabb4ab111..8387d2f7c38 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeDesktopItem
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
 , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
 , systemd, libXScrnSaver }:
 
-let version = "0.0.11"; in
+stdenv.mkDerivation rec {
 
-stdenv.mkDerivation {
-
-    name = "discord-${version}";
+    pname = "discord";
+    version = "0.0.11";
+    name = "${pname}-${version}";
 
     src = fetchurl {
-        url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
+        url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
         sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
     };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
      ];
 
     installPhase = ''
-        mkdir -p $out/bin
+        mkdir -p $out/{bin,share/pixmaps}
         mv * $out
 
         # Copying how adobe-reader does it,
@@ -33,11 +33,22 @@ stdenv.mkDerivation {
                  $out/DiscordCanary
 
         ln -s $out/DiscordCanary $out/bin/
+        ln -s $out/discord.png $out/share/pixmaps
 
         # Putting udev in the path won't work :(
         ln -s ${systemd.lib}/lib/libudev.so.1 $out
+        ln -s "${desktopItem}/share/applications" $out/share/
         '';
 
+    desktopItem = makeDesktopItem {
+      name = pname;
+      exec = "DiscordCanary";
+      icon = pname;
+      desktopName = "Discord Canary";
+      genericName = meta.description;
+      categories = "Network;InstantMessaging;";
+    };
+
     meta = with stdenv.lib; {
         description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
         homepage = "https://discordapp.com/";

From 994b243dd33a478b14a643d80d3aaa80ac843abb Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 15 Dec 2016 17:47:57 -0500
Subject: [PATCH 239/295] elpa-packages: 2016-12-15

---
 .../editors/emacs-modes/elpa-generated.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 4d9d903c7d6..9118344f024 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -619,10 +619,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.1.2";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.1.2.tar";
-          sha256 = "1cav55nx1045c3xasi5d76yyqi68ygp9dpqv9bazrqgcpsmw6y8b";
+          url = "https://elpa.gnu.org/packages/el-search-1.2.tar";
+          sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -1364,10 +1364,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161118";
+        version = "20161214";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20161118.tar";
-          sha256 = "1w9g8r08kaiw9f4fjsj0hbffzq85rj734j5lxvbaafbnz7dbklk1";
+          url = "https://elpa.gnu.org/packages/org-20161214.tar";
+          sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm";
         };
         packageRequires = [];
         meta = {

From c5e64ba4c8b9058aa1041e398e13e990ed37e22f Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 15 Dec 2016 17:48:32 -0500
Subject: [PATCH 240/295] melpa-packages: 2016-12-15

Removals:
 - cursor-in-brackets: github account no longer exists
 - dummy-h-mode: github account no longer exists
 - general-close: removed from melpa
 - judge-indent: github account no longer exists
---
 .../editors/emacs-modes/melpa-generated.nix   | 783 +++++++++---------
 1 file changed, 402 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 4f027897c2c..b61f26446a9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
-          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
+          rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20161210.1838";
+        version = "20161213.2320";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
-          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
+          rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1261,8 +1261,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "2427786228f13f5893a8513d4837d14d1a1b375f";
-          sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n";
+          rev = "7b7c2d03e10968c6726f8a59ab25fcac0c147fba";
+          sha256 = "06nglpfz4xvjgkfxx1g1vhcm846kfb56pqxv3a8l0rd0fqyaziyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1444,12 +1444,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20160322.0";
+        version = "20161213.1359";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "f75173f4cb86259503ff4950e450e3fa7a37a808";
-          sha256 = "00s6z6f9nlqw528ppbwsglh9wshw8cpg2g102ywdsl28bwy3wvgj";
+          rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b";
+          sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1528,12 +1528,12 @@
     all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-ext";
-        version = "20160604.1501";
+        version = "20161214.2250";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "all-ext";
-          rev = "2639955833132451679feae8a54ca157c1d864ce";
-          sha256 = "0g5g0nhq76v8jbhs38si6abwn4zv9qh7jl87qhhy3in8s1inswzf";
+          rev = "a441c10ef99df2a639dfd9e8892cb6080db40730";
+          sha256 = "1fvha7gkr0ll6dnpp7rb5v6w11i03rbd74g18fd8x0vdi6lw7j10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
@@ -1642,12 +1642,12 @@
     ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ample-theme";
-        version = "20161207.614";
+        version = "20161213.912";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "ample-theme";
-          rev = "ab3bdaa99dda8ac86a8be44162ac0f2374392950";
-          sha256 = "1ncwzjh46df89zsh8y0nprdv2wb06aq6swfc7byi0ghcbd8x3jv7";
+          rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1";
+          sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -2822,12 +2822,12 @@
     atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
     melpaBuild {
         pname = "atomic-chrome";
-        version = "20161114.409";
+        version = "20161213.730";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "atomic-chrome";
-          rev = "62fa0dc6167bd65185ec5138bac5c60acdda2875";
-          sha256 = "117a10vns47wnhihblb66ngn581ngqbhbanwhakfc5kd4xflqcaz";
+          rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9";
+          sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -2906,12 +2906,12 @@
     aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aurel";
-        version = "20161023.122";
+        version = "20161214.825";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "aurel";
-          rev = "a77e8afd1cc34a1f042be7b1c34a17eb699d826a";
-          sha256 = "0r4z97n99gh62yn21b2zzs4bc85hwbnyi4x1gllyrrmmb6qjg1lr";
+          rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee";
+          sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
@@ -5835,12 +5835,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "20161122.946";
+        version = "20161213.735";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "65884653411b116029680d6c3154edd0eb9e5e9a";
-          sha256 = "1xiy7q79zbqyf0phq97zgkprj0j577xbnh24zh3fbs9i6nbiv46x";
+          rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01";
+          sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6841,7 +6841,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11919";
+          rev = "11922";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -7024,12 +7024,12 @@
     chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "chee";
-        version = "20161105.1306";
+        version = "20161212.1525";
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548";
-          sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc";
+          rev = "979279d9b15a1885b0e0c3143a9e422f98c11b9c";
+          sha256 = "0jp4ivzbdpk4wzhj4qy4fr7zn45plnfmirl0ylrb4hiwqd7kwbd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7546,12 +7546,12 @@
     ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ciel";
-        version = "20161211.1946";
+        version = "20161213.2141";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "d8bf0d2829485886daddf8d4b11322a1ed7a0fc5";
-          sha256 = "1glswbpnvvngzahcn9jdy0jamr72xfcqaman6iqkgzxwj2kf84bn";
+          rev = "bf0c83ff06e229a15aabfa132237b7d4a05abcbe";
+          sha256 = "1967vgfmi0asa7zwhzwpp63hhckp4wcmdxwbpi7rixhqp521cp7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7696,7 +7696,7 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "289430";
+          rev = "289815";
           sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
         };
         recipeFile = fetchurl {
@@ -8082,12 +8082,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20161121.311";
+        version = "20161215.49";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "116278521899f205a067c47621d97e4968aacb71";
-          sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi";
+          rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
+          sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8107,8 +8107,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "116278521899f205a067c47621d97e4968aacb71";
-          sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi";
+          rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
+          sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8250,12 +8250,12 @@
     clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clues-theme";
-        version = "20161210.1752";
+        version = "20161213.327";
         src = fetchFromGitHub {
           owner = "jasonm23";
           repo = "emacs-clues-theme";
-          rev = "16c05f6dbe7125358f8456110f237d68263e987a";
-          sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c";
+          rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
+          sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
@@ -8338,8 +8338,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3874843f0f5be9d53001517b3697e0d092f0e845";
-          sha256 = "1qnnba479wb065yq1xg6jaddvmix1cdy39d2wg4n704dks9pyp8f";
+          rev = "517c7cca8c856546a93454cf0cf98fe6bad3f856";
+          sha256 = "0hami0cq0sqakh98qw39iyv93jdpwxi0j2frc37az9y2zimbbcwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9709,8 +9709,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf";
-          sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0";
+          rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
+          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9879,12 +9879,12 @@
     company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-statistics";
-        version = "20151126.1246";
+        version = "20161213.159";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-statistics";
-          rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523";
-          sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7";
+          rev = "36d9692da9172c3ad1e1a46d66ffa9346a44b212";
+          sha256 = "05br3ikxad7gm7h6327yfwdfap6bbg68fbybsx967a31yv4rxhvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
@@ -10340,12 +10340,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161211.1126";
+        version = "20161213.439";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
-          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
+          rev = "c2c0e2d7bd79a0c7cb8a6df98d2a87a0891730d8";
+          sha256 = "19v6l6xfhyxnmq7ajc0f4qac1ns5wjl9l78sfpa39jn6cm9wbyy5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11188,27 +11188,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    cursor-in-brackets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "cursor-in-brackets";
-        version = "20160603.416";
-        src = fetchFromGitHub {
-          owner = "yascentur";
-          repo = "cursor-in-brackets-el";
-          rev = "3c085913eff08eddcc8fa4ed6438d60da59d7bc2";
-          sha256 = "06q46hmspgq1g3dkpim3fnz1gnzpqywwqcg5yism2lc6qj4zmanm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5862f7a24b3c213505277ad44a64d8dd402119eb/recipes/cursor-in-brackets";
-          sha256 = "1p4p0v7x4i4i2z56dw4xf1phckanrwjciifi0zqba36xd4zxgx8f";
-          name = "cursor-in-brackets";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/cursor-in-brackets";
-          license = lib.licenses.free;
-        };
-      }) {};
     cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cursor-test";
@@ -11500,12 +11479,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20161128.545";
+        version = "20161214.703";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "daf31ca666a2b82d305b60255234b84d70b8d037";
-          sha256 = "1172qv32z80nafcmj4b60bv678ab565w9smpsdpvravrp5z4sdca";
+          rev = "a984cded7522b2cdad7f33542d3b5cb9ad095860";
+          sha256 = "0dhnm3f7dd9wdbpsvnwc0hh1sa6cd48r8sw49f70pf76z58iss53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11836,12 +11815,12 @@
     date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "date-at-point";
-        version = "20150108.418";
+        version = "20150308.543";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "date-at-point.el";
-          rev = "65733210479812a70a6dd5978ba0e2a4a6fcd08b";
-          sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
+          rev = "38df823d05df08ec0748a4185113fae5f99090e9";
+          sha256 = "024jx6q0dik4w2wb8nrk1q73asvjgrsl5mslns0ci3zsya343rch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point";
@@ -12029,8 +12008,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "debpaste.el";
-          rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5";
-          sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
+          rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
+          sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
@@ -13973,12 +13952,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20161123.2356";
+        version = "20161214.532";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "074156c4cc5e71fcd9dc4bfb68792403acfdaa16";
-          sha256 = "0shsh1rj01a6bcr6sm073p60spy61vqnr8nhkcfa6lh2ccigxv43";
+          rev = "9ecfa0b16d86998c380f08f82743c4dce9accf5e";
+          sha256 = "0783v9qf06gy7miw80x1lf1z59yhcmiilprpcjdlf3fyvvym56a7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14532,12 +14511,12 @@
     drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
     melpaBuild {
         pname = "drupal-mode";
-        version = "20160915.245";
+        version = "20161215.414";
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "eec2e557d769f3379e6c208334650f3041d28d54";
-          sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq";
+          rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14";
+          sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -14576,7 +14555,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1773793";
+          rev = "1774435";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14656,12 +14635,12 @@
     ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ducpel";
-        version = "20140418.2216";
+        version = "20140702.454";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "ducpel";
-          rev = "4a1671fc45ab92d44dee85a1a223122d5a43cb32";
-          sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
+          rev = "b53b935ab95c02b82ccf38f63c89e39e99477a55";
+          sha256 = "07cgwkfi69xjjxx9hs5rdblsil1h3bpbx9k7hwyv1dg3ivihm04s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel";
@@ -14695,27 +14674,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "dummy-h-mode";
-        version = "20160603.417";
-        src = fetchFromGitHub {
-          owner = "yascentur";
-          repo = "dummy-h-mode-el";
-          rev = "2bc896f0e3bd3c976c4bb4cdf8056065bf39f50e";
-          sha256 = "1xkfwg1awb3ikb9i71xdbnbb94y3p2qd1fhnbx6kzfs0kmsiv5k9";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode";
-          sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
-          name = "dummy-h-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/dummy-h-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dummyparens";
@@ -14761,11 +14719,11 @@
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20161108.348";
+        version = "20161213.651";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "befb5c650dfd";
-          sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2";
+          rev = "20a2166c8210";
+          sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15660,12 +15618,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20161211.2144";
+        version = "20161212.1946";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "19e81d24f33da40cd414142e44a55957ac9be83d";
-          sha256 = "1xcfyqnannnm6myv7pn2gjwnlq7rq4zciiykj5fs9kziaf4qggnp";
+          rev = "0e89a891eeffe942d71b93f7792958b38ea1ecf3";
+          sha256 = "09k3rqlwwssmqgynaww3ddfvgvarbsaspgr2c2xzbp9l5gg3rr4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15820,8 +15778,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "87b279f0e1ea1754215eceef007c8736d4bd9dfd";
-          sha256 = "1zjy8zmsh6n535cazmkrr081rmjaigkqxx134sam474dzbmcybdc";
+          rev = "636c5bca8faf9e116e8447cf73646257a85f1bfc";
+          sha256 = "1a7vlqwyh2c2qfdir52l2f62g53jcign6q65z66rkdqcdizmjqw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15898,12 +15856,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20161205.1432";
+        version = "20161214.1102";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "0805f4b15419bb92641bf09735be9bc2c72a3838";
-          sha256 = "07d26n946j19v0swx89d53mdsw1w3ar85ickswhj5fz1m3g9r4fc";
+          rev = "d85717bd24ec32c41cceaee2defc0957f2f0b4d3";
+          sha256 = "0z3mw1i5iwmnjd2qqsyw0ka159dalrfsviv1lbi0ff4x0sqxsd5q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -18615,8 +18573,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "b47d104994c6f11301f23b0675ed5f06f3e25922";
-          sha256 = "06498ydjw27wvyaxrc6fxf1z3ymw5cgy553ij2p1s9d4b78czlm0";
+          rev = "37933d48e1569bdf538686d8a1f82e7be4125ed5";
+          sha256 = "0h7jm42xj22jb512lsbjjd7gddgx4dh0711kblz3qazkm0ngw0ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19797,12 +19755,12 @@
     evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-extra-operator";
-        version = "20160406.2322";
+        version = "20161212.2003";
         src = fetchFromGitHub {
           owner = "Dewdrops";
           repo = "evil-extra-operator";
-          rev = "96d611b557876caefbc64731ad2d0385edbb0c23";
-          sha256 = "10vwyrg833imja3ak9fx0zackdjwlcncl7wm9dym3kjs6qf2rvv0";
+          rev = "e16a9b36f9901254da9af8a73871061616410fc3";
+          sha256 = "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0b157c3adf8a2899c4dd2ce98e8a81e4f403a3/recipes/evil-extra-operator";
@@ -20049,12 +20007,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20161123.1318";
+        version = "20161213.2138";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "124ac33859cb5f0d7928b5de62e5b40159f84478";
-          sha256 = "1lhgxb2fsl66c0a2afn56h4rqs2x2v7ijskzv95ag7i0zmjgrfds";
+          rev = "c8796e3c611cd8ca55e80a0487b93c4b0551d45c";
+          sha256 = "16xs6aj3ws6skhvqfda2i7y1gj0gg20yra99hpnkz05f4gcpjfmh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -23021,6 +22979,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-objc-clang";
+        version = "20161214.509";
+        src = fetchFromGitHub {
+          owner = "GyazSquare";
+          repo = "flycheck-objc-clang";
+          rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
+          sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
+          sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
+          name = "flycheck-objc-clang";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-objc-clang";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
     melpaBuild {
         pname = "flycheck-ocaml";
@@ -23336,6 +23315,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-swift3";
+        version = "20161214.501";
+        src = fetchFromGitHub {
+          owner = "GyazSquare";
+          repo = "flycheck-swift3";
+          rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
+          sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
+          sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
+          name = "flycheck-swift3";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-swift3";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-tip";
@@ -24575,12 +24575,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20161207.1442";
+        version = "20161214.1236";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "0bbf7992d618a84f823b21de5eb36a7cb081e35f";
-          sha256 = "0566l9zrz8hsmjcywn7851rgrrjq2qfhnlkbcwgn0n0q98x95hq0";
+          rev = "ccb14b4a477e13353ced9658b8e7adfe90bbcd15";
+          sha256 = "1g0dmrlqlwp6zaaixcksns2gzw7nsk4lk138qmfw5l6mvazjy4sk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -24914,8 +24914,8 @@
         version = "20161123.2000";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "aa5334420c42399d929cc6506a6b71c724c47df1";
-          sha256 = "19i5c5v0d1h12jkwbbg47p1n8a99ic7hl5avi8xndsm958aghcdl";
+          rev = "20a98a38fb23d61bf92bb25b2062f0d07f7af91d";
+          sha256 = "0wai0z3zf2blmr9f6sfawq9977n2shf4m42771grn65mgmldlzha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25259,12 +25259,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20161201.1330";
+        version = "20161214.650";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "04fd7b24c705e1ea1c8b3b8e4ff178ed7ecc6d12";
-          sha256 = "1jsfgm57i928wgn4540m48jady61i7k0bka1mw1i462m3wc62nba";
+          rev = "6b805aea456f7a899066f3caa7f17bfc3d199cee";
+          sha256 = "05gzdlz5nwz2vd7f7xk9abpv2ifn1w5djcz19v1qh7xyarickszq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -25361,27 +25361,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "general-close";
-        version = "20161208.1021";
-        src = fetchFromGitHub {
-          owner = "emacs-berlin";
-          repo = "general-close";
-          rev = "aab9b0bdb147ccae2b8b49a8bd2f1ad05f435909";
-          sha256 = "122lm7yh5nf6s6pf64fmsqvr4aqidbjx7vsizxpwjk1i47hj48q3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close";
-          sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
-          name = "general-close";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/general-close";
-          license = lib.licenses.free;
-        };
-      }) {};
     genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "genrnc";
@@ -25826,12 +25805,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20161206.1703";
+        version = "20161214.519";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
-          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
+          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27542,12 +27521,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20161201.1112";
+        version = "20161213.1524";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b5c807e3033ca8173cb48e8ef22f6cafc55244ba";
-          sha256 = "1i53iqcnq4bk29n7yj90n9m4g7qzdxp51c5mdgyvkdlwy3mry3i9";
+          rev = "45a5351755f12668ca9a0b63f1d1c906431157f6";
+          sha256 = "07ympvkvhbbfk7nrzr801qnqyh92nqs050cy4b0y22c3c52i6k6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28908,12 +28887,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20161209.753";
+        version = "20161212.2159";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2";
-          sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a";
+          rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
+          sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -28996,8 +28975,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "323524bd65d59f11d1a940a46a60448da85a2a63";
-          sha256 = "1bmkn6hn02fichylmr5pla3lbhixcn6h1znp77dg5j80npzb27yw";
+          rev = "997107a53abd3bda06d52e7021c87527c5747389";
+          sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -29118,12 +29097,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20161202.236";
+        version = "20161213.2242";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6";
-          sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997";
+          rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
+          sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -29412,12 +29391,12 @@
     helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-codesearch";
-        version = "20160831.1742";
+        version = "20161214.548";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "helm-codesearch.el";
-          rev = "ff192dfcfbc737b7803cee1b87518c488aec0807";
-          sha256 = "05xxnpqfppqyxncj4dddr0x02ji7yh4rj3q5przmm6v98kkdh6fa";
+          rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
+          sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
@@ -29475,12 +29454,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20161212.408";
+        version = "20161213.1754";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2";
-          sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a";
+          rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
+          sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30881,12 +30860,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20161008.45";
+        version = "20161213.2311";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "bc14d326fe892c902c55d093cccefb0fefde29b9";
-          sha256 = "1gkyk8cj55n5dxhhvflqvf14gcbg5i6pj329j04nnmk5kdn0crni";
+          rev = "10531b2634559ea2179f2530423beaac815e9a38";
+          sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32043,12 +32022,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20161118.1050";
+        version = "20161214.1619";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "759ff84afba940b1a35c484b54da9478f8aa15fb";
-          sha256 = "0rqn1yc1daxpax2qv42x72411ipj49y4s1j7abgkqh2g7fvrbdwa";
+          rev = "a1eeb2e50ca51b5b2e3a5cd190d2f1d79cf6ad28";
+          sha256 = "0bm5lqdvy0g2q7hd621vdc78430rk4fjbd94a6dj5wjh8vpcw7vd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -32189,12 +32168,12 @@
     highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-stages";
-        version = "20161212.241";
+        version = "20161212.657";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "highlight-stages";
-          rev = "d2c4f78ca9fc696da05fa05e3731c9a130a578da";
-          sha256 = "1sl419f957q9c04lm10i4jawqz28mymyaiwvk4dwh1x1iqa37qsw";
+          rev = "87c476f8ca0474912af41680a8de243c0c8d5b46";
+          sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages";
@@ -34325,8 +34304,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba";
-          sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
+          rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc";
+          sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
@@ -34697,10 +34676,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20161210.837";
+        version = "20161213.646";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "1d2n5yyrm904f22s8d4wqk66p646c7yx4rpsymp9cfgjvwlbar96";
+          sha256 = "0d3qf6vlz8qbxm8i2f3qqj005mmkr35k2xr9jr1hwvwm30jrwy4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35009,12 +34988,12 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20161123.101";
+        version = "20161214.515";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "36ed2533f3c9cc22a9b54c3e8814a4e2885d0177";
-          sha256 = "03yajiq3ifn9kiwrdx6zxlvycgisxm96yhalk5baysbicp6nh31r";
+          rev = "f4a31271362fd3610a83f6c93ea52581c1ffb3c5";
+          sha256 = "0n4p02yf7faajwnrdinphbqc6akq657cndh7h5k7bgsakykflja2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -35362,10 +35341,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20161210.1812";
+        version = "20161213.1957";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "01y1r0drfhjq87ip1mai4p47ivhc0gvfman8p9g6fqbywskdnnxm";
+          sha256 = "1pmp9r48m62zq4r5xbwjm1h2rhlgb5ibfs27gkw5i5lcr2pvvsz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35588,12 +35567,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161210.333";
+        version = "20161213.719";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
-          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
+          rev = "abdbfa790074632800a449b190a8fc8d0770c738";
+          sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35609,12 +35588,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20161202.236";
+        version = "20161213.2242";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6";
-          sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997";
+          rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
+          sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -35672,12 +35651,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20160517.1349";
+        version = "20161213.439";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
-          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
+          rev = "abdbfa790074632800a449b190a8fc8d0770c738";
+          sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35732,6 +35711,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-rich";
+        version = "20161213.302";
+        src = fetchFromGitHub {
+          owner = "yevgnen";
+          repo = "ivy-rich";
+          rev = "92d7312059f8c1f055f3336580ae77437038b472";
+          sha256 = "098xsg2yggfv1b931yw4r87l8rqmgxbib5ca8bgvr3nafxfya6la";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
+          sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m";
+          name = "ivy-rich";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-rich";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-xcdoc";
@@ -36591,12 +36591,12 @@
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "20161117.1413";
+        version = "20161212.2125";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "35660f93fb624c130c8795a742bad6ff9e2dd5bd";
-          sha256 = "18j0a6c7ashsbc1vsfj686pjc23igcgpvnwjrkhj0mm9afg918rq";
+          rev = "067d52cd5f1f30634b7f332b33d0ee181594508f";
+          sha256 = "08k8pcswk8d31mqnld0pk3jawskxjzc4sa1mh15jqpli9phym0va";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -36630,6 +36630,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js-format";
+        version = "20161215.33";
+        src = fetchFromGitHub {
+          owner = "futurist";
+          repo = "js-format.el";
+          rev = "dc5078de6bfdab3b23b0c5a4cbea4b96066c762e";
+          sha256 = "1b67nv9m30243pwarjqbvd3xwbcxgms21qdlgljpq7pjbjfh26yf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format";
+          sha256 = "112zqb3q1gjlaa9zkmhx7vamh0g97dwp9j55215i1sx66lmp18iq";
+          name = "js-format";
+        };
+        packageRequires = [ emacs js2-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/js-format";
+          license = lib.licenses.free;
+        };
+      }) {};
     js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "js-import";
@@ -36696,12 +36717,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20161208.1415";
+        version = "20161212.1716";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "6f2d51bd723126f82b491b5e2515356018a48849";
-          sha256 = "0bnbfbii0gq6rai4r62c9yaw6q1hlkiw038x0g2skmhnwm24ciiq";
+          rev = "90e37cdfdec06c7127cbb35f03a341c9d39cc2d5";
+          sha256 = "1m40hsfybqkplhwcn5b2kgm6czgdfiv7bp155fng7j045nmc8jgw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -36964,27 +36985,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "judge-indent";
-        version = "20160609.622";
-        src = fetchFromGitHub {
-          owner = "yascentur";
-          repo = "judge-indent-el";
-          rev = "f76c012284abc296681167d7b33d5e61f3ac7cec";
-          sha256 = "0547jy339ql31wym066pi79k520agdq062xblyvj0bi91j0rqld3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent";
-          sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
-          name = "judge-indent";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/judge-indent";
-          license = lib.licenses.free;
-        };
-      }) {};
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
@@ -37529,12 +37529,12 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "20161211.1015";
+        version = "20161212.957";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "8c88aa025201d4d890ab4eb51ce20d3c1ad20454";
-          sha256 = "19pjxhi4vp1xb7q9wrknvypylrnx052c9r3s0kl65wqasiqmrans";
+          rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
+          sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -37764,8 +37764,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "a58a88c506472302eee373b689cc297f64e42476";
-          sha256 = "0sgfl1d7dc7xppz6y9jchyl0dsx6jinjza7r1ak0ij5m32070zm7";
+          rev = "76138882e7fb7c609ae8f8f83d60d1ff1c11b64f";
+          sha256 = "1gq3wnf2rwm5gcf1kvz3vxhsnsymhnnh17vn9l0n42dy9r2jn50a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37781,12 +37781,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20161211.513";
+        version = "20161215.535";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "34851315ae9df84107f99236a0312ca4408838b6";
-          sha256 = "19jlrhrm1aciw20a52ljjzx3g17izkznxhg6j9q920v72dwm2z0m";
+          rev = "6fb8354e1770e752ae4eb3b79d5b873f65682904";
+          sha256 = "02k0pvax9gf8gx9gcgm6zv25pvn4962c8zipp1sn5ik7i8z4fcwq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -38702,8 +38702,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "64653b77c1d1a61f7e968d50fc1ffb1c03711b5d";
-          sha256 = "0296fbnbl3rvrk1x8xbaq7y14jz3qvr1wkrqb5fx30bfjjfk3zc9";
+          rev = "96ca72844dab04a5330e0f33d95a18544b7ba369";
+          sha256 = "1nzixvacppw37z5vfxp5ggg58ppqxrw86xhf2x4mfyyk9vs7jgg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39015,12 +39015,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161211.1128";
+        version = "20161212.1048";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "b50c07af1ee414c73b4dd53d6ca19ca4e473763a";
-          sha256 = "0i5zgrym9bh1b584qwh3npw4383s9arbs71xckp28di9w249sm4v";
+          rev = "8e4f8c6545520cbb206588bc2989b5f942e95089";
+          sha256 = "0h09niqzzcc42sjrdr56n4ayddv9798naiwi7ws9w45nrpghz9b5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39328,12 +39328,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20161125.2208";
+        version = "20161212.1937";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a";
-          sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d";
+          rev = "cec5ce8bbfc04ec36c09e349b707f5941c9883b5";
+          sha256 = "075jdy3mpn90kc894lcppmznp78k1csxf3acrrkxm3r6gncf4vkg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39415,8 +39415,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "f00c869d13d6af87f02ebf0bc5b682d5260436c6";
-          sha256 = "0667v43kd1ld764550s0qjki71iv4bp02nmdywbwfv60l76f5swl";
+          rev = "152f85e176aa00afd6dde8544d6735151a019991";
+          sha256 = "16jvypkrrnnabxva089k8fy23fvr405jka1bw0a47mlgrdfxan04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39992,12 +39992,12 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "20161209.1826";
+        version = "20161214.1017";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "3a5b86370cd495622be0200220405f48ea2aadc1";
-          sha256 = "1dw4r21c45l51l49n6jddn479kx2rmf27xm69cg1fp9xvadxqcd6";
+          rev = "9a20137474697063898902b43a40423daa4eb64d";
+          sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -40013,12 +40013,12 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20160212.603";
+        version = "20161214.1726";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "21c5030996bcd773b32b6fdd5990a64fcc3255f3";
-          sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf";
+          rev = "572bc5d9054ba5a7e78abd333141722be9013a1f";
+          sha256 = "0hmmsn1i2izasfpgmz2p0zi1fhj96yym2vz6m7yb0gxd2ijhk1jw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer";
@@ -40034,12 +40034,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161210.737";
+        version = "20161214.1516";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
-          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
+          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40209,12 +40209,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20161207.613";
+        version = "20161214.519";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d";
-          sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw";
+          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
+          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40423,8 +40423,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "make-color.el";
-          rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d";
-          sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
+          rev = "5ca1383ca9228bca82120b238bdc119f302b75c0";
+          sha256 = "1wmpy1d966zzxwar2ng825zlch5fwsslsi1706ss9v7zl7i9wggd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color";
@@ -40867,12 +40867,12 @@
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "20160727.908";
+        version = "20161214.1011";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "297bb643e222ec2f95a23403723e45eaf4a1dcd2";
-          sha256 = "0vk6zrxpinmzmgx74k1kc9kw6slb3j1z0lk4cyhcpxd202dm1bmw";
+          rev = "c7a526c0cd2c3b2ecc7b36458c762e0a0b55909e";
+          sha256 = "1j35pmm9rk7zk5j6x0fzglx09hbm8csf07f0pc9fkvvyh1nqskxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
@@ -41159,12 +41159,12 @@
     maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "maxframe";
-        version = "20140916.754";
+        version = "20161213.1734";
         src = fetchFromGitHub {
           owner = "rmm5t";
           repo = "maxframe.el";
-          rev = "174e3a0f3a716e904eba15e659096a99976ee39a";
-          sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
+          rev = "50dc78c7b33959c10d5f6da00c338d4611467c36";
+          sha256 = "1qz3q63g0zh5xhsxcqm37swcdpliii15cqfbbvm0jjyd9kfysblw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe";
@@ -41492,12 +41492,12 @@
     mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "20161211.1946";
+        version = "20161212.1342";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
-          sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
+          rev = "c0cf0fcac1a2bbc9887e15bed00dce10fcb6ecab";
+          sha256 = "1v2dqwbfwf21az6qpqxd5bskspampp3mdhdzy7vsmfd50gq3jb5l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -42315,12 +42315,12 @@
     mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "20160818.1456";
+        version = "20161214.839";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "7a658c112220d759fccb1c16e49f3712d8bb1af7";
-          sha256 = "0gwgq5iq7lazy596hsld0yib88r1wv57wb92rjga79vbmg5pi1nq";
+          rev = "23831bab8290a90e9253b648176d99385a438568";
+          sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -42645,12 +42645,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20161206.1333";
+        version = "20161215.347";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "47afc7419ddd26462ad6e66e122b244c334da0b9";
-          sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577";
+          rev = "241f7a218d7697efe47ac2fc7751717a1c47ef5c";
+          sha256 = "1fgadbbvsh78xq3gg203jc7c93b3ypmxsnncx0kpq3rhd96ym730";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -42958,8 +42958,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "fdfe0d73b72682022c76dd7dfe04b0d63d524779";
-          sha256 = "108cicmggkzrvrjkja1f0n2gnqfnisiq7wsakgscfpxjsmyszhsg";
+          rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e";
+          sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -44323,12 +44323,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20161124.739";
+        version = "20161214.2346";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "c5e15a42f0a95b8c675c739903ee4aa24ad41b8e";
-          sha256 = "1hrh1h1dxwfsylwc03kj6yp5g7a85b53jahkvzyjyzmnnylw3zpw";
+          rev = "cfef6036b69d53a83689694f5f257e5aaaeef265";
+          sha256 = "0bbhvldxid7g4jg6pp9ywcf0xipbf9y2wqbg3pr7g45sbl3i7zz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44621,8 +44621,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "05f907787fdc1903af0366d72cf6c30e9835182d";
-          sha256 = "1mb9kbd1qdqmfljjqgam3ivd5iap315fmw8hihl6afrnw42281rv";
+          rev = "5278bb7c16c227d64551fc6578cb1b1b22f3b036";
+          sha256 = "11f3fk1w40ynjzabs9rmzjzbwlkr91bhc5a0wk6m9pmm9lmshl6b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -44743,12 +44743,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20161210.929";
+        version = "20161212.956";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "403e62a1f434664c9e9477d574f18ced258359fa";
-          sha256 = "0p0xz6vj3qv3wx9bwg6syi6alw223zc0l2h95bgcx2pi40da94w0";
+          rev = "0421f2c8aba7d369135d9e7e0d181d0da8c08d8c";
+          sha256 = "1vk4cz12r0aw1rapf9k2g730ak5q8b5rpylhwsr819ixyr9zpz7a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -44887,11 +44887,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20161117.425";
+        version = "20161215.457";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "71f1228a518f08e94dc1ea4e2147f80d3484c615";
-          sha256 = "0mc0pmykw0a9yz61jsfpj3gk83hv5d8zhjnvwvjgkwm5akaidf8f";
+          rev = "5de84d07526d330a46e50d955bdfeed8f629637d";
+          sha256 = "0zz3xg9v8g9vj4lwdx4phwr54ky49bws2amm1cq7yijwzgj2qbjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47471,8 +47471,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526";
-          sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v";
+          rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
+          sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47491,8 +47491,8 @@
         version = "20161126.239";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526";
-          sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v";
+          rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
+          sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49932,8 +49932,8 @@
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "01cf9c8a90ddb09e8e6e08c1346419989c8a0e52";
-          sha256 = "0jqvhr4infzhcl60q8nagdz4z7rk1c29b0cv5x8bzx8wlnnbwh1b";
+          rev = "9e1ce1dfb5e0958d5fbff62ed09357db14082a38";
+          sha256 = "1nq99i2piyd06yc0vsxkrfxsnj0yza3i9rdglvfaic9vnpf5riz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -50786,12 +50786,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20161119.505";
+        version = "20161214.243";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "2ab3c6b86527811794235309df6055b4a302aa76";
-          sha256 = "11nzz7z9ck8g7xam75ljiw0qhk48zhbxzhfw5jzfz3ql04ws7bml";
+          rev = "28eaf5e56e18be4bab1639ce2c31b64bd2828746";
+          sha256 = "1y4l21f81xc1bz9w0jm7vyab00k402zjlbdgki618sas9bk4rfdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -51206,12 +51206,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20161205.1642";
+        version = "20161213.806";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "f2dc941cef948fd35947c9f0f6fa2e9ad10e174d";
-          sha256 = "11vk2di9r6059ymb1j9qvi3gxcyk4fpl7ni7pap9hyhxf3gayknh";
+          rev = "cca3fe0fdbabb9f8256fef948972e5d5d823dd69";
+          sha256 = "11xdjdlvld9xnvwbaglc57n17v56p8jqd2qb6cqz3i1cvqhpfm8y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -51917,8 +51917,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "94737a1be1a1d68f7e032ceac9cc2ed770f36196";
-          sha256 = "0f87ghm106c1f8jngcjzxg0fmdp087p4dh2yhdhaln7rd8x4zl6y";
+          rev = "89b77b3e3229c3df9c67de17fdef1086422fe6cc";
+          sha256 = "1sbdk6ijak2p1wkm9cbgvvml2hx1kc7ny9p0z9zfw9lz9mrwckdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -52969,12 +52969,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20161122.728";
+        version = "20161215.443";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "ab07ade902e0a432aa8396664bcc2c9ec7829958";
-          sha256 = "08j07j4j9nz95g571y7fvv5943y6fv8zhk5n694j6vavvh5ip4v8";
+          rev = "7717fb86c1959e936f13cf2407f1ffd1c9c18e7f";
+          sha256 = "1ycz38bgdgcb57i4l52lqza3ffy9pva8lxicz6adk8vfx2bl85rc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -53351,8 +53351,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "277a8b65805aceeefc1764947616430994e05bdf";
-          sha256 = "0ykx4wgi58hgndpn5ifrn6kgmm57gx8h7np1b31mml4n7si2bsfi";
+          rev = "83d681ee2caef1feb009656417830f846382d8ba";
+          sha256 = "12a94bxkg18mfv9a4pkqzyjiinm1b9wflbk9ib3ialmdadrmjdda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -53368,12 +53368,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20161204.958";
+        version = "20161212.1626";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "59766a43a2cdf6f44ba9fa038f9997963f191e1c";
-          sha256 = "0aam1vwlidfsqpdnv2s642pzdqngjb4j6lm5ms8fm1q589fc8vys";
+          rev = "30ec730fdf887579df7bed9f43b2fc25be2c9307";
+          sha256 = "1znprm47539g5jbygqr9ln1m7y37vgx46rhax13fm4cxgsm657vc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -54085,8 +54085,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "3a94b38b26b5f4191ffe8c67e1db272a2570489c";
-          sha256 = "001c068s56qr1vkmli0mxc985drb5vwcln7fzs605kjlvfh0mwjr";
+          rev = "ea4273cdff22cb5c0bc5fd8a408cd03b454c43bf";
+          sha256 = "18kb7ia9wm9j3iyfhklvb56x0kw1zawa5q80z3vmmfx381v33wj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -54438,12 +54438,12 @@
     quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }:
     melpaBuild {
         pname = "quelpa-use-package";
-        version = "20150805.328";
+        version = "20161212.1038";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa-use-package";
-          rev = "d18b55508ceaeb894f5db3d775f5c1b27e4be81b";
-          sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
+          rev = "f276555d6bead02a0d869149f03a545d4d4265ad";
+          sha256 = "0cmpfjkwx5mpiyssyglfnrfkfg7c4qr01b598z50vc1lyg6198i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package";
@@ -55597,8 +55597,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "8cf6e816720cd7a8fe147a6f412d0300be015a76";
-          sha256 = "1ic32q9dcrfpn8zb5bmf21iklhrr3va54kmdpy3iyyvkxs8ipcyb";
+          rev = "1a1df16146118d3e4cdfa1730eb7616550b2c4a4";
+          sha256 = "1qvbi0iwbvkyc1wq5kv5jh1lkvmmq56bh53ww921z3fhsvrgkqmj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -56821,12 +56821,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20161126.1011";
+        version = "20161214.1014";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "9063198b8c19995b3d1fce8c441e1244ada0b987";
-          sha256 = "03b8ajpx7vjkyn6amgrfx90v4pp3020fhq6qvb4h6s3hqsmgfzmz";
+          rev = "66e1d804e53ccbc5bcdcd9d67c77566a08de4b4f";
+          sha256 = "1761658vaav6x6b7j2izbprjm3rs3b8jvqkanwjcmhhhfp4ymwxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -56887,7 +56887,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57064";
+          rev = "57085";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -56967,7 +56967,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57064";
+          rev = "57085";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58902,8 +58902,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "shift-number.el";
-          rev = "e59840cb7fb142b21e8b1e30b95dc3b4688dca65";
-          sha256 = "0dlwcifw5mlski0mbvqqgmpb0jgf5i67x04s8yab1sq9rr07is57";
+          rev = "4ea4c2a2ece26e208980e6d2f0939271bca751aa";
+          sha256 = "1fqrsr4j2axmxnvznz9zyy8giywnia23i6a8xi1f8lx924xg3cr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
@@ -58944,8 +58944,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903";
-          sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp";
+          rev = "39b1070cf52b3f134f386b40cc7dfc2d0d30d5b8";
+          sha256 = "067s1zwgr5kzxshcnyh96y8jz2j93bqp2fr0a5460fi27pnhyyl0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -59144,12 +59144,12 @@
     sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sicp";
-        version = "20151130.757";
+        version = "20161215.428";
         src = fetchFromGitHub {
           owner = "webframp";
           repo = "sicp-info";
-          rev = "7d060136bf4582fa74e4aa7cb924d856eea270f4";
-          sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
+          rev = "c1a6af5719fc8872d40bcf8b41e02745eefd9808";
+          sha256 = "0vq8mkdh7bk5vbf74dln86a3dmlba2iiaxiim8n553qnpm4ln0ay";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
@@ -60521,22 +60521,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smeargle";
-        version = "20151013.2242";
+        version = "20161212.1558";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-smeargle";
-          rev = "67466d5214a681430db8cb59a2a1bca771ff0024";
-          sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
+          rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
+          sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/smeargle";
           license = lib.licenses.free;
@@ -61723,12 +61723,12 @@
     spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }:
     melpaBuild {
         pname = "spu";
-        version = "20160515.157";
+        version = "20161213.1924";
         src = fetchFromGitHub {
           owner = "mola-T";
           repo = "SPU";
-          rev = "a7dadda5566f5f8d785e8f9540cfcbbfb58eb47d";
-          sha256 = "0ng8q1k5kwqk01h4yzqnqgv2q7hb6qvh7rdhlvncwdh68y6bdgbl";
+          rev = "41eec86b595816e3852e8ad1a8e07e51a27fd065";
+          sha256 = "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2ef1e83c924d5411b47a931432f129db95ff2c/recipes/spu";
@@ -62363,12 +62363,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "20161211.649";
+        version = "20161213.1737";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "0a26739a513f16bc368e0cf86ed7f4352b493fe8";
-          sha256 = "12wg1zlw1l850csxi74aqycnsjxzniigd2a8gm6dy5bi2dwb7kjs";
+          rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
+          sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -62610,12 +62610,12 @@
     sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sublimity";
-        version = "20160822.1856";
+        version = "20161214.2032";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "sublimity";
-          rev = "f692af1ba045146f568ee36009a78b79e9cfe21f";
-          sha256 = "035cb27a5i5ixlrqbh4a0srw3z9k054z32dzls851775rz91dks5";
+          rev = "02a477004b8807984b5f752fa225f1e7bb6f90ab";
+          sha256 = "1dc3kkq931nwa7p26dgrdgqhi110h6ilmch00300gh0m0wx9031d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
@@ -63126,12 +63126,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20161208.857";
+        version = "20161213.719";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991";
-          sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2";
+          rev = "2bc1d7bd8d0f12d5b6b821a0ffa698e6564d865a";
+          sha256 = "0z5hdhb6bgqk2qax59xin8vig2kksmrxf6vyk412kbpa17sm71zm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63435,6 +63435,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syntactic-close";
+        version = "20161213.735";
+        src = fetchFromGitHub {
+          owner = "emacs-berlin";
+          repo = "syntactic-close";
+          rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000";
+          sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
+          sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f";
+          name = "syntactic-close";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/syntactic-close";
+          license = lib.licenses.free;
+        };
+      }) {};
     syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntactic-sugar";
@@ -63835,12 +63856,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20160915.2124";
+        version = "20161213.739";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "85ee42a8e19b913865387d6662d41177fb0803ce";
-          sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq";
+          rev = "2e66c3045e46621d4e01959628c398283b423c72";
+          sha256 = "0abs0h9xhjv1bnpdv4r3ki4cgwak56v92c8lzcj879rqwskpvssy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64280,8 +64301,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95";
-          sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246";
+          rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
+          sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -64301,8 +64322,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95";
-          sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246";
+          rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
+          sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -64752,8 +64773,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "60611917cf309d2a25b9cd8f8b5631784b07323d";
-          sha256 = "11y20g86s2n0lhkjw38lvv4kki2kq6ywgy4qm3na9m2sbw2p6khw";
+          rev = "0d9b713b173f35ce02552b2f4372899440a99b25";
+          sha256 = "0rld7j1j5i3f5y9yarg9liabmf597c8yz9bw3jax0azfi5ls6lvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65016,12 +65037,12 @@
     tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tiny-menu";
-        version = "20160606.1711";
+        version = "20161213.435";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "tiny-menu.el";
-          rev = "9820cff69d3b605813f609a0db8e6c860bfb9c72";
-          sha256 = "1l3cz16lnq5rw57m4j0x29j6nkrcxnz2ppar5xnpwlcaf600wqki";
+          rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254";
+          sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu";
@@ -68144,12 +68165,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20161209.1521";
+        version = "20161212.1531";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "5e7e812e0ef025b72dfb9adbcb751695e777873e";
-          sha256 = "0c9x0w7hc3h1x1p0m3vzb3gq16vdlsswc3qxxslfxmnykzbqc4hv";
+          rev = "dda6c57fa58ef19cfd1be199a791a3e35096b5cf";
+          sha256 = "0cdplbyglzfd62j12dmjsxywsx5w22v6x05rvqrvjljm2n9jpz95";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -69790,12 +69811,12 @@
     x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x86-lookup";
-        version = "20161030.1736";
+        version = "20161215.448";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "x86-lookup";
-          rev = "208810ea93214491e6e2329cdbf81de85437939a";
-          sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
+          rev = "544a1ad4e8551c60e58e6c431470b6ef4ce7c5cb";
+          sha256 = "1w2fhi5x0amjyzzdndp9lvm6i279pcjjs6zfhssly2lbxw4dpaky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
@@ -70588,12 +70609,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "20161212.213";
+        version = "20161213.1247";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "f37745cda52d161761fcfe2fed792faa909b6fce";
-          sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50";
+          rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
+          sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -70794,11 +70815,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20161008.2359";
+        version = "20161214.2131";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "564510b9caca";
-          sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347";
+          rev = "5428250c886a";
+          sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -71033,12 +71054,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20161208.2137";
+        version = "20161213.324";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "eb0bafac9d3208daba5a3f744514a463ffd0e131";
-          sha256 = "1h4y7lxdcss3c219lr6wd30af32n850w77q6xlys8qrb9l71f1vk";
+          rev = "f63e357ee845d95a26f48b1001c9168a0e3fefa1";
+          sha256 = "1jhl9bi9qvkrdfvnrcfjims2gf11jlhp0pnxb3l9xxn2ys344lj8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -71095,12 +71116,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20161209.632";
+        version = "20161212.1151";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "af231794425255d436690c9c31bceb2052251210";
-          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
+          rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678";
+          sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From 01d5fda8c1128e84339e380050fedae19c171b18 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 15 Dec 2016 17:54:40 -0500
Subject: [PATCH 241/295] melpa-stable-packages: 2016-12-15

Removals:
 - dummy-h-mode: github account no longer exists
 - judge-indent: github account no longer exists
---
 .../emacs-modes/melpa-stable-generated.nix    | 180 +++++++++++-------
 1 file changed, 111 insertions(+), 69 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 2d33ce39736..6d3ec36277c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2809,12 +2809,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "1.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "c08d91b2d314b52c9ca5c2d5be7a7b2367b68162";
-          sha256 = "104q089cyy0m0hkdnvblss884npc4bv5xf03qr35x3s3573lxh4a";
+          rev = "70ea295ec04cb34e383dc7d62927452410876999";
+          sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -3933,12 +3933,12 @@
     clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clues-theme";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "jasonm23";
           repo = "emacs-clues-theme";
-          rev = "16c05f6dbe7125358f8456110f237d68263e987a";
-          sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c";
+          rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
+          sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
@@ -5698,6 +5698,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "debpaste";
+        version = "0.1.5";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "debpaste.el";
+          rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
+          sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste";
+          sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
+          name = "debpaste";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "https://melpa.org/#/debpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
     decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decide";
@@ -6774,35 +6795,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "dummy-h-mode";
-        version = "1.0.1";
-        src = fetchFromGitHub {
-          owner = "yascentur";
-          repo = "dummy-h-mode-el";
-          rev = "27ad0991abb53e65d0402ef6c378075e4be0ed2d";
-          sha256 = "033yqc19xxirbva65lz8hnwxj7pn7fx7dlnf70kq71iqclqa4v25";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode";
-          sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
-          name = "dummy-h-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/dummy-h-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
         version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "befb5c650dfd";
-          sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2";
+          rev = "20a2166c8210";
+          sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -8874,12 +8874,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.1.6";
+        version = "19.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "2b41d8f318b7e5ec139d42fd2f01a132699be839";
-          sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y";
+          rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f";
+          sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10955,6 +10955,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-objc-clang";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "GyazSquare";
+          repo = "flycheck-objc-clang";
+          rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
+          sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
+          sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
+          name = "flycheck-objc-clang";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-objc-clang";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
     melpaBuild {
         pname = "flycheck-ocaml";
@@ -11102,6 +11123,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-swift3";
+        version = "1.0.5";
+        src = fetchFromGitHub {
+          owner = "GyazSquare";
+          repo = "flycheck-swift3";
+          rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
+          sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
+          sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
+          name = "flycheck-swift3";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-swift3";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-tip";
@@ -18064,27 +18106,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "judge-indent";
-        version = "1.1.2";
-        src = fetchFromGitHub {
-          owner = "yascentur";
-          repo = "judge-indent-el";
-          rev = "4cf8c8d3375f4d655b909a415cc4fa8d235a657a";
-          sha256 = "11wybxrl2lny6vbf7qrxyf9wxw88ppvbrlfcd65paalrna2hn46h";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent";
-          sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
-          name = "judge-indent";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/judge-indent";
-          license = lib.licenses.free;
-        };
-      }) {};
     jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
     melpaBuild {
         pname = "jump";
@@ -19376,12 +19397,12 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "9a2f069e9b3dfff8e9a5fe3cbd4bc8abe1dc86a0";
-          sha256 = "1dzrj4xyrr5d9kisq8khzr2yvrhwff0l676g237sc3v4hg3ch8sr";
+          rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
+          sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
@@ -20726,12 +20747,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "3.2.0";
+        version = "3.2.1";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "47afc7419ddd26462ad6e66e122b244c334da0b9";
-          sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577";
+          rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3";
+          sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -28589,22 +28610,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smeargle";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-smeargle";
-          rev = "fe0494bb859ea51800d6e7ae7d9eda2fe98e0097";
-          sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
+          rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
+          sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/smeargle";
           license = lib.licenses.free;
@@ -29322,6 +29343,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "string-inflection";
+        version = "1.0.4";
+        src = fetchFromGitHub {
+          owner = "akicho8";
+          repo = "string-inflection";
+          rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
+          sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
+          sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
+          name = "string-inflection";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/string-inflection";
+          license = lib.licenses.free;
+        };
+      }) {};
     string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
     melpaBuild {
         pname = "string-utils";
@@ -32876,12 +32918,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "0.9.1";
+        version = "0.9.3";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "f37745cda52d161761fcfe2fed792faa909b6fce";
-          sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50";
+          rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
+          sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -32962,8 +33004,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "564510b9caca";
-          sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347";
+          rev = "5428250c886a";
+          sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";

From 8cd481b5fd687fee21ec8f19375399d12c3da969 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 15 Dec 2016 17:48:14 -0500
Subject: [PATCH 242/295] org-packages: 2016-12-15

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 0b2ec7c2fd8..438abd8afed 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 = "20161118";
+        version = "20161214";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20161118.tar";
-          sha256 = "1lk2j93zcaamj2m2720nxsza7j35054kg72w35w9z1bbiqmv2haj";
+          url = "http://orgmode.org/elpa/org-20161214.tar";
+          sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20161118";
+        version = "20161214";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20161118.tar";
-          sha256 = "1la8qw18akqc4p7p0qi675xm3r149vwazzjc2gkik97p12ip83z7";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar";
+          sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c";
         };
         packageRequires = [];
         meta = {

From 2bcdc8c913a685fb39d7ef2c55af1072e1165575 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 16 Dec 2016 00:31:06 +0100
Subject: [PATCH 243/295] pythonPackages.virtualenvwrapper: Fix post install
 (closes #21168)

---
 pkgs/top-level/python-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8b4b5d9b53..6401f931fd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26105,11 +26105,12 @@ in {
         local wrapped="$out/bin/.$file-wrapped"
         mv "$wrapper" "$wrapped"
 
-        cat > "$wrapper" <<- EOF
-        export PATH="$PATH:\$PATH"
-        export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)"
-        source "$wrapped"
-        EOF
+        # WARNING: Don't indent the lines below because that would break EOF
+        cat > "$wrapper" << EOF
+export PATH="$PATH:\$PATH"
+export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)"
+source "$wrapped"
+EOF
 
         chmod -x "$wrapped"
         chmod +x "$wrapper"

From e0e1bdc25c46abdeec359560b8ec1f7b10521cf3 Mon Sep 17 00:00:00 2001
From: Tom Saeger <tom.saeger@gmail.com>
Date: Thu, 15 Dec 2016 17:41:22 -0600
Subject: [PATCH 244/295] Fixup description of ripgrep.

---
 pkgs/tools/text/ripgrep/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 3c2ef2e9533..bcf9312e951 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -16,7 +16,7 @@ buildRustPackage rec {
   depsSha256 = "10f7pkgaxwizl7kzhkry7wx1rgm9wsybwkk92myc29s7sqir2mx4";
 
   meta = with stdenv.lib; {
-    description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep";
+    description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = https://github.com/BurntSushi/ripgrep;
     license = with licenses; [ unlicense ];
     maintainers = [ maintainers.tailhook ];

From 1b6e2b9a191fb28ffbb4f99f2aa92ceb109b05f8 Mon Sep 17 00:00:00 2001
From: Paul Liu <ninegua@gmail.com>
Date: Fri, 16 Dec 2016 01:30:50 -0800
Subject: [PATCH 245/295] Fix netpbm installation for OS X (#21194)

* Update meta.platform to linux ++ darwin for netpbm
---
 pkgs/tools/graphics/netpbm/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 3c724ccc2b8..d0381e91251 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     substituteInPlace "config.mk" \
         --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
         --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include"
+   '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
+    echo "NETPBMLIBTYPE = dylib" >> config.mk
+    echo "NETPBMLIBSUFFIX = dylib" >> config.mk
   '';
 
   preBuild = ''
@@ -56,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = http://netpbm.sourceforge.net/;
     description = "Toolkit for manipulation of graphic images";
     license = "GPL,free";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From f3108c5bd2d2a3059d5c5deb6eb0d8dfeb5b96fa Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Fri, 16 Dec 2016 11:22:06 +0100
Subject: [PATCH 246/295] pythonPackages.natbib: fix for Python 3.5 (#21114)

pathlib is part of the standard library starting in version 3.5.
---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6401f931fd7..a0025936647 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8254,8 +8254,9 @@ in {
         pytestflakes
         pytestpep8
         mock
-        pathlib
-      ];
+      ]
+      # pathlib was made part of standard library in 3.5:
+      ++ (optionals (pythonOlder "3.4") [ pathlib ]);
 
     meta = {
       description = "Natural sorting for python";

From be24f1d364cf678150b03c90bca58147d15d6311 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 16 Dec 2016 04:32:28 -0600
Subject: [PATCH 247/295] musl: 1.1.11 -> 1.1.15, add security patch. (#21023)

---
 pkgs/os-specific/linux/musl/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index ae0c7703de6..dd12a18dc82 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.11";
+  version = "1.1.15";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv";
+    sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p";
   };
 
   enableParallelBuilding = true;
@@ -22,6 +22,15 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--enable-static"
+    "--disable-gcc-wrapper"
+  ];
+
+  patches = [
+    # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1
+    (fetchpatch {
+      url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7";
+      sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v";
+    })
   ];
 
   dontDisableStatic = true;

From dec91d3b191d42a83887629b541c3a6d874ca7d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Fri, 16 Dec 2016 11:36:05 +0100
Subject: [PATCH 248/295] gem-config: add postgresql buildInput for sequel_pg
 (#20981)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 26925de8db4..b889ae60d63 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -164,6 +164,10 @@ in
       '';
     } else {};
 
+  sequel_pg = attrs: {
+    buildInputs = [ postgresql ];
+  };
+
   snappy = attrs: {
     buildInputs = [ args.snappy ];
   };

From 8b9ced01812056887a8ea0af9d6d44752b910ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 16 Dec 2016 12:01:00 +0100
Subject: [PATCH 249/295] rocksdb: build also static lib for rocksdb-haskell

---
 pkgs/development/libraries/rocksdb/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 1511f12e88b..a8f8ab31d1c 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -37,10 +37,12 @@ stdenv.mkDerivation rec {
 
   buildFlags = [
     "shared_lib"
+    "static_lib"
   ];
 
   installFlags = [
     "install-shared"
+    "install-static"
     "INSTALL_PATH=\${out}"
   ];
 

From a4586f87dcee247bd7ede15b2114782cefd8f2dd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 14 Dec 2016 22:09:35 +0100
Subject: [PATCH 250/295] wireguard: 20161129 -> 20161209

---
 pkgs/os-specific/linux/wireguard/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 2e2bb82d133..e1b17f8f9fc 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -4,13 +4,13 @@
 assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
 
 let
-  name = "wireguard-experimental-${version}";
+  name = "wireguard-${version}";
 
-  version = "0.0.20161129";
+  version = "0.0.20161209";
 
   src = fetchurl {
-    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz";
-    sha256 = "1dyik704aixq38n71alpr4r8dxh7ipy7mgwbbccipsdadbjy7p3v";
+    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+    sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya";
   };
 
   meta = with stdenv.lib; {

From 3fc60ec351d660caa43c456b84ef41ce0156d1c9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 6 Dec 2016 21:53:10 +0100
Subject: [PATCH 251/295] remove mutt-kz: deprecated in favor of neomutt

Removed reference in all-packages.nix. Fixes #20952.
---
 .../mailreaders/mutt-kz/default.nix           | 64 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/mutt-kz/default.nix

diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
deleted file mode 100644
index 5cd0ef9f7a4..00000000000
--- a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch
-, sslSupport ? true
-, imapSupport ? true
-, headerCache ? true
-, saslSupport ? true
-, gpgmeSupport ? true
-, gdbm ? null
-, openssl ? null
-, cyrus_sasl ? null
-, gpgme ? null
-}:
-
-assert headerCache -> gdbm != null;
-assert sslSupport -> openssl != null;
-assert saslSupport -> cyrus_sasl != null;
-assert gpgmeSupport -> gpgme != null;
-
-let
-  version = "1.5.23.1";
-in
-stdenv.mkDerivation rec {
-  name = "mutt-kz-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
-    sha256 = "01k4hrf8x2100pcqnrm61mm1x0pqi2kr3rx22k5hwvbs1wh8zyhz";
-  };
-
-  buildInputs = with stdenv.lib;
-    [ ncurses which perl autoreconfHook autoconf automake notmuch]
-    ++ optional headerCache gdbm
-    ++ optional sslSupport openssl
-    ++ optional saslSupport cyrus_sasl
-    ++ optional gpgmeSupport gpgme;
-
-configureFlags = [
-    "--with-mailpath=" "--enable-smtp"
-
-    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
-    "--enable-debug"
-
-    "--enable-pop" "--enable-imap"
-
-    "--enable-notmuch"
-
-    # The next allows building mutt without having anything setgid
-    # set by the installer, and removing the need for the group 'mail'
-    # I set the value 'mailbox' because it is a default in the configure script
-    "--with-homespool=mailbox"
-    (if headerCache then "--enable-hcache" else "--disable-hcache")
-    (if sslSupport then "--with-ssl" else "--without-ssl")
-    (if imapSupport then "--enable-imap" else "--disable-imap")
-    (if saslSupport then "--with-sasl" else "--without-sasl")
-    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
-  ];
-
-  meta = with stdenv.lib; {
-    description = "A small but very powerful text-based mail client, forked to support notmuch";
-    homepage = https://github.com/karelzak/mutt-kz/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ magnetophon ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9aa7940aaf..d33d9b74424 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14025,8 +14025,6 @@ in
     withSidebar = true;
   };
 
-  mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { };
-
   neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
 
   notion = callPackage ../applications/window-managers/notion { };

From 52c34f626ca54b8d664dbba925bd5cfc959f9dc7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 16 Dec 2016 12:19:59 +0100
Subject: [PATCH 252/295] liquibase: improve external jar integration (#20818)

This replaces the upstream wrapper script with one tailored for nixpkgs.
We gain the ability to selectively enable/disable jdbc backends.
---
 .../tools/database/liquibase/default.nix      | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 5305297a27a..b49719ae0b9 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact
+, mysqlSupport ? true, mysql_jdbc ? null }:
+
+assert mysqlSupport -> mysql_jdbc != null;
+
+with stdenv.lib;
+let
+  extraJars = optional mysqlSupport mysql_jdbc;
+
+in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -16,18 +25,38 @@ stdenv.mkDerivation rec {
     tar xfz ${src}
   '';
 
-  installPhase = ''
-    mkdir -p $out/{bin,lib,sdk}
-    mv ./* $out/
-    wrapProgram $out/liquibase --prefix PATH ":" ${jre}/bin --set LIQUIBASE_HOME $out;
-    ln -s $out/liquibase $out/bin/liquibase
+  installPhase =
+    let addJars = dir: ''
+      for jar in ${dir}/*.jar; do
+        CP="\$CP":"\$jar"
+      done
+    '';
+    in ''
+      mkdir -p $out/{bin,lib,sdk}
+      mv ./* $out/
+
+      # we provide our own script
+      rm $out/liquibase
+
+      # there’s a lot of escaping, but I’m not sure how to improve that
+      cat > $out/bin/liquibase <<EOF
+      #!/usr/bin/env bash
+      # taken from the executable script in the source
+      CP="$out/liquibase.jar"
+      ${addJars "$out/lib"}
+      ${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
+
+      ${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
+        liquibase.integration.commandline.Main \''${1+"\$@"}
+      EOF
+      chmod +x $out/bin/liquibase
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Version Control for your database";
     homepage = "http://www.liquibase.org/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ nequissimus ];
+    maintainers = with maintainers; [ nequissimus profpatsch ];
     platforms = with platforms; unix;
   };
 }

From f0e77cd07da7aba1392d1f681648734c07588311 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 16 Dec 2016 12:40:41 +0100
Subject: [PATCH 253/295] grsecurity: 4.8.14-201612110933 ->
 4.8.15-201612151923

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 pkgs/top-level/all-packages.nix                    | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b6121fbd1b4..7a6ce4533e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.14";
+  version = "4.8.15";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1";
+    sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5562608effa..74cf8d156af 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.8.14";
-      grrev  = "201612110933";
-      sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym";
+    { kver   = "4.8.15";
+      grrev  = "201612151923";
+      sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d33d9b74424..af9dfa610f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11252,7 +11252,6 @@ in
     inherit (lib) overrideDerivation;
     kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {
       kernelPatches = with self.kernelPatches; [
-        kernelPatches.multithreaded_rsapubkey
         bridge_stp_helper
         modinst_arg_list_too_long
       ] ++ lib.optionals ((platform.kernelArch or null) == "mips")

From 38ea64e86793342b1384a71ae07f0088d9cd891f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 16 Dec 2016 12:42:54 +0100
Subject: [PATCH 254/295] qemu_test: Make chown() calls to the store a no-op

The "misc" NixOS test is using Nix to query the store and it tries to
change the ownership of it while doing so.

This fails if Nix is not in a seccomp-sandboxed userid namespace, so
let's make chown() a no-op when applied to store paths.

Fixes the misc test (and possibly future tests) on older Nix versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../qemu/force-uid0-on-9p.patch               | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
index 90269961fdf..9578d595129 100644
--- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -1,8 +1,32 @@
 diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index 845675e..43fa036 100644
+index 3f271fc..dc273f4 100644
 --- a/hw/9pfs/9p-local.c
 +++ b/hw/9pfs/9p-local.c
-@@ -128,6 +128,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
+@@ -45,6 +45,23 @@
+ 
+ #define VIRTFS_META_DIR ".virtfs_metadata"
+ 
++static int is_in_store_path(const char *path)
++{
++    static char *store_path = NULL;
++    int store_path_len = -1;
++
++    if (store_path_len == -1) {
++        if ((store_path = getenv("NIX_STORE")) != NULL)
++            store_path_len = strlen(store_path);
++        else
++            store_path_len = 0;
++    }
++
++    if (store_path_len > 0)
++        return strncmp(path, store_path, strlen(store_path)) == 0;
++    return 0;
++}
++
+ static char *local_mapped_attr_path(FsContext *ctx, const char *path)
+ {
+     int dirlen;
+@@ -128,6 +145,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
      if (err) {
          goto err_out;
      }
@@ -11,24 +35,19 @@ index 845675e..43fa036 100644
      if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
          /* Actual credentials are part of extended attrs */
          uid_t tmp_uid;
-@@ -462,6 +464,16 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
+@@ -462,6 +481,11 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
      return ret;
  }
  
-+static int maybe_chmod(const char *path, mode_t mode)
++static inline int maybe_chmod(const char *path, mode_t mode)
 +{
-+    static char *store_path = NULL;
-+    if (store_path == NULL)
-+        store_path = getenv("NIX_STORE");
-+    if (strncmp(path, store_path, strlen(store_path)) != 0)
-+        return chmod(path, mode);
-+    return 0;
++    return is_in_store_path(path) ? 0 : chmod(path, mode);
 +}
 +
  static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
  {
      char *buffer;
-@@ -477,7 +489,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+@@ -477,7 +501,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
      } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
                 (fs_ctx->export_flags & V9FS_SM_NONE)) {
          buffer = rpath(fs_ctx, path);
@@ -37,7 +56,7 @@ index 845675e..43fa036 100644
          g_free(buffer);
      }
      return ret;
-@@ -621,6 +633,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
+@@ -621,6 +645,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
      if (err) {
          return err;
      }
@@ -46,3 +65,13 @@ index 845675e..43fa036 100644
      if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
          /* Actual credentials are part of extended attrs */
          uid_t tmp_uid;
+@@ -916,7 +942,8 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+         (fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
+         (fs_ctx->export_flags & V9FS_SM_NONE)) {
+         buffer = rpath(fs_ctx, path);
+-        ret = lchown(buffer, credp->fc_uid, credp->fc_gid);
++        ret = is_in_store_path(buffer)
++            ? 0 : lchown(buffer, credp->fc_uid, credp->fc_gid);
+         g_free(buffer);
+     } else if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
+         buffer = rpath(fs_ctx, path);

From cb9ff3f7f927db88b51c78995cff302e7b01f3ce Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Dec 2016 08:16:22 -0500
Subject: [PATCH 255/295] linux: 4.4.38 -> 4.4.39

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index baf011a1b8e..6eb6e4663e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.38";
+  version = "4.4.39";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19hn51cpyvq3igilm0xw4ivbmdah5ryah6rpkwgqly351djrxvbp";
+    sha256 = "188ij72z05sbzrn438r9awpf2pvpv8p2iykfcxs2kxibn23c2jw6";
   };
 
   kernelPatches = args.kernelPatches;

From 0e8e4a08f35187285105a4a586fe2eec727a552a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Dec 2016 08:16:45 -0500
Subject: [PATCH 256/295] linux: 4.8.14 -> 4.8.15

---
 pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index b6121fbd1b4..7a6ce4533e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.14";
+  version = "4.8.15";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1";
+    sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af9dfa610f3..81af1cc2915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11028,7 +11028,6 @@ in
   linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
-        kernelPatches.multithreaded_rsapubkey
         # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
         # when adding a new linux version
         # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking

From a5a98290b75ce692fd6bbd5d6ba95702d141832c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Dec 2016 08:57:08 -0500
Subject: [PATCH 257/295] docker: 1.12.3 -> 1.12.5

---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 921558a2d12..088dddb3de7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.12.3";
+  version = "1.12.5";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0jifd35h22lgh36w1j2k97pgndjh5sppr3cwndlv0saf9618wx5k";
+    sha256 = "1hnxmh2j1vm8714f7jwjrslkqkd1ry25g5wq76aqlpsz5fh2kqb0";
   };
 
   buildInputs = [

From 664cc49b1929b5f71816663744ee39662a68f92f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <namiantov@rsx.finance>
Date: Fri, 16 Dec 2016 17:26:21 +0300
Subject: [PATCH 258/295] gbenchmark: init at 1.1.0

---
 .../libraries/gbenchmark/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/gbenchmark/default.nix

diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
new file mode 100644
index 00000000000..8f532ae8e0b
--- /dev/null
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, callPackage, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "gbenchmark-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "benchmark";
+    rev = "v${version}";
+    sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5";
+  };
+
+  buildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A microbenchmark support library";
+    homepage = "https://github.com/google/benchmark";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81af1cc2915..6e782cd3cdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2043,6 +2043,7 @@ in
 
   gtest = callPackage ../development/libraries/gtest {};
   gmock = callPackage ../development/libraries/gmock {};
+  gbenchmark = callPackage ../development/libraries/gbenchmark {};
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
 

From 3d1206dfcc4a5a8927e7bfd83039c4a725abd120 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Dec 2016 15:50:06 +0100
Subject: [PATCH 259/295] ragel: add stable version, default to stable

---
 .../tools/parsing/ragel/default.nix           | 64 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  7 +-
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index e54d4c540fe..05546da67f0 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,30 +1,46 @@
-{stdenv, fetchurl, transfig, tex , ghostscript, colm,  build-manual ? false
+{ stdenv, fetchurl, transfig, tex, ghostscript, colm
+, build-manual ? false
 }:
 
-stdenv.mkDerivation rec {
-  name = "ragel-${version}";
-  version = "7.0.0.9";
+let
+  generic = { version, sha256 }:
+    stdenv.mkDerivation rec {
+      name = "ragel-${version}";
 
-  src = fetchurl {
-    url = "http://www.colm.net/files/ragel/${name}.tar.gz";
+      src = fetchurl {
+        url = "http://www.colm.net/files/ragel/${name}.tar.gz";
+        inherit sha256;
+      };
+
+      buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
+
+      preConfigure = stdenv.lib.optional build-manual ''
+        sed -i "s/build_manual=no/build_manual=yes/g" DIST
+      '';
+
+      configureFlags = [ "--with-colm=${colm}" ];
+
+      doCheck = true;
+
+      meta = with stdenv.lib; {
+        homepage = http://www.complang.org/ragel;
+        description = "State machine compiler";
+        license = licenses.gpl2;
+        platforms = platforms.unix;
+        maintainers = with maintainers; [ pSub ];
+      };
+    };
+
+in
+
+{
+  ragelStable = generic {
+    version = "6.9";
+    sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
+  };
+
+  ragelDev = generic {
+    version = "7.0.0.9";
     sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
   };
-
-  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
-   
-  preConfigure = stdenv.lib.optional build-manual ''
-    sed -i "s/build_manual=no/build_manual=yes/g" DIST
-  '';
-
-  configureFlags = [ "--with-colm=${colm}" ];
-
-  doCheck = true;
-  
-  meta = with stdenv.lib; {
-    homepage = http://www.complang.org/ragel;
-    description = "State machine compiler";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ pSub ];
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e782cd3cdd..6d1dbc3c607 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6438,10 +6438,11 @@ in
     luaBindings = config.radare.luaBindings or false;
   };
 
+  ragel = ragelStable;
 
-  ragel = callPackage ../development/tools/parsing/ragel {
-    tex = texlive.combined.scheme-small;
-  };
+  inherit (callPackages ../development/tools/parsing/ragel {
+      tex = texlive.combined.scheme-small;
+    }) ragelStable ragelDev;
 
   hammer = callPackage ../development/tools/parsing/hammer { };
 

From 60d29f526d2b18f415803c69f7a8619048cfebb7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Dec 2016 15:51:31 +0100
Subject: [PATCH 260/295] rmilter: 1.8.5 -> 1.10.0

---
 pkgs/servers/mail/rmilter/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 5c41f84c683..e0e5fd45b7f 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim,
- libmemcached }:
+{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre
+, libmilter, opendkim, libmemcached, glib }:
 
 let patchedLibmilter = stdenv.lib.overrideDerivation  libmilter (_ : {
     patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
@@ -8,17 +8,17 @@ in
 
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
-  version = "1.8.5";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rmilter";
     rev = version;
-    sha256 = "1bfql9v243iw3v87kjgwcx4xxw7g5nv1rsi9gk8p7xg5mzrhi3bn";
+    sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh";
   };
 
-  nativeBuildInputs = [ bison cmake flex ];
-  buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim];
+  nativeBuildInputs = [ bison cmake flex pkgconfig ];
+  buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rmilter";

From f97bfcec9991d45a95398c29c038b416f54da9f2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Dec 2016 15:51:59 +0100
Subject: [PATCH 261/295] rspamd: 1.2.7 -> 1.4.1

---
 pkgs/servers/mail/rspamd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index c978c9566a3..692227b5094 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, perl
-, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
+, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel }:
 
 let libmagic = file;  # libmagic provided by file package ATM
 in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.2.7";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "0wr9lndg5fpsrjknm828zj0zy7zvdqrak9bdr6pga3bnq6xabbik";
+    sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite];
+  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel ];
 
   postPatch = ''
     substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local"

From 1946e872c04079f25e30ed9b3fa9e09f9f9e661c Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Fri, 16 Dec 2016 14:21:07 +0200
Subject: [PATCH 262/295] flow: 0.36.0 -> 0.37.1

---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 1b59285674c..d6164ef2e4e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.36.0";
+  version = "0.37.1";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1371dcn2dy13pm8mb43p61xb2qlyylkiq1hwr0x42lhv1gwdlcnw";
+    sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy";
   };
 
   installPhase = ''

From e5cefadef7995b3eafacaf6f1f9099da0f7ccf79 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Fri, 16 Dec 2016 12:58:40 -0400
Subject: [PATCH 263/295] fix indentation in several nixos option descriptions

---
 nixos/modules/config/gnu.nix                  | 10 ++++-----
 nixos/modules/config/i18n.nix                 |  2 +-
 nixos/modules/programs/mosh.nix               | 16 +++++++-------
 .../modules/services/networking/wireguard.nix | 21 ++++++++++++-------
 .../generations-dir/generations-dir.nix       |  4 ++--
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index f8c35b440d1..ef48ccb7b4f 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -7,11 +7,11 @@ with lib;
     gnu = mkOption {
       type = types.bool;
       default = false;
-      description =
-        '' When enabled, GNU software is chosen by default whenever a there is
-           a choice between GNU and non-GNU software (e.g., GNU lsh
-           vs. OpenSSH).
-        '';
+      description = ''
+        When enabled, GNU software is chosen by default whenever a there is
+        a choice between GNU and non-GNU software (e.g., GNU lsh
+        vs. OpenSSH).
+      '';
     };
   };
 
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index d7fd38ebed9..799f0793c74 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -46,7 +46,7 @@ in
         default = with pkgs.kbdKeymaps; [ dvp neo ];
         defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
         description = ''
-	  List of additional packages that provide console fonts, keymaps and
+          List of additional packages that provide console fonts, keymaps and
           other resources.
         '';
       };
diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
index b478f8e180f..1c29eddf01d 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -9,14 +9,14 @@ let
 in
 {
   options.programs.mosh = {
-      enable = mkOption {
-	description = ''
-	  Whether to enable mosh. Note, this will open ports in your firewall!
-	'';
-        default = false;
-	example = true;
-	type = lib.types.bool;
-      };
+    enable = mkOption {
+      description = ''
+        Whether to enable mosh. Note, this will open ports in your firewall!
+      '';
+      default = false;
+      example = true;
+      type = lib.types.bool;
+    };
   };
 
   config = mkIf cfg.enable {
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 52dd5502147..368d89e2e32 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -31,18 +31,22 @@ let
         default = null;
         example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
         type = with types; nullOr str;
-        description = ''base64 preshared key generated by wg genpsk. Optional,
-        and may be omitted. This option adds an additional layer of
-        symmetric-key cryptography to be mixed into the already existing
-        public-key  cryptography, for post-quantum resistance.'';
+        description = ''
+          base64 preshared key generated by wg genpsk. Optional,
+          and may be omitted. This option adds an additional layer of
+          symmetric-key cryptography to be mixed into the already existing
+          public-key  cryptography, for post-quantum resistance.
+        '';
       };
 
       listenPort = mkOption {
         default = null;
         type = with types; nullOr int;
         example = 51820;
-        description = ''16-bit port for listening. Optional; if not specified,
-        automatically generated based on interface name.'';
+        description = ''
+          16-bit port for listening. Optional; if not specified,
+          automatically generated based on interface name.
+        '';
       };
 
       preSetup = mkOption {
@@ -51,8 +55,9 @@ let
         ''];
         default = [];
         type = with types; listOf str;
-        description = ''A list of commands called at the start of the interface
-        setup.'';
+        description = ''
+          A list of commands called at the start of the interface setup.
+        '';
       };
 
       postSetup = mkOption {
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 6153578612c..f8a00784034 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -44,10 +44,10 @@ in
       copyKernels = mkOption {
         default = false;
         type = types.bool;
-        description = "
+        description = ''
           Whether copy the necessary boot files into /boot, so
           /nix/store is not needed by the boot loader.
-        ";
+        '';
       };
 
     };

From 1eb9fe36962e5b198f8e4bc0c0c4268e1599a382 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 16 Dec 2016 12:38:44 -0500
Subject: [PATCH 264/295] awscli, boto{core,3}: update to 1.11.30, 1.4.87, and
 1.4.2, respectively

These packages like being updated together which is why I put all three
of them into the same commit.
---
 pkgs/top-level/python-packages.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0025936647..cccd50422be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1488,13 +1488,13 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.11.10";
+    version = "1.11.30";
 
     namePrefix = "";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "174lfpai5cga1ml2bwswjil6h544m57js9ki7hqkr9gdbpa8pyrk";
+      sha256 = "07km02wnjbaf745cs8j6zlwk9c2561l82zvr23a6d3qzs8wwxicf";
     };
 
     # No tests included
@@ -1508,6 +1508,7 @@ in {
       colorama_3_3
       docutils
       rsa
+      pyyaml
       pkgs.groff
       pkgs.less
     ];
@@ -2990,13 +2991,13 @@ in {
 
   boto3 = buildPythonPackage rec {
     name = "boto3-${version}";
-    version = "1.4.1";
+    version = "1.4.2";
 
     src = pkgs.fetchFromGitHub {
       owner = "boto";
       repo  = "boto3";
       rev   = version;
-      sha256 = "19ij6cs2n3p5fgipbrq1dybq2sjjvlhg9n5a5sv9wi95x9wqi5wb";
+      sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3";
     };
 
     propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++
@@ -3027,12 +3028,12 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.4.67"; # This version is required by awscli
+    version = "1.4.87"; # This version is required by awscli
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "15fh3ng33mcbhm76pk9qqglf342qj471gfcqxv0nrl9f8sn3v60q";
+      sha256 = "0fga1zjffsn2h50hbw7s4lcv6zwz5dcjgvjncl5y392mhivlrika";
     };
 
     propagatedBuildInputs =

From 656cc3acafcb30e3503f4d3e39694ca996c66015 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Fri, 16 Dec 2016 15:19:14 -0400
Subject: [PATCH 265/295] fix 2 xml errors in the description of
 boot.loader.grub.efiInstallAsRemovable

---
 nixos/modules/system/boot/loader/grub/grub.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 294fc1988e9..b5bb26fb8d2 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -361,7 +361,7 @@ in
         example = true;
         type = types.bool;
         description = ''
-          Whether to invoke <literal>grub-install</literal> with
+          <para>Whether to invoke <literal>grub-install</literal> with
           <literal>--removable</literal>.</para>
 
           <para>Unless you turn this on, GRUB will install itself somewhere in
@@ -391,6 +391,7 @@ in
             <listitem><para>You simply dislike the idea of depending on NVRAM
             state to make your drive bootable</para></listitem>
           </itemizedlist>
+          </para>
         '';
       };
 

From 415c9ff90b4aa9f6452f618e60aa948ab94a93fb Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sun, 4 Dec 2016 22:02:49 +0100
Subject: [PATCH 266/295] nixos/keystone: init at liberty version

This commit introduces a nixos module for the Openstack Keystone
service. It also provides a optional bootstrap step that creates some
basic initial resources (tenants, endpoints,...).

The provided test starts Keystone by enabling bootstrapping and checks
if user creation works well.

This commit is based on initial works made by domenkozar.
---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../virtualisation/openstack/keystone.nix     | 191 ++++++++++++++++++
 nixos/tests/keystone.nix                      |  53 +++++
 4 files changed, 247 insertions(+)
 create mode 100644 nixos/modules/virtualisation/openstack/keystone.nix
 create mode 100644 nixos/tests/keystone.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2a9a18236e5..70705771183 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -280,6 +280,7 @@
       stanchion = 262;
       riak-cs = 263;
       infinoted = 264;
+      keystone = 265;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -530,6 +531,7 @@
       stanchion = 262;
       riak-cs = 263;
       infinoted = 264;
+      keystone = 265;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4032df9fb91..cd12fe4f9b3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -631,4 +631,5 @@
   ./virtualisation/vmware-guest.nix
   ./virtualisation/xen-dom0.nix
   ./virtualisation/xe-guest-utilities.nix
+  ./virtualisation/openstack/keystone.nix
 ]
diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix
new file mode 100644
index 00000000000..30bdb869046
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack/keystone.nix
@@ -0,0 +1,191 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.virtualisation.openstack.keystone;
+  keystoneConf = pkgs.writeText "keystone.conf" ''
+    [DEFAULT]
+    admin_token = ${cfg.adminToken}
+    policy_file=${cfg.package}/etc/policy.json
+
+    [database]
+    connection = ${cfg.databaseConnection}
+
+    [paste_deploy]
+    config_file = ${cfg.package}/etc/keystone-paste.ini
+
+    ${cfg.extraConfig}
+  '';
+in {
+  options.virtualisation.openstack.keystone = {
+    package = mkOption {
+      type = types.package;
+      example = literalExample "pkgs.keystone";
+      description = ''
+        Keystone package to use.
+      '';
+    };
+
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable Keystone, the OpenStack Identity Service
+      '';
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      type = types.lines;
+      description = ''
+        Additional text appended to <filename>keystone.conf</filename>,
+        the main Keystone configuration file.
+      '';
+    };
+
+    adminToken = mkOption {
+      type = types.str;
+      default = "mySuperToken";
+      description = ''
+        This is the admin token used to boostrap keystone,
+        ie. to provision first resources.
+      '';
+    };
+
+    bootstrap = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Bootstrap the Keystone service by creating the service
+          tenant, an admin account and a public endpoint. This options
+          provides a ready-to-use admin account. This is only done at
+          the first Keystone execution by the systemd post start.
+
+          Note this option is a helper for setting up development or
+          testing environments.
+        '';
+      };
+
+      endpointPublic = mkOption {
+        type = types.str;
+        default = "http://localhost:5000/v2.0";
+        description = ''
+          The public identity endpoint. The link <link
+          xlink:href="http://docs.openstack.org/liberty/install-guide-rdo/keystone-services.html">
+          create keystone endpoint</link> provides more informations
+          about that.
+        '';
+      };
+
+      adminUsername = mkOption {
+        type = types.str;
+        default = "admin";
+        description = ''
+          A keystone admin username.
+        '';
+      };
+
+      adminPassword = mkOption {
+        type = types.str;
+        default = "admin";
+        description = ''
+          The keystone admin user's password.
+        '';
+      };
+
+      adminTenant = mkOption {
+        type = types.str;
+        default = "admin";
+        description = ''
+          A keystone admin tenant name.
+        '';
+      };
+    };
+
+    databaseConnection = mkOption {
+        type = types.str;
+        default = mysql://keystone:keystone@localhost/keystone;
+        description = ''
+          The SQLAlchemy connection string to use to connect to the
+          Keystone database.
+        '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Note: when changing the default, make it conditional on
+    # ‘system.stateVersion’ to maintain compatibility with existing
+    # systems!
+    virtualisation.openstack.keystone.package = mkDefault pkgs.keystone;
+
+    users.extraUsers = [{
+      name = "keystone";
+      group = "keystone";
+      uid = config.ids.uids.keystone;
+    }];
+    users.extraGroups = [{
+      name = "keystone";
+      gid = config.ids.gids.keystone;
+    }];
+
+    systemd.services.keystone-all = {
+        description = "OpenStack Keystone Daemon";
+	packages = [ mysql ];
+        after = [ "network.target"];
+        path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
+        wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          mkdir -m 755 -p /var/lib/keystone
+          # Initialise the database
+          ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync
+          # Set up the keystone's PKI infrastructure
+          ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone
+        '';
+        postStart = optionalString cfg.bootstrap.enable ''
+          set -eu
+          # Wait until the keystone is available for use
+          count=0
+          while ! curl --fail -s  http://localhost:35357/v2.0 > /dev/null 
+          do
+              if [ $count -eq 30 ]
+              then
+                  echo "Tried 30 times, giving up..."
+                  exit 1
+              fi
+
+              echo "Keystone not yet started. Waiting for 1 second..."
+              count=$((count++))
+              sleep 1
+          done
+
+          # We use the service token to create a first admin user
+          export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0
+          export OS_SERVICE_TOKEN=${cfg.adminToken}
+
+          # If the tenant service doesn't exist, we consider
+          # keystone is not initialized
+          if ! keystone tenant-get service
+          then
+              keystone tenant-create --name service
+              keystone tenant-create --name ${cfg.bootstrap.adminTenant}
+              keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${cfg.bootstrap.adminPassword}
+              keystone role-create --name admin
+              keystone role-create --name Member
+              keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin
+              keystone service-create --type identity --name keystone
+              ID=$(keystone service-get keystone | awk '/ id / { print $4 }')
+              keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0
+          fi
+        '';
+        serviceConfig = {
+          PermissionsStartOnly = true; # preStart must be run as root
+          TimeoutStartSec = "600"; # 10min for initial db migrations
+          User = "keystone";
+          Group = "keystone";
+          ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}";
+        };
+      };
+  };
+}
diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix
new file mode 100644
index 00000000000..15e86db381f
--- /dev/null
+++ b/nixos/tests/keystone.nix
@@ -0,0 +1,53 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  createKeystoneDb = pkgs.writeText "create-keystone-db.sql" ''
+    create database keystone;
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone';
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone';
+  '';
+  # The admin keystone account
+  adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=admin OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+  # The created demo keystone account
+  demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+
+in makeTest {
+  machine =
+    { config, pkgs, ... }:
+    {
+      services.mysql.enable = true;
+      services.mysql.initialScript = createKeystoneDb;
+
+      virtualisation = {
+        openstack.keystone.enable = true;
+	openstack.keystone.bootstrap.enable = true;
+
+        memorySize = 2096;
+        diskSize = 4 * 1024;
+	};
+
+      environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
+        openstackclient
+      ];
+    };
+
+  testScript =
+    ''
+     $machine->waitForUnit("keystone-all.service");
+
+     # Verify that admin ccount is working
+     $machine->succeed("${adminOpenstackCmd} token issue");
+
+     # Try to create a new user
+     $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo");
+     $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo");
+     $machine->succeed("${adminOpenstackCmd} role create user");
+     $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user");
+
+     # Verify this new account is working
+     $machine->succeed("${demoOpenstackCmd} token issue");
+    '';
+}

From a932f68d9c2a020e04b49f225310decf39bb34d0 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 10 Dec 2016 23:14:50 +0100
Subject: [PATCH 267/295] nixos/keystone: secrets can be read from files

A secret can be stored in a file. It is written at runtime in the
configuration file.
Note it is also possible to write them in the nix store for dev
purposes.
---
 .../virtualisation/openstack/common.nix       | 54 ++++++++++++++++
 .../virtualisation/openstack/keystone.nix     | 63 ++++++++++++++-----
 nixos/tests/keystone.nix                      | 36 +++++++++--
 3 files changed, 131 insertions(+), 22 deletions(-)
 create mode 100644 nixos/modules/virtualisation/openstack/common.nix

diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix
new file mode 100644
index 00000000000..3fce54a2fa5
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack/common.nix
@@ -0,0 +1,54 @@
+{ lib }:
+
+with lib;
+
+rec {
+  # A shell script string helper to get the value of a secret at
+  # runtime.
+  getSecret = secretOption:
+    if secretOption.storage == "fromFile"
+    then ''$(cat ${secretOption.value})''
+    else ''${secretOption.value}'';
+
+
+  # A shell script string help to replace at runtime in a file the
+  # pattern of a secret by its value.
+  replaceSecret = secretOption: filename: ''
+    sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename}
+    '';
+
+  # This generates an option that can be used to declare secrets which
+  # can be stored in the nix store, or not. A pattern is written in
+  # the nix store to represent the secret. The pattern can
+  # then be overwritten with the value of the secret at runtime.
+  mkSecretOption = {name, description ? ""}:
+    mkOption {
+      description = description;
+      type = types.submodule ({
+        options = {
+          pattern = mkOption {
+            type = types.str;
+            default = "##${name}##";
+            description = "The pattern that represent the secret.";
+            };
+          storage = mkOption {
+            type = types.enum [ "fromNixStore" "fromFile" ];
+            description = ''
+            Choose the way the password is provisionned. If
+            fromNixStore is used, the value is the password and it is
+            written in the nix store. If fromFile is used, the value
+            is a path from where the password will be read at
+            runtime. This is generally used with <link
+            xlink:href="https://nixos.org/nixops/manual/#opt-deployment.keys">
+            deployment keys</link> of Nixops.
+           '';};
+            value = mkOption {
+              type = types.str;
+	      description = ''
+	      If the storage is fromNixStore, the value is the password itself,
+	      otherwise it is a path to the file that contains the password.
+	      '';
+	      };
+            };});
+  };
+}
diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix
index 30bdb869046..e32c5a4cae1 100644
--- a/nixos/modules/virtualisation/openstack/keystone.nix
+++ b/nixos/modules/virtualisation/openstack/keystone.nix
@@ -1,22 +1,25 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+with lib; with import ./common.nix {inherit lib;};
 
 let
   cfg = config.virtualisation.openstack.keystone;
-  keystoneConf = pkgs.writeText "keystone.conf" ''
+  keystoneConfTpl = pkgs.writeText "keystone.conf" ''
     [DEFAULT]
-    admin_token = ${cfg.adminToken}
+    admin_token = ${cfg.adminToken.pattern}
     policy_file=${cfg.package}/etc/policy.json
 
     [database]
-    connection = ${cfg.databaseConnection}
+
+    connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
 
     [paste_deploy]
     config_file = ${cfg.package}/etc/keystone-paste.ini
 
     ${cfg.extraConfig}
   '';
+  keystoneConf = "/var/lib/keystone/keystone.conf";
+
 in {
   options.virtualisation.openstack.keystone = {
     package = mkOption {
@@ -44,9 +47,8 @@ in {
       '';
     };
 
-    adminToken = mkOption {
-      type = types.str;
-      default = "mySuperToken";
+    adminToken = mkSecretOption {
+      name = "adminToken";
       description = ''
         This is the admin token used to boostrap keystone,
         ie. to provision first resources.
@@ -87,9 +89,8 @@ in {
         '';
       };
 
-      adminPassword = mkOption {
-        type = types.str;
-        default = "admin";
+      adminPassword = mkSecretOption {
+        name = "keystoneAdminPassword";
         description = ''
           The keystone admin user's password.
         '';
@@ -104,13 +105,34 @@ in {
       };
     };
 
-    databaseConnection = mkOption {
+    database = {
+      host = mkOption {
         type = types.str;
-        default = mysql://keystone:keystone@localhost/keystone;
+        default = "localhost";
         description = ''
-          The SQLAlchemy connection string to use to connect to the
-          Keystone database.
+          Host of the database.
         '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        default = "keystone";
+        description = ''
+          Name of the existing database.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "keystone";
+        description = ''
+          The database user. The user must exist and has access to
+          the specified database.
+        '';
+      };
+      password = mkSecretOption {
+        name = "mysqlPassword";
+        description = "The database user's password";};
     };
   };
 
@@ -132,12 +154,19 @@ in {
 
     systemd.services.keystone-all = {
         description = "OpenStack Keystone Daemon";
-	packages = [ mysql ];
         after = [ "network.target"];
         path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
         wantedBy = [ "multi-user.target" ];
         preStart = ''
           mkdir -m 755 -p /var/lib/keystone
+
+          cp ${keystoneConfTpl} ${keystoneConf};
+          chown keystone:keystone ${keystoneConf};
+          chmod 640 ${keystoneConf}
+
+          ${replaceSecret cfg.database.password keystoneConf}
+          ${replaceSecret cfg.adminToken keystoneConf}
+
           # Initialise the database
           ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync
           # Set up the keystone's PKI infrastructure
@@ -162,7 +191,7 @@ in {
 
           # We use the service token to create a first admin user
           export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0
-          export OS_SERVICE_TOKEN=${cfg.adminToken}
+          export OS_SERVICE_TOKEN=${getSecret cfg.adminToken}
 
           # If the tenant service doesn't exist, we consider
           # keystone is not initialized
@@ -170,7 +199,7 @@ in {
           then
               keystone tenant-create --name service
               keystone tenant-create --name ${cfg.bootstrap.adminTenant}
-              keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${cfg.bootstrap.adminPassword}
+              keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword}
               keystone role-create --name admin
               keystone role-create --name Member
               keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin
diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix
index 15e86db381f..872d6c0784b 100644
--- a/nixos/tests/keystone.nix
+++ b/nixos/tests/keystone.nix
@@ -4,13 +4,17 @@ with import ../lib/testing.nix { inherit system; };
 with pkgs.lib;
 
 let
+  keystoneMysqlPassword = "keystoneMysqlPassword";
+  keystoneMysqlPasswordFile = "/var/run/keystoneMysqlPassword";
+  keystoneAdminPassword = "keystoneAdminPassword";
+
   createKeystoneDb = pkgs.writeText "create-keystone-db.sql" ''
     create database keystone;
-    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone';
-    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone';
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '${keystoneMysqlPassword}';
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${keystoneMysqlPassword}';
   '';
   # The admin keystone account
-  adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=admin OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+  adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=${keystoneAdminPassword} OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
   # The created demo keystone account
   demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
 
@@ -18,12 +22,34 @@ in makeTest {
   machine =
     { config, pkgs, ... }:
     {
+      # This is to simulate nixops deployment process.
+      # https://nixos.org/nixops/manual/#opt-deployment.keys
+      boot.postBootCommands = "echo ${keystoneMysqlPassword} > ${keystoneMysqlPasswordFile}";
+
       services.mysql.enable = true;
       services.mysql.initialScript = createKeystoneDb;
 
       virtualisation = {
-        openstack.keystone.enable = true;
-	openstack.keystone.bootstrap.enable = true;
+
+        openstack.keystone = {
+	  enable = true;
+	  # Check if we can get the secret from a file
+	  database.password = {
+	    value = keystoneMysqlPasswordFile;
+	    storage = "fromFile";
+	  };
+	  adminToken = {
+	    value = "adminToken";
+	    storage = "fromNixStore";
+	  };
+
+	  bootstrap.enable = true;
+	  # Check if we can get the secret from the store
+	  bootstrap.adminPassword = {
+	    value = keystoneAdminPassword;
+	    storage = "fromNixStore";
+	  };
+	};
 
         memorySize = 2096;
         diskSize = 4 * 1024;

From 086e5d09a1f364b427ed27817c44dd563180eb28 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 15 Dec 2016 13:24:03 +0100
Subject: [PATCH 268/295] nixos/keystone: add test in release.nix

---
 nixos/release.nix        | 1 +
 nixos/tests/keystone.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index 683e09f431f..366eecf773e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -258,6 +258,7 @@ in rec {
   tests.kde5 = callTest tests/kde5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
+  tests.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   #tests.lightdm = callTest tests/lightdm.nix {};
diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix
index 872d6c0784b..358e352f776 100644
--- a/nixos/tests/keystone.nix
+++ b/nixos/tests/keystone.nix
@@ -19,6 +19,9 @@ let
   demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
 
 in makeTest {
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lewo ];
+  };
   machine =
     { config, pkgs, ... }:
     {

From d0250ad884bf66f635f23fe38dc114bb6e822d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 16 Dec 2016 21:18:20 +0100
Subject: [PATCH 269/295] Haskell generic builder: enable parallel builds for
 GHC 8.0.2

This reverts https://github.com/NixOS/nixpkgs/pull/4554
---
 pkgs/development/haskell-modules/generic-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 6c75c1f3550..f91bd474c6f 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -114,6 +114,7 @@ let
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+    (optionalString (versionOlder "8.0.1" ghc.version) "--ghc-option=-j$NIX_BUILD_CORES")
   ] ++ optionals isGhcjs [
     "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"

From ebe67d69d021e8970c717ac05195c07bae33b270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 16 Dec 2016 22:28:58 +0100
Subject: [PATCH 270/295] collectd service: change /var/lib/collectd perms: 700
 -> 755

The collectd service runs as an unprivileged user by default, so it does
not leak more information to its data directory than any user can obtain
elsewhere by other means.

If people are running it as root and are worried about information leak,
we can add collectd group and set perms to 750.

CC @offlinehacker.

Fixes #21198.
---
 nixos/modules/services/monitoring/collectd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 01c6fb81766..641da60e9ad 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -108,7 +108,8 @@ in {
       };
 
       preStart = ''
-        mkdir -m 0700 -p ${cfg.dataDir}
+        mkdir -p ${cfg.dataDir}
+        chmod 755 ${cfg.dataDir}
         install -D /dev/null ${cfg.pidFile}
         if [ "$(id -u)" = 0 ]; then
           chown -R ${cfg.user} ${cfg.dataDir};

From 3d94be77ddf56b43cfd897437c73ff888d891de4 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Fri, 16 Dec 2016 23:33:23 +0100
Subject: [PATCH 271/295] openshift: 1.3.1 -> 1.3.2

---
 .../networking/cluster/openshift/default.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index e4307c9aabc..403457bb4a6 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,9 +1,11 @@
 { stdenv, fetchFromGitHub, go, which }:
 
 let
-  version = "1.3.1";
-  versionMajor = "1";
-  versionMinor = "3";
+  version = "1.3.2";
+  ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
+  versionMajor = ver 0;
+  versionMinor = ver 1;
+  versionPatch = ver 2;
 in
 stdenv.mkDerivation rec {
   name = "openshift-origin-${version}";
@@ -13,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "openshift";
     repo = "origin";
     rev = "v${version}";
-    sha256 = "1kxa1k38hvi1vg52p82mmkmp9k4bbbm2pryzapsxwga7d8x4bnbh";
+    sha256 = "0zw8zb9c6icigcq6y47ppnjnqyghk2kril07bapbddvgnvbbfp6m";
   };
 
   buildInputs = [ go which ];
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Build, deploy, and manage your applications with Docker and Kubernetes";
     license = licenses.asl20;
     homepage = http://www.openshift.org;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [offline bachp];
     platforms = platforms.linux;
   };
 }

From 993cbf8acb9da679bb8bca00eacada6d83ed6994 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 16 Dec 2016 20:40:17 +0100
Subject: [PATCH 272/295] uxrvtd: Fix clipboard

---
 nixos/modules/services/x11/urxvtd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index ab47f4547ae..be36efaa589 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -32,6 +32,7 @@ in {
 
       services.urxvtd = {
         description = "urxvt terminal daemon";
+        path = [ pkgs.xsel ];
         serviceConfig = {
           ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o";
           Environment = "RXVT_SOCKET=%t/urxvtd-socket";

From 1590461887333e2fda46f4bd74aef3785b253089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 14 Dec 2016 23:49:14 +0100
Subject: [PATCH 273/295] ntp: make timesyncd the new default

- most nixos user only require time synchronisation,
  while ntpd implements a battery-included ntp server (1,215 LOCs of C-Code vs 64,302)
- timesyncd support ntp server per interface (if configured through dhcp for instance)
- timesyncd is already included in the systemd package, switching to it would
  save a little disk space (1,5M)
---
 nixos/modules/config/networking.nix           | 12 ++++++++++
 nixos/modules/services/networking/chrony.nix  |  4 ++--
 nixos/modules/services/networking/ntpd.nix    | 10 +++-----
 .../modules/services/networking/openntpd.nix  |  2 +-
 nixos/modules/system/boot/networkd.nix        |  3 ---
 nixos/modules/system/boot/timesyncd.nix       | 23 +++++++++++--------
 .../virtualisation/google-compute-image.nix   |  2 +-
 .../virtualisation/parallels-guest.nix        |  2 +-
 nixos/modules/virtualisation/qemu-vm.nix      |  2 +-
 nixos/modules/virtualisation/xen-domU.nix     |  2 +-
 10 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index fdc782b0579..adc05f60231 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -84,6 +84,18 @@ in
       '';
     };
 
+    networking.timeServers = mkOption {
+      default = [
+        "0.nixos.pool.ntp.org"
+        "1.nixos.pool.ntp.org"
+        "2.nixos.pool.ntp.org"
+        "3.nixos.pool.ntp.org"
+      ];
+      description = ''
+        The set of NTP servers from which to synchronise.
+      '';
+    };
+
     networking.proxy = {
 
       default = lib.mkOption {
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index d40865ebbd5..f2ff11633b1 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -31,7 +31,7 @@ in
       };
 
       servers = mkOption {
-        default = config.services.ntp.servers;
+        default = config.networking.timeServers;
         description = ''
           The set of NTP servers from which to synchronise.
         '';
@@ -102,7 +102,7 @@ in
         home = stateDir;
       };
 
-    systemd.services.ntpd.enable = mkForce false;
+    systemd.services.timesyncd.enable = mkForce false;
 
     systemd.services.chronyd =
       { description = "chrony NTP daemon";
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index c8a08567928..88e6dbf22b9 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -34,7 +34,7 @@ in
     services.ntp = {
 
       enable = mkOption {
-        default = !config.boot.isContainer;
+        default = false;
         description = ''
           Whether to synchronise your machine's time using the NTP
           protocol.
@@ -42,12 +42,7 @@ in
       };
 
       servers = mkOption {
-        default = [
-          "0.nixos.pool.ntp.org"
-          "1.nixos.pool.ntp.org"
-          "2.nixos.pool.ntp.org"
-          "3.nixos.pool.ntp.org"
-        ];
+        default = config.networking.timeServers;
         description = ''
           The set of NTP servers from which to synchronise.
         '';
@@ -70,6 +65,7 @@ in
 
     # Make tools such as ntpq available in the system path.
     environment.systemPackages = [ pkgs.ntp ];
+    services.timesyncd.enable = mkForce false;
 
     users.extraUsers = singleton
       { name = ntpUser;
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index a8625fa2fa9..13a1b5258ce 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -49,7 +49,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    services.ntp.enable = mkForce false;
+    services.timesyncd.enable = mkForce false;
 
     # Add ntpctl to the environment for status checking
     environment.systemPackages = [ package ];
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 8c139a94c0c..e5ec70d8690 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -687,8 +687,5 @@ in
     };
 
     services.resolved.enable = mkDefault true;
-    services.timesyncd.enable = mkDefault config.services.ntp.enable;
-
   };
-
 }
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index cba965b1cd2..f643723ab14 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -6,14 +6,21 @@ with lib;
 
   options = {
 
-    services.timesyncd.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Enables the systemd NTP client daemon.
-      '';
+    services.timesyncd = {
+      enable = mkOption {
+        default = !config.boot.isContainer;
+        type = types.bool;
+        description = ''
+          Enables the systemd NTP client daemon.
+        '';
+      };
+      servers = mkOption {
+        default = config.networking.timeServers;
+        description = ''
+          The set of NTP servers from which to synchronise.
+        '';
+      };
     };
-
   };
 
   config = mkIf config.services.timesyncd.enable {
@@ -30,8 +37,6 @@ with lib;
       NTP=${concatStringsSep " " config.services.ntp.servers}
     '';
 
-    systemd.services.ntpd.enable = false;
-
     users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;
     users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
 
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 90dbd3b6d63..0e6825c3f5d 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -125,7 +125,7 @@ in
     169.254.169.254 metadata.google.internal metadata
   '';
 
-  services.ntp.servers = [ "metadata.google.internal" ];
+  networking.timeServers = [ "metadata.google.internal" ];
 
   networking.usePredictableInterfaceNames = false;
 
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 204ab0b0df6..bd85973ee56 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -57,7 +57,7 @@ in
 
     boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ];
 
-    services.ntp.enable = false;
+    services.timesyncd.enable = false;
 
     systemd.services.prltoolsd = {
       description = "Parallels Tools' service";
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 263bbf78583..05fe13ba7c7 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -478,7 +478,7 @@ in
     boot.initrd.luks.devices = mkVMOverride {};
 
     # Don't run ntpd in the guest.  It should get the correct time from KVM.
-    services.ntp.enable = false;
+    services.timesyncd.enable = false;
 
     system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
       ''
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index 2db3190ad13..8dd0d1dbfd2 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -18,5 +18,5 @@
   services.syslogd.tty = "hvc0";
 
   # Don't run ntpd, since we should get the correct time from Dom0.
-  services.ntp.enable = false;
+  services.timesyncd.enable = false;
 }

From cda47275f4c40064907ca08c9d7beabd496859b5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 17 Dec 2016 00:13:47 +0100
Subject: [PATCH 274/295] rustRegistry: 2016-12-03 -> 2016-12-16

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index ef6dee3e3f7..29fbac38bd0 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-12-03";
-  rev = "94e482dd6667aa239e5b3b8590fc9bfa0c1fd376";
-  sha256 = "0k300vhc0m8a0165pikl6rvyz0w20dnlacpb9b4jjl7gfixynlmz";
+  version = "2016-12-16";
+  rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5";
+  sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d";
 
   src = fetchFromGitHub {
       inherit rev;

From 2077a60c2f179afa7d608adac4a9248cff86a80f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 17 Dec 2016 00:16:40 +0100
Subject: [PATCH 275/295] ripgrep: 0.2.1 -> 0.3.2

---
 pkgs/tools/text/ripgrep/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 3c2ef2e9533..3890044d3b1 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.2.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "0whw6hqjkf6sysrfv931jaia2hqhy8m9aa5rxax1kygm4snz4j85";
+    sha256 = "15j68bkkxpbh9c05f8l7j0y33da01y28kpg781lc0234h45535f3";
   };
 
-  depsSha256 = "10f7pkgaxwizl7kzhkry7wx1rgm9wsybwkk92myc29s7sqir2mx4";
+  depsSha256 = "142h6pcf2mr4i7dg7di4299c18aqn0yvk9nr1mxnkb7wjcmrvcfg";
 
   meta = with stdenv.lib; {
     description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep";

From 54f460a585036832ba165b9a77f121effc086692 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <benjamin.hipple@gmail.com>
Date: Fri, 16 Dec 2016 22:42:11 -0500
Subject: [PATCH 276/295] cpp-ethereum: fix description metadata

---
 pkgs/applications/misc/cpp-ethereum/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 3cc334c6765..150c900ba9f 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    decription = "Ethereum C++ client";
+    description = "Ethereum C++ client";
     homepage = https://github.com/ethereum/cpp-ethereum;
     license = licenses.gpl3;
     maintainers = with maintainers; [ artuuge ];

From 3af715af900298476bea9f487429b1941130d0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 17 Dec 2016 11:40:34 +0100
Subject: [PATCH 277/295] Revert "fix 2 xml errors in the description of
 boot.loader.grub.efiInstallAsRemovable"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 656cc3acafcb30e3503f4d3e39694ca996c66015 because it
causes building the manual to fail:

  $ nixos-rebuild build
  ...
  building path(s) ‘/nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb’
  Writing /nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb/manual.db for book(book-nixos-manual)
  ./man-pages.xml:625: element para: Relax-NG validity error : Did not expect element para there
  ./man-pages.xml:3: element variablelist: Relax-NG validity error : Element refsection has extra content: variablelist
  ./man-pages.xml:29: element refsection: Relax-NG validity error : Element refentry has extra content: refsection
  ./man-pages.xml:3: element reference: Relax-NG validity error : Element reference failed to validate content
  ./man-pages.xml fails to validate

CC @cleverca22, @Mic92
---
 nixos/modules/system/boot/loader/grub/grub.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index b5bb26fb8d2..294fc1988e9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -361,7 +361,7 @@ in
         example = true;
         type = types.bool;
         description = ''
-          <para>Whether to invoke <literal>grub-install</literal> with
+          Whether to invoke <literal>grub-install</literal> with
           <literal>--removable</literal>.</para>
 
           <para>Unless you turn this on, GRUB will install itself somewhere in
@@ -391,7 +391,6 @@ in
             <listitem><para>You simply dislike the idea of depending on NVRAM
             state to make your drive bootable</para></listitem>
           </itemizedlist>
-          </para>
         '';
       };
 

From 280d0cf20f4089df930fbcf037a9c85f5c89e303 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 17 Dec 2016 12:59:56 +0100
Subject: [PATCH 278/295] wireshark: 2.2.2 -> 2.2.3

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index e2806b3d342..637f2cdca9c 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "2.2.2";
+  version = "2.2.3";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1csm035ayfzn1xzzsmzcjk2ixx39d70aykr4nh0a88chk9gfzb7r";
+    sha256 = "0fsrvl6sp772g2q2j24h10h9lfda6q67x7wahjjm8849i2gciflp";
   };
 
   buildInputs = [

From 1141aa1faab51c010f22f4cce68a2bf6faed508d Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Sat, 17 Dec 2016 13:59:09 +0000
Subject: [PATCH 279/295] coreutils: 8.25 -> 8.26

---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8f09a677b8e..ec6be06ede3 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -13,11 +13,11 @@ with lib;
 
 let
   self = stdenv.mkDerivation rec {
-    name = "coreutils-8.25";
+    name = "coreutils-8.26";
 
     src = fetchurl {
       url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
+      sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
     };
 
     # FIXME needs gcc 4.9 in bootstrap tools

From 45c1c50dddc76ed8f205c7d23ea7e1418fc67055 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Dec 2016 15:12:00 +0100
Subject: [PATCH 280/295] pythonPackages.pytest_29: disable tests temporarily

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cccd50422be..efa74c775d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4881,6 +4881,9 @@ in {
       url = "mirror://pypi/p/pytest/${name}.tar.gz";
       sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
     };
+
+    # Disabled temporarily because of Hydra issue with namespaces
+    doCheck = false;
   };
 
   pytest_30 = self.pytest_27.override rec {

From d49e0d5fa5c245ab4e8675ba7fd286d848484fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 16 Nov 2016 21:47:11 +0000
Subject: [PATCH 281/295] networkd: allow to supply own unit files

Networkd units can contain secrets. In future also wireguard vpn will be supported by
networkd. To avoid leakage of private keys, those could be then also put outside
of the /nix/store

Having a writeable /etc/systemd/network also allows to quick fix network issues,
when upgrading `nixos-rebuild switch` would require network on its own (due
updates).
---
 nixos/modules/system/boot/networkd.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index e5ec70d8690..86237ea6ac7 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -606,6 +606,10 @@ let
         '';
     };
 
+  unitFiles = map (name: {
+    target = "systemd/network/${name}";
+    source = "${cfg.units.${name}.unit}/${name}";
+  }) (attrNames cfg.units);
 in
 
 {
@@ -657,17 +661,15 @@ in
     systemd.additionalUpstreamSystemUnits =
       [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
 
-    systemd.network.units =
-      mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
+    systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
       // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
       // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
 
-    environment.etc."systemd/network".source =
-      generateUnits "network" cfg.units [] [];
+    environment.etc = unitFiles;
 
     systemd.services.systemd-networkd = {
       wantedBy = [ "multi-user.target" ];
-      restartTriggers = [ config.environment.etc."systemd/network".source ];
+      restartTriggers = map (f: f.source) (unitFiles);
     };
 
     systemd.services.systemd-networkd-wait-online = {

From 579051fe66f3c41615309c17f96153e6dac0e10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 17 Dec 2016 12:03:40 +0100
Subject: [PATCH 282/295] networkd: add extraConfig to all units

networkd options are always correct or up to date. This option allows to by
pass type checking. It is also easier to write because examples can be just copy
and paste from manpages.
---
 nixos/modules/system/boot/networkd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 86237ea6ac7..b828ad53dc5 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -165,6 +165,11 @@ let
       '';
     };
 
+    extraConfig = mkOption {
+      default = "";
+      type = types.lines;
+      description = "Extra configuration append to unit";
+    };
   };
 
   linkOptions = commonNetworkOptions // {
@@ -515,6 +520,8 @@ let
         ''
           [Link]
           ${attrsToSection def.linkConfig}
+
+          ${def.extraConfig}
         '';
     };
 
@@ -565,6 +572,7 @@ let
             ${attrsToSection def.bondConfig}
 
           ''}
+          ${def.extraConfig}
         '';
     };
 
@@ -603,6 +611,7 @@ let
             ${attrsToSection x.routeConfig}
 
           '')}
+          ${def.extraConfig}
         '';
     };
 

From 88f49a00925fd93cedc221000656b10d07f29d7f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 17 Dec 2016 14:48:25 +0100
Subject: [PATCH 283/295] vimiv: 0.7.2 -> 0.7.3

Bugfix release with the following fixes:

 * Fix thumbnail creation for input files with dot
 * Use native python to generate list of external commands
 * Do not use commandline arguments in test mode
 * Catch broken symlinks in the library and filter them

So everything but the last item is essentially what we had in
fixes.patch, hence we cane remove it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/graphics/vimiv/default.nix |   6 +-
 pkgs/applications/graphics/vimiv/fixes.patch | 128 -------------------
 2 files changed, 2 insertions(+), 132 deletions(-)
 delete mode 100644 pkgs/applications/graphics/vimiv/fixes.patch

diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index bb8437153ca..39db1dd1f6d 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "vimiv";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "karlch";
     repo = "vimiv";
     rev = "v${version}";
-    sha256 = "1g97ms84xk4ci4crq9wdc3744jnrqkq2qz9sg69lhm9sr5f68bw4";
+    sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn";
   };
 
   testimages = fetchFromGitHub {
@@ -23,8 +23,6 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb";
   };
 
-  patches = [ ./fixes.patch ];
-
   postPatch = ''
     patchShebangs scripts/install_icons.sh
     sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh
diff --git a/pkgs/applications/graphics/vimiv/fixes.patch b/pkgs/applications/graphics/vimiv/fixes.patch
deleted file mode 100644
index 09c06e43058..00000000000
--- a/pkgs/applications/graphics/vimiv/fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Patch submitted upstream at https://github.com/karlch/vimiv/pull/32
-
-diff --git a/tests/main_test.py b/tests/main_test.py
-index a1870e7..2edc86d 100644
---- a/tests/main_test.py
-+++ b/tests/main_test.py
-@@ -15,7 +15,7 @@ class MainTest(TestCase):
- 
-     def test_main_until_quit(self):
-         """Run through vimiv main once."""
--        v_main.main(True)
-+        v_main.main([], True)
- 
- 
- if __name__ == '__main__':
-diff --git a/vimiv/helpers.py b/vimiv/helpers.py
-index 22f0115..bfaf016 100644
---- a/vimiv/helpers.py
-+++ b/vimiv/helpers.py
-@@ -3,7 +3,6 @@
- """Wrappers around standard library functions used in vimiv."""
- 
- import os
--from subprocess import Popen, PIPE
- from gi import require_version
- require_version('Gtk', '3.0')
- from gi.repository import Gtk
-@@ -20,17 +19,17 @@ scrolltypes["K"] = (Gtk.ScrollType.START, False)
- scrolltypes["L"] = (Gtk.ScrollType.END, True)
- 
- # A list of all external commands
--external_commands = []
--try:
--    p = Popen('echo $PATH | tr \':\' \'\n\' | xargs -n 1 ls -1',
--              stdout=PIPE, stderr=PIPE, shell=True)
--    out, err = p.communicate()
--    out = out.decode('utf-8').split()
--    for cmd in sorted(list(set(out))):
--        external_commands.append("!" + cmd)
--except:
--    external_commands = []
--external_commands = tuple(external_commands)
-+pathenv = os.environ.get('PATH')
-+if pathenv is not None:
-+    executables = set()
-+    for path in pathenv.split(':'):
-+        try:
-+            executables |= set(["!" + e for e in os.listdir(path)])
-+        except OSError:
-+            continue
-+    external_commands = tuple(sorted(list(executables)))
-+else:
-+    external_commands = ()
- 
- 
- def listdir_wrapper(path, show_hidden=False):
-diff --git a/vimiv/imageactions.py b/vimiv/imageactions.py
-index d92eb73..b9bc986 100644
---- a/vimiv/imageactions.py
-+++ b/vimiv/imageactions.py
-@@ -157,8 +157,8 @@ class Thumbnails:
-             # Correct name
-             thumb_ext = ".thumbnail_%dx%d" % (self.thumbsize[0],
-                                               self.thumbsize[1])
--            outfile_ext = infile.split(".")[0] + thumb_ext + ".png"
--            outfile_base = os.path.basename(outfile_ext)
-+            infile_base = os.path.basename(infile)
-+            outfile_base = infile_base.split(".")[0] + thumb_ext + ".png"
-             outfile = os.path.join(self.directory, outfile_base)
-             # Only if they aren't cached already
-             if outfile_base not in self.thumbnails:
-diff --git a/vimiv/main.py b/vimiv/main.py
-index a0e38cf..39f7407 100644
---- a/vimiv/main.py
-+++ b/vimiv/main.py
-@@ -27,7 +27,7 @@ from vimiv.mark import Mark
- from vimiv.information import Information
- 
- 
--def main(running_tests=False):
-+def main(arguments, running_tests=False):
-     """Starting point for vimiv.
- 
-     Args:
-@@ -36,7 +36,7 @@ def main(running_tests=False):
-     parser = get_args()
-     parse_dirs()
-     settings = parse_config()
--    settings = parse_args(parser, settings)
-+    settings = parse_args(parser, settings, arguments)
- 
-     args = settings["GENERAL"]["paths"]
- 
-diff --git a/vimiv/parser.py b/vimiv/parser.py
-index 874a538..9d5afce 100644
---- a/vimiv/parser.py
-+++ b/vimiv/parser.py
-@@ -56,7 +56,7 @@ def get_args():
-     return parser
- 
- 
--def parse_args(parser, settings, arguments=None):
-+def parse_args(parser, settings, arguments):
-     """Parse the arguments and return the modified settings.
- 
-     Args:
-@@ -66,10 +66,7 @@ def parse_args(parser, settings, arguments=None):
- 
-     Return: Modified settings after parsing the arguments.
-     """
--    if arguments:
--        args = parser.parse_args(arguments)
--    else:
--        args = parser.parse_args()
-+    args = parser.parse_args(arguments)
-     if args.show_version:
-         information = Information()
-         print(information.get_version())
-diff --git a/vimiv/vimiv b/vimiv/vimiv
-index 5497e08..57f34f1 100755
---- a/vimiv/vimiv
-+++ b/vimiv/vimiv
-@@ -5,4 +5,4 @@ import sys
- import vimiv
- 
- if __name__ == '__main__':
--    sys.exit(vimiv.main.main())
-+    sys.exit(vimiv.main.main(sys.argv))

From 8bfe3d784655083c5c7e73d0f09bb6a2239d359e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 17 Dec 2016 15:47:03 +0100
Subject: [PATCH 284/295] pythonPackages.pytest: disabled tests for all pytest
 versions

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5a6525df22..b648b850c31 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4848,6 +4848,9 @@ in {
       sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
     };
 
+    # Disabled temporarily because of Hydra issue with namespaces
+    doCheck = false;
+
     preCheck = ''
       # don't test bash builtins
       rm testing/test_argcomplete.py
@@ -4881,9 +4884,6 @@ in {
       url = "mirror://pypi/p/pytest/${name}.tar.gz";
       sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
     };
-
-    # Disabled temporarily because of Hydra issue with namespaces
-    doCheck = false;
   };
 
   pytest_30 = self.pytest_27.override rec {

From 987aac77945e2bee070723c9758f8173e9e7e974 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 1 Sep 2016 17:00:20 +0800
Subject: [PATCH 285/295] /etc/hosts and /etc/nsswitch.conf cleanups

fixes #18183
---
 nixos/modules/config/nsswitch.nix | 40 +++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 45553ec0566..3f96cea2270 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -10,9 +10,21 @@ let
   inherit (config.services.samba) nsswins;
   ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
 
-in
+  hostArray = [ "files" "mymachines" ]
+    ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
+    ++ optionals nsswins [ "wins" ]
+    ++ [ "dns" ]
+    ++ optionals nssmdns [ "mdns" ]
+    ++ ["myhostname" ];
 
-{
+  passwdArray = [ "files" ]
+    ++ optionals ldap [ "ldap" ]
+    ++ [ "mymachines" ];
+
+  shadowArray = [ "files" ]
+    ++ optionals ldap [ "ldap" ];
+
+in {
   options = {
 
     # NSS modules.  Hacky!
@@ -39,17 +51,19 @@ in
     # Name Service Switch configuration file.  Required by the C
     # library.  !!! Factor out the mdns stuff.  The avahi module
     # should define an option used by this module.
-    environment.etc."nsswitch.conf".text =
-      ''
-        passwd:    files ${optionalString ldap "ldap"}
-        group:     files ${optionalString ldap "ldap"}
-        shadow:    files ${optionalString ldap "ldap"}
-        hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines
-        networks:  files dns
-        ethers:    files
-        services:  files
-        protocols: files
-      '';
+    environment.etc."nsswitch.conf".text = ''
+      passwd:    ${concatStringsSep " " passwdArray}
+      group:     ${concatStringsSep " " passwdArray}
+      shadow:    ${concatStringsSep " " shadowArray}
+
+      hosts:     ${concatStringsSep " " hostArray}
+      networks:  files
+
+      ethers:    files
+      services:  files
+      protocols: files
+      rpc:       files
+    '';
 
     # Systemd provides nss-myhostname to ensure that our hostname
     # always resolves to a valid IP address.  It returns all locally

From f281ce8c2905c16ed34d31073024f14c109e9b1d Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 17 Dec 2016 15:31:11 +0100
Subject: [PATCH 286/295] universal-ctags: 2016-07-06 -> 2016-12-17

---
 .../development/tools/misc/universal-ctags/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 9adaa368997..b4710cc8406 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "universal-ctags-${version}";
-  version = "2016-07-06";
+  version = "2016-12-17";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
-    rev = "44a325a9db23063b231f6f041af9aaf19320d9b9";
-    sha256 = "11vq901h121ckqgw52k9x7way3q38b7jd08vr1n2sjz7kxh0zdd0";
+    rev = "3093f73e81cddbea5d122dccd4fd9a6323ebbbd3";
+    sha256 = "091359v3p865d39gchpc1x5qplf1s1y4nsph344ng5x1nkx44qsi";
   };
 
   buildInputs = [ autoreconfHook pkgconfig ];
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c
   '';
 
+  doCheck = true;
+
+  checkFlags = "units";
+
   meta = with stdenv.lib; {
     description = "A maintained ctags implementation";
     homepage = "https://ctags.io/";

From b899b8945fedc181e13e257e6f299e2344c2479a Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 17 Dec 2016 16:39:42 +0100
Subject: [PATCH 287/295] nano: 2.7.1 -> 2.7.2

---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 341b8063f66..738476b98e2 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -12,10 +12,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.7.1";
+  version = "2.7.2";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z";
+    sha256 = "1hlhwgvzdgkc7k74fbbn49hn6vmvzqr7h8gclgl7r1c6qrrny0bp";
   };
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];

From 09855fe2e5a878ff1f4eaf2142aad906638914b4 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 17 Dec 2016 15:16:07 +0000
Subject: [PATCH 288/295] profile-cleaner: 2.35 -> 2.36

fixes #21237
---
 pkgs/tools/misc/profile-cleaner/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index a55485953a8..4ee33df716b 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }:
+{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc }:
 
 stdenv.mkDerivation rec {
-  version = "2.35";
+  version = "2.36";
   name = "profile-cleaner-${version}";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
     rev = "v${version}";
-    sha256 = "0gashrzhpgcy98zsyc6b3awfp15j1x0nq82h60kvfjbs6xxzvszh";
+    sha256 = "0vm4ca99dyr6i0sfjsr0w06i0rbmqf40kp37h04bk4c8yassq1zq";
   };
 
   buildInputs = [ makeWrapper ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     PREFIX=\"\" DESTDIR=$out make install
     wrapProgram $out/bin/profile-cleaner \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc ]}"
   '';
 
   meta = {

From fa80bf7b0dda2d3380e7a3b0741c31c387837a8a Mon Sep 17 00:00:00 2001
From: ikervagyok <ikervagyok@gmail.com>
Date: Sat, 17 Dec 2016 16:53:27 +0100
Subject: [PATCH 289/295] packagekit: add 'enableNixBackend' as an option 
 (#21157)

* packagekit: disable nix-backend

Packagekit fails to build on my machines, as long as it's nix-backend is enabled

* packagekit: add 'enableNixBackend' as an option
---
 pkgs/tools/package-management/packagekit/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 68d13f7f17f..180395571b2 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, lib
 , intltool, glib, pkgconfig, polkit, python, sqlite, systemd
 , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive
-, nix, boost
+# TODO: set enableNixBackend to true, as soon as it builds
+, nix, enableNixBackend ? false, boost
 , enableCommandNotFound ? false
 , enableBashCompletion ? false, bash-completion ? null }:
 
@@ -28,7 +29,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-systemd"
-    "--enable-nix"
     "--disable-dummy"
     "--disable-cron"
     "--disable-introspection"
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     "--with-dbus-sys=$(out)/etc/dbus-1/system.d"
     "--with-systemdsystemunitdir=$(out)/lib/systemd/system/"
   ]
+  ++ lib.optional enableNixBackend "--enable-nix"
   ++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
   ++ lib.optional (!enableCommandNotFound) "--disable-command-not-found";
 

From dda462922e7e72c466f09c49791dec9e48c7e2ab Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 17 Dec 2016 16:16:55 +0000
Subject: [PATCH 290/295] libmesode: init at 0.9.1

This library is a fork of ``libstrophe'' and is needed if the
``profanity'' XMPP client is to have TLS support. TLS support has been
added to ``profanity'' since version 5.0.
---
 .../libraries/libmesode/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/libmesode/default.nix

diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
new file mode 100644
index 00000000000..8e684f7af1f
--- /dev/null
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
+
+stdenv.mkDerivation rec {
+  name = "libmesode-${version}";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "libmesode";
+    rev = version;
+    sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh";
+  };
+
+  buildInputs = [ autoreconfHook openssl expat libtool pkgconfig check ];
+
+  dontDisableStatic = true;
+
+  doCheck = true;
+
+  meta = {
+    description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client";
+    longDescription = ''
+      Reasons for forking:
+
+      - Remove Windows support
+      - Support only one XML Parser implementation (expat)
+      - Support only one SSL implementation (OpenSSL)
+
+      This simplifies maintenance of the library when used in Profanity.
+      Whilst Profanity will run against libstrophe, libmesode provides extra
+      TLS functionality such as manual SSL certificate verification.
+    '';
+    homepage = http://github.com/boothj5/libmesode/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03436dc5e94..237c3393db1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2596,6 +2596,8 @@ in
   libmbim = callPackage ../development/libraries/libmbim { };
 
   libmongo-client = callPackage ../development/libraries/libmongo-client { };
+  
+  libmesode = callPackage ../development/libraries/libmesode { };
 
   libnabo = callPackage ../development/libraries/libnabo { };
 

From 900ded32f4b5ff1ad36cbf46db59cf2fd88232bc Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 17 Dec 2016 16:34:20 +0000
Subject: [PATCH 291/295] profanity: 0.4.7 -> 0.5.0

From the changelog:
- Plugins API supporting C and Python plugins
- SSL certificate verification (requires libmesode) (/tls)
- HTTP file upload (xep-0363) (/sendfile)
- Blocking command (xep-0191) (/blocked)
- Allow auto extended away (/autoaway)
- Include last acitvity in initial presence (xep-0256) (/lastactivity)
- Last Activity (xep-0012) (/lastactivity)
- Ability to run command scripts (/script)
- Account startscript property to execute a command script on connect (/account)
- Export roster to CSV file (/export)
- Support for GTK tray icons (/tray)
- User specified text triggers for chat room notifications (/notify)
- Per chat room notification options (/notify)
- Many new roster panel display options (/roster)
- Time format preferences per window type (/time)
- Edit, prepend and append to room subject (/subject)
- Autoping timeout preference (/autoping)
- Window navigation by window title (/win)
- Window closing by window title (/close)
- Account theme setting (/account)
- Allow sending XMPP stanzas in xmlconsole window (/xmlconsole)
- Configure level of room message notifications in console window (/console)
- Check ~/.config/profanity/inputrc for readline settings
- Custom readline functions for navigation key bindings
- Autocomplete command arguments when no characters entered
---
 .../instant-messengers/profanity/default.nix       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index ac4776c2072..e556eeb7283 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
-, ncurses, libotr, curl, libstrophe, readline, libuuid
+{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
+, ncurses, libotr, curl, readline, libuuid
 
 , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
 , notifySupport ? false,   libnotify ? null, gdk_pixbuf ? null
@@ -12,21 +12,19 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
-  version = "0.4.7";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h";
+    sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq";
   };
 
   buildInputs = [
-    automake autoconf pkgconfig readline libuuid
-    glib openssl expat ncurses libotr curl libstrophe
+    pkgconfig readline libuuid libmesode
+    glib openssl expat ncurses libotr curl
   ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
     ++ optionals notifySupport   [ libnotify gdk_pixbuf ];
 
-  preConfigure = "sh bootstrap.sh";
-
   meta = {
     description = "A console based XMPP client";
     longDescription = ''

From f8fdf3dcb375fec0003a7814a78188f6d2b45897 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 17 Dec 2016 19:06:00 +0100
Subject: [PATCH 292/295] perl-Math-BigInt: 1.999802 -> 1.999806

---
 pkgs/top-level/perl-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9843253c443..6799afb8384 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7792,15 +7792,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigInt = buildPerlPackage rec {
-    name = "Math-BigInt-1.999802";
+    name = "Math-BigInt-1.999806";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "a44ceb255a76b7f455ef41f4f12e8923fe3662255853c4d0f3ad1f77b9eaa491";
+      sha256 = "9b62b2fcfeed5ef42d375778e4ec3b469cab0002b5dc247906dc99f5786fa1fc";
     };
     meta = {
       description = "Arbitrary size integer/float math package";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 8d593f2610aa9a02808f4b94dcabd2bd937a80ac Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 17 Dec 2016 19:06:20 +0100
Subject: [PATCH 293/295] perl-Math-BigRat: 0.260805 -> 0.2611

---
 pkgs/top-level/perl-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6799afb8384..7338acd49b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7816,16 +7816,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigRat = buildPerlPackage rec {
-    name = "Math-BigRat-0.260805";
+    name = "Math-BigRat-0.2611";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41";
+      sha256 = "a8a033d0ccac9ac641c73867d71f2455ecb2339984cd964b1e3cfb2859e9fd81";
     };
     propagatedBuildInputs = [ MathBigInt ];
     meta = {
       description = "Arbitrary big rational numbers";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From cdb7d9f22b7b23ec9b29e2e9b6d6da5bc99ed9ea Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 17 Dec 2016 19:06:38 +0100
Subject: [PATCH 294/295] perl-bignum: 0.44 -> 0.47

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7338acd49b9..5bc0e81106b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -649,10 +649,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   bignum = buildPerlPackage rec {
-    name = "bignum-0.44";
+    name = "bignum-0.47";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "e32048bfc77788f1407e0b2bf54e0aba44d9e5e2743d2013b3afd6a630bed06f";
+      sha256 = "b084eac6d676d2acc4d60deed58e6e31b2f572b7b0be1aec9b93be92bad8261a";
     };
     buildInputs = [ MathBigInt MathBigRat ];
     meta = {

From ffb90e8c4fc0c8ed2d0fb817e5dafbded1c5a6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Dec 2016 20:28:20 +0100
Subject: [PATCH 295/295] Revert "Merge pull request #21234 from
 l2dy/coreutils-up"

This reverts commit ee28ea0e919088f953a2202a1e756146d3ab508c, reversing
changes made to f281ce8c2905c16ed34d31073024f14c109e9b1d.
Moving to staging instead.
---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index ec6be06ede3..8f09a677b8e 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -13,11 +13,11 @@ with lib;
 
 let
   self = stdenv.mkDerivation rec {
-    name = "coreutils-8.26";
+    name = "coreutils-8.25";
 
     src = fetchurl {
       url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
+      sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
     };
 
     # FIXME needs gcc 4.9 in bootstrap tools